diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /sw | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
294 files changed, 4333 insertions, 7451 deletions
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index 0d6b558a7240..baa11096f4e0 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -35,10 +35,10 @@ public: static SwSmartTagMgr& Get(); // css::util::XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; // css::util::XChangesListener - virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override; }; #endif diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx index a85fa6881c8f..3f15248a6dda 100644 --- a/sw/inc/TextCursorHelper.hxx +++ b/sw/inc/TextCursorHelper.hxx @@ -33,7 +33,7 @@ public: static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; virtual const SwPaM* GetPaM() const = 0; virtual SwPaM* GetPaM() = 0; diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index aaef5a76b08f..05240c9169d9 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -273,13 +273,11 @@ public: const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (css::uno::RuntimeException, std::exception) override; + ) override; virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel - (css::beans::XPropertySet* pSet) - throw (css::uno::RuntimeException) override; + (css::beans::XPropertySet* pSet) override; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessibleCaption ( - const css::uno::Reference< css::drawing::XShape > & xShape) - throw (css::uno::RuntimeException) override; + const css::uno::Reference< css::drawing::XShape > & xShape) override; // additional Core/Pixel conversions for internal use; also works // for preview diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx index 82f15ad899fe..59defb90ad27 100644 --- a/sw/inc/dlelstnr.hxx +++ b/sw/inc/dlelstnr.hxx @@ -62,14 +62,14 @@ public: virtual ~SwLinguServiceEventListener() override; /// XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObj ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObj ) override; /// XLinguServiceEventListener - virtual void SAL_CALL processLinguServiceEvent( const css::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processLinguServiceEvent( const css::linguistic2::LinguServiceEvent& rLngSvcEvent ) override; /// XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& rEventObj ) throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& rEventObj ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& rEventObj ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& rEventObj ) override; }; #endif diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx index 4f4d3907d058..982fd62cd12f 100644 --- a/sw/inc/finalthreadmanager.hxx +++ b/sw/inc/finalthreadmanager.hxx @@ -42,24 +42,24 @@ public: explicit FinalThreadManager(css::uno::Reference< css::uno::XComponentContext > const & context); // css::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::util::XJobManager: - virtual void SAL_CALL registerJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelAllJobs() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerJob(const css::uno::Reference< css::util::XCancellable > & Job) override; + virtual void SAL_CALL releaseJob(const css::uno::Reference< css::util::XCancellable > & Job) override; + virtual void SAL_CALL cancelAllJobs() override; // css::frame::XTerminateListener2 - virtual void SAL_CALL cancelTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancelTermination( const css::lang::EventObject& Event ) override; // css::frame::XTerminateListener (inherited via css::frame::XTerminateListener2) - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; // ::com::sun:star::lang::XEventListener (inherited via css::frame::XTerminateListener) - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: FinalThreadManager(FinalThreadManager &) = delete; diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index 40b6d9777456..70d3cf8f4f75 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -96,7 +96,7 @@ public: /// Get a shape by index, excluding TextBoxes. /// /// @throws css::lang::IndexOutOfBoundsException - static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex) throw(css::lang::IndexOutOfBoundsException); + static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex); /// Get the order of the shape, excluding TextBoxes. static sal_Int32 getOrdNum(const SdrObject* pObject); /// If pTextBox is a textbox, then set rWrapThrough to the surround of its shape. diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 944c869b48b6..680db85abdd1 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -138,16 +138,10 @@ class SwChartDataProvider : /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments, bool bTestOnly = false ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception); + css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments, bool bTestOnly = false ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception); + css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false ); static OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation ); @@ -160,34 +154,30 @@ public: virtual ~SwChartDataProvider() override; // XDataProvider - virtual sal_Bool SAL_CALL createDataSourcePossible( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments( const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL createDataSourcePossible( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; + virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments( const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) override; + virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) override; + virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) override; virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL createDataSequenceByValueArray( - const OUString& aRole, const OUString& aRangeRepresentation ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const OUString& aRole, const OUString& aRangeRepresentation ) override; // XRangeXMLConversion - virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; - virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) override; + virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) 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; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; void AddDataSequence( const SwTable &rTable, css::uno::Reference< css::chart2::data::XDataSequence > &rxDataSequence ); void RemoveDataSequence( const SwTable &rTable, css::uno::Reference< css::chart2::data::XDataSequence > &rxDataSequence ); @@ -222,12 +212,12 @@ public: virtual ~SwChartDataSource() override; // XDataSource - virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; typedef cppu::WeakImplHelper @@ -280,62 +270,52 @@ public: static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; // XDataSequence - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() - throw (css::uno::RuntimeException, - std::exception) override; - virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( css::chart2::data::LabelOrigin eLabelOrigin ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() override; + virtual OUString SAL_CALL getSourceRangeRepresentation() override; + virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( css::chart2::data::LabelOrigin eLabelOrigin ) override; + virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override; // XTextualDataSequence - virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() override; // XNumericalDataSequence - virtual css::uno::Sequence< double > SAL_CALL getNumericalData() - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getNumericalData() override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XModifiable - virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setModified( sal_Bool bModified ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // 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; // 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; SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } bool DeleteBox( const SwTableBox &rBox ); @@ -375,33 +355,33 @@ public: virtual ~SwChartLabeledDataSequence() override; // XLabeledDataSequence - virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValues( const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabel( const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues( ) override; + virtual void SAL_CALL setValues( const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel( ) override; + virtual void SAL_CALL setLabel( const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // 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; // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // 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; }; #endif diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 3a830353ae38..67db942e0379 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -279,22 +279,22 @@ public: SwXTextTables(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat); }; @@ -318,25 +318,25 @@ public: SwXFrames(SwDoc* pDoc, FlyCntType eSet); //XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class SwXTextFrames : public SwXFrames @@ -347,9 +347,9 @@ public: SwXTextFrames(SwDoc* pDoc); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -361,9 +361,9 @@ public: SwXTextGraphicObjects(SwDoc* pDoc); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -375,9 +375,9 @@ public: SwXTextEmbeddedObjects(SwDoc* pDoc); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -390,22 +390,22 @@ public: SwXTextSections(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static css::uno::Reference< css::text::XTextSection> GetObject( SwSectionFormat& rFormat ); }; @@ -419,22 +419,22 @@ class SwXBookmarks : public SwCollectionBaseClass, SwXBookmarks(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -451,12 +451,12 @@ public: SwXNumberingRulesCollection( SwDoc* pDoc ); //XIndexAccess - virtual sal_Int32 SAL_CALL SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; typedef @@ -478,17 +478,17 @@ public: SwXFootnotes(bool bEnd, SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static css::uno::Reference< css::text::XFootnote> GetObject( SwDoc& rDoc, const SwFormatFootnote& rFormat ); }; @@ -502,22 +502,22 @@ public: SwXReferenceMarks(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 2f3e24fef394..482a1380e537 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -101,11 +101,7 @@ namespace SwUnoCursorHelper /// @throws css::uno::RuntimeException void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL, - const css::uno::Sequence< css::beans::PropertyValue >& rOptions) - throw (css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, - std::exception); + const css::uno::Sequence< css::beans::PropertyValue >& rOptions); void getNumberingProperty( SwPaM& rPam, @@ -126,20 +122,17 @@ namespace SwUnoCursorHelper /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException void makeRedline( SwPaM& rPaM, const OUString& RedlineType, - const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException void makeTableRowRedline( SwTableLine& rTableLine, const OUString& RedlineType, - const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException SW_DLLPUBLIC void makeTableCellRedline( SwTableBox& rTableBox, const OUString& RedlineType, - const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties ); /// @param bTableMode: attributes should be applied to a table selection void SetCursorAttr(SwPaM & rPam, const SfxItemSet & rSet, @@ -171,12 +164,7 @@ namespace SwUnoCursorHelper const SfxItemPropertySet & rPropSet, const OUString & rPropertyName, const css::uno::Any & rValue, - const SetAttrMode nAttrMode = SetAttrMode::DEFAULT) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException); + const SetAttrMode nAttrMode = SetAttrMode::DEFAULT); /// @param bTableMode: attributes should be applied to a table selection /// @throws css::beans::UnknownPropertyException /// @throws css::beans::PropertyVetoException @@ -189,24 +177,14 @@ namespace SwUnoCursorHelper const css::uno::Sequence< css::beans::PropertyValue > & rPropertyValues, const SetAttrMode nAttrMode = SetAttrMode::DEFAULT, - const bool bTableMode = false) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception); + const bool bTableMode = false); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException css::uno::Any GetPropertyValue( SwPaM& rPaM, const SfxItemPropertySet & rPropSet, - const OUString & rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception); + const OUString & rPropertyName); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException css::uno::Sequence< css::beans::PropertyState > GetPropertyStates( @@ -215,53 +193,40 @@ namespace SwUnoCursorHelper const css::uno::Sequence< OUString >& rPropertyNames, const SwGetPropertyStatesCaller eCaller = - SW_PROPERTY_STATE_CALLER_DEFAULT) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, - std::exception); + SW_PROPERTY_STATE_CALLER_DEFAULT); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException css::beans::PropertyState GetPropertyState( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, - const OUString & rPropertyName) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException); + const OUString & rPropertyName); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException void SetPropertyToDefault( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, - const OUString & rPropertyName) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception); + const OUString & rPropertyName); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException css::uno::Any GetPropertyDefault( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, - const OUString & rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException); + const OUString & rPropertyName); bool SetPageDesc( const css::uno::Any& rValue, SwDoc & rDoc, SfxItemSet & rSet); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void SetTextFormatColl(const css::uno::Any & rAny, SwPaM & rPaM) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + void SetTextFormatColl(const css::uno::Any & rAny, SwPaM & rPaM); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException /// @throws css::uno::DeploymentException bool SetCursorPropertyValue( SfxItemPropertySimpleEntry const& rEntry, css::uno::Any const& rValue, - SwPaM & rPam, SfxItemSet & rItemSet) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - css::uno::DeploymentException, std::exception); + SwPaM & rPam, SfxItemSet & rItemSet); /// try to get something that can be selected out of the XInterface /// at most one of the out parameters gets assigned a non-null value diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 3d41e92e8552..132d74eb8234 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -57,7 +57,7 @@ public: // The following method is called when a SvxShape-object is to be created. // Derived classes may obtain at this point a derivation or an object // that is aggregating a SvxShape. - virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const override; }; typedef cppu::WeakAggImplHelper4 @@ -78,33 +78,31 @@ public: virtual ~SwXDrawPage() override; //XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XShapes - virtual void SAL_CALL add(const css::uno::Reference< css::drawing::XShape > & xShape) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL remove(const css::uno::Reference< css::drawing::XShape > & xShape) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL add(const css::uno::Reference< css::drawing::XShape > & xShape) override; + virtual void SAL_CALL remove(const css::uno::Reference< css::drawing::XShape > & xShape) override; //XShapeGrouper - virtual css::uno::Reference< css::drawing::XShapeGroup > SAL_CALL group(const css::uno::Reference< css::drawing::XShapes > & xShapes) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL ungroup(const css::uno::Reference< css::drawing::XShapeGroup > & aGroup) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::drawing::XShapeGroup > SAL_CALL group(const css::uno::Reference< css::drawing::XShapes > & xShapes) override; + virtual void SAL_CALL ungroup(const css::uno::Reference< css::drawing::XShapeGroup > & aGroup) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; SwFmDrawPage* GetSvxPage(); // renamed and outlined to detect where it's called @@ -208,10 +206,7 @@ class SwXShape : public SwXShapeBaseClass, @throws css::lang::WrappedTargetException @throws css::uno::RuntimeException */ - css::uno::Any _getPropAtAggrObj( const OUString& _rPropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException); + css::uno::Any _getPropAtAggrObj( const OUString& _rPropertyName ); protected: virtual ~SwXShape() override; @@ -222,47 +217,47 @@ public: SwXShape(css::uno::Reference< css::uno::XInterface > & xShape); static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //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; //XTextContent - virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() 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 > & aListener) 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 > & aListener) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - 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 OUString SAL_CALL getShapeType( ) throw (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; + virtual OUString SAL_CALL getShapeType( ) override; SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;} SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } @@ -281,21 +276,21 @@ protected: public: SwXGroupShape(css::uno::Reference< css::uno::XInterface > & xShape); - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw() override; virtual void SAL_CALL release( ) throw() override; //XShapes - virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; #endif diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx index 7bc0660af302..5d30d19bef11 100644 --- a/sw/inc/unofieldcoll.hxx +++ b/sw/inc/unofieldcoll.hxx @@ -46,31 +46,22 @@ public: static bool getInstanceName(const SwFieldType& rFieldType, OUString& rName); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XNameAccess virtual css::uno::Any SAL_CALL getByName( - const OUString& rName) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getElementNames() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& rName) - throw (css::uno::RuntimeException, std::exception) override; + getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& rName) override; }; @@ -98,38 +89,29 @@ public: virtual void Invalidate() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() - throw (css::uno::RuntimeException, std::exception) override; + createEnumeration() override; // XRefreshable - virtual void SAL_CALL refresh() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh() override; virtual void SAL_CALL addRefreshListener( const css::uno::Reference< - css::util::XRefreshListener>& xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::util::XRefreshListener>& xListener) override; virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< - css::util::XRefreshListener>& xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::util::XRefreshListener>& xListener) override; }; diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 322c060321ef..4bf9e3aa0647 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -92,55 +92,55 @@ public: static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XNamed - virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& Name_) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //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; //XShape - virtual css::awt::Point SAL_CALL getPosition( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition( ) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize( ) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; //XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getShapeType() override; //Base implementation //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>& xListener) 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>& xListener) override; // XTextContent - virtual void SAL_CALL attach(const css::uno::Reference<css::text::XTextRange>& xTextRange) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference<css::text::XTextRange> SAL_CALL getAnchor() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL attach(const css::uno::Reference<css::text::XTextRange>& xTextRange) override; + virtual css::uno::Reference<css::text::XTextRange> SAL_CALL getAnchor() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void attachToRange(const css::uno::Reference< css::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + void attachToRange(const css::uno::Reference< css::text::XTextRange > & xTextRange); const SwFrameFormat* GetFrameFormat() const { @@ -177,8 +177,7 @@ protected: virtual const SwStartNode *GetStartNode() const override; virtual css::uno::Reference< css::text::XTextCursor > - CreateCursor() - throw (css::uno::RuntimeException) override; + CreateCursor() override; virtual ~SwXTextFrame() override; @@ -192,50 +191,50 @@ public: // FIXME: EVIL HACK: make available for SwXFrame::attachToRange using SwXText::SetDoc; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw() override; virtual void SAL_CALL release( ) throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; //XTextFrame - virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override; //XText - virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) override; //XEnumerationAccess - frueher XParagraphEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XTextContent - virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor( ) 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XEventsSupplier - virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XPropertySet - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); @@ -262,12 +261,12 @@ public: CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XEventsSupplier - virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); @@ -297,19 +296,19 @@ public: CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat); //XEmbeddedObjectSupplier2 - virtual css::uno::Reference< css::lang::XComponent > SAL_CALL getEmbeddedObject() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::sal_Int64 SAL_CALL getAspect() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getReplacementGraphic() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL getEmbeddedObject() override; + virtual css::uno::Reference< css::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject() override; + virtual ::sal_Int64 SAL_CALL getAspect() override; + virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getReplacementGraphic() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XEventsSupplier - virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); }; @@ -324,10 +323,10 @@ public: virtual ~SwXOLEListener() override; // css::lang::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; // css::util::XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx index bd33abbfb10c..f2714217cf0c 100644 --- a/sw/inc/unoidxcoll.hxx +++ b/sw/inc/unoidxcoll.hxx @@ -35,39 +35,26 @@ public: SwXDocumentIndexes(SwDoc *const pDoc); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; // XNameAccess virtual css::uno::Any SAL_CALL getByName( - const OUString& rName) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getElementNames() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& rName) - throw (css::uno::RuntimeException, std::exception) override; + getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& rName) override; }; diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index a9a545523757..4c598c5c63a9 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -103,171 +103,109 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // XPropertyState virtual css::beans::PropertyState SAL_CALL - getPropertyState(const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyState(const OUString& rPropertyName) override; virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( - const css::uno::Sequence< OUString >& rPropertyNames) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) override; virtual void SAL_CALL setPropertyToDefault( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual css::uno::Any SAL_CALL getPropertyDefault( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::uno::Any >& rValues) - throw (css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& rValues) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( - const css::uno::Sequence< OUString >& rPropertyNames) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) override; virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override; virtual void SAL_CALL removePropertiesChangeListener( - const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override; virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override; // XTolerantMultiPropertySet virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::uno::Any >& rValues) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& rValues) override; virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( - const css::uno::Sequence< OUString >& rPropertyNames) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) override; virtual css::uno::Sequence< css::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( - const css::uno::Sequence< OUString >& rPropertyNames) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() - throw (css::uno::RuntimeException, std::exception) override; + createEnumeration() override; // XContentEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createContentEnumeration(const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + createContentEnumeration(const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getAvailableServiceNames() override; // XTextContent virtual void SAL_CALL attach( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override; // XTextRange virtual css::uno::Reference< css::text::XText > - SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString(const OUString& rString) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getText() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString(const OUString& rString) override; }; diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index 38476880edca..c1be37289a6a 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -39,23 +39,23 @@ class SwXRedlineText : public: SwXRedlineText(SwDoc* pDoc, SwNodeIndex aNodeIndex); - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw() override {OWeakObject::acquire();} virtual void SAL_CALL release( ) throw() override {OWeakObject::release();} - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; //XText - virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) override; //XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; //XElementAccess (via XEnumerationAccess) - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; typedef @@ -76,32 +76,32 @@ public: virtual ~SwXRedline() override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw() override {OWeakObject::acquire();} virtual void SAL_CALL release( ) throw() override {OWeakObject::release();} - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; //XText - virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; const SwRangeRedline* GetRedline() const {return pRedline;} protected: diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx index db98d1c6f7c4..420e81cab4de 100644 --- a/sw/inc/unoredlines.hxx +++ b/sw/inc/unoredlines.hxx @@ -46,20 +46,20 @@ public: SwXRedlines(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XEnumerationAccess - was: XParagraphEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static css::beans::XPropertySet* GetObject( SwRangeRedline& rRedline, SwDoc& rDoc ); }; @@ -76,13 +76,13 @@ public: SwXRedlineEnumeration(SwDoc& rDoc); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL nextElement() throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual css::uno::Any SAL_CALL nextElement() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index a7cc9bda12c1..0c2e9c796e95 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -54,18 +54,18 @@ public: SwXFootnoteProperties(SwDoc* pDoc); //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void Invalidate() {pDoc = nullptr;} }; @@ -84,18 +84,18 @@ public: SwXEndnoteProperties(SwDoc* pDoc); //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void Invalidate() {pDoc = nullptr;} }; @@ -114,18 +114,18 @@ public: SwXLineNumberingProperties(SwDoc* pDoc); //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void Invalidate() {pDoc = nullptr;} }; @@ -161,44 +161,43 @@ public: static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) override; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XNamed - virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& Name_) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; css::uno::Sequence< css::beans::PropertyValue> GetNumberingRuleByIndex(const SwNumRule& rNumRule, sal_Int32 nIndex)const; /// @throws css::uno::RuntimeException /// @throws css::lang::IllegalArgumentException void SetNumberingRuleByIndex(SwNumRule& rNumRule, - const css::uno::Sequence< css::beans::PropertyValue>& rProperties, sal_Int32 nIndex) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); + const css::uno::Sequence< css::beans::PropertyValue>& rProperties, sal_Int32 nIndex); const OUString* GetNewCharStyleNames() const {return m_sNewCharStyleNames;} const OUString* GetBulletFontNames() const {return m_sNewBulletFontNames;} @@ -232,9 +231,9 @@ public: using SwXNumberingRules::Invalidate; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -271,28 +270,28 @@ public: static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XTextColumns - virtual sal_Int32 SAL_CALL getReferenceValue( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getColumnCount( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::text::TextColumn > SAL_CALL getColumns( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumns( const css::uno::Sequence< css::text::TextColumn >& Columns ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getReferenceValue( ) override; + virtual sal_Int16 SAL_CALL getColumnCount( ) override; + virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) override; + virtual css::uno::Sequence< css::text::TextColumn > SAL_CALL getColumns( ) override; + virtual void SAL_CALL setColumns( const css::uno::Sequence< css::text::TextColumn >& Columns ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; sal_Int32 GetSepLineWidth() const {return nSepLineWidth;} sal_Int32 GetSepLineColor() const {return nSepLineColor;} diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index 7cc1af65ada0..cd19de5657a7 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -71,37 +71,37 @@ public: static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XSearchDescriptor - virtual OUString SAL_CALL getSearchString( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSearchString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSearchString( ) override; + virtual void SAL_CALL setSearchString( const OUString& aString ) override; //XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getReplaceString() override; + virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XPropertyReplace - virtual sal_Bool SAL_CALL getValueSearch() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getSearchAttributes() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setSearchAttributes(const css::uno::Sequence< css::beans::PropertyValue >& aSearchAttribs) throw( css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getReplaceAttributes() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setReplaceAttributes(const css::uno::Sequence< css::beans::PropertyValue >& aSearchAttribs) throw( css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL getValueSearch() override; + virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getSearchAttributes() override; + virtual void SAL_CALL setSearchAttributes(const css::uno::Sequence< css::beans::PropertyValue >& aSearchAttribs) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getReplaceAttributes() override; + virtual void SAL_CALL setReplaceAttributes(const css::uno::Sequence< css::beans::PropertyValue >& aSearchAttribs) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void FillSearchItemSet(SfxItemSet& rSet) const; void FillReplaceItemSet(SfxItemSet& rSet) const; diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 80f527ec7ba7..3f45f52e175f 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -72,29 +72,26 @@ public: SwXStyleFamilies(SwDocShell& rDocShell); //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XStyleLoader - virtual void SAL_CALL loadStylesFromURL(const OUString& rURL, const css::uno::Sequence< css::beans::PropertyValue >& aOptions) - throw (css::io::IOException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getStyleLoaderOptions() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL loadStylesFromURL(const OUString& rURL, const css::uno::Sequence< css::beans::PropertyValue >& aOptions) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getStyleLoaderOptions() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static css::uno::Reference<css::style::XStyle> CreateStyle(SfxStyleFamily eFamily, SwDoc& rDoc); // FIXME: This is very ugly as is the whole conditional paragraph style @@ -129,17 +126,17 @@ public: SwXAutoStyles(SwDocShell& rDocShell); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual css::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; }; @@ -158,14 +155,14 @@ public: virtual ~SwXAutoStyleFamily() override; //XAutoStyleFamily - virtual css::uno::Reference< css::style::XAutoStyle > SAL_CALL insertStyle( const css::uno::Sequence< css::beans::PropertyValue >& Values ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::style::XAutoStyle > SAL_CALL insertStyle( const css::uno::Sequence< css::beans::PropertyValue >& Values ) override; //XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) override; //XElementAccess - virtual css::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) override; }; @@ -178,8 +175,8 @@ public: virtual ~SwXAutoStylesEnumerator() override; //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL nextElement( ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements( ) override; + virtual css::uno::Any SAL_CALL nextElement( ) override; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; }; @@ -201,7 +198,7 @@ private: /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames ); public: @@ -209,34 +206,34 @@ public: virtual ~SwXAutoStyle() override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - 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 - 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; // Special - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getProperties() override; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; @@ -298,42 +295,42 @@ public: void SetPhysical(); //XStyle - virtual sal_Bool SAL_CALL isUserDefined() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isInUse() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getParentStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParentStyle(const OUString& aParentStyle ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isUserDefined() override; + virtual sal_Bool SAL_CALL isInUse() override; + virtual OUString SAL_CALL getParentStyle() override; + virtual void SAL_CALL setParentStyle(const OUString& aParentStyle ) override; //XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName(const OUString& rName) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& rName) override; //XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override; + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) override; + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) override; + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override; + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& rName) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& rName) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& rName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& rName) override; //XNameContainer - virtual void SAL_CALL insertByName(const OUString& rName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL replaceByName(const OUString& rName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName(const OUString& rName) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName(const OUString& rName, const css::uno::Any& aElement) override; + virtual void SAL_CALL replaceByName(const OUString& rName, const css::uno::Any& aElement) override; + virtual void SAL_CALL removeByName(const OUString& rName) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) 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& rServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; static css::uno::Reference<css::style::XStyle> CreateXTextTableStyle(SwDocShell* pDocShell, const OUString& rTableAutoFormatName); }; @@ -378,34 +375,34 @@ class SwXTextCellStyle : public cppu::WeakImplHelper bool IsPhysical(); //XStyle - virtual sal_Bool SAL_CALL isUserDefined() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isInUse() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getParentStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParentStyle(const OUString& aParentStyle ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isUserDefined() override; + virtual sal_Bool SAL_CALL isInUse() override; + virtual OUString SAL_CALL getParentStyle() override; + virtual void SAL_CALL setParentStyle(const OUString& aParentStyle ) override; //XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName(const OUString& sName) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& sName) override; //XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override; + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) override; + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) override; + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override; + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override; //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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) 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& rServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; static css::uno::Reference<css::style::XStyle> CreateXTextCellStyle(SwDocShell* pDocShell, const OUString& sName); }; diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index b4cf9a1a3ec4..aa18474c3470 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -78,8 +78,7 @@ class SwXCell final : public SwXCellBaseClass, virtual const SwStartNode *GetStartNode() const override; virtual css::uno::Reference< css::text::XTextCursor > - CreateCursor() - throw (css::uno::RuntimeException) override; + CreateCursor() override; bool IsValid() const; @@ -97,52 +96,52 @@ public: static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw() override; virtual void SAL_CALL release( ) throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; //XCell - virtual OUString SAL_CALL getFormula( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula( ) override; + virtual void SAL_CALL setFormula( const OUString& aFormula ) override; + virtual double SAL_CALL getValue( ) override; /// @throws css::uno::RuntimeException - double SAL_CALL getValue( ) const throw(css::uno::RuntimeException, std::exception) + double SAL_CALL getValue( ) const { return const_cast<SwXCell*>(this)->getValue(); }; - virtual void SAL_CALL setValue( double nValue ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::table::CellContentType SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getError( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( double nValue ) override; + virtual css::table::CellContentType SAL_CALL getType( ) override; + virtual sal_Int32 SAL_CALL getError( ) override; //XText - virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setString(const OUString& aString) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) override; + virtual void SAL_CALL setString(const OUString& aString) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //XEnumerationAccess - was: XParagraphEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; SwTableBox* GetTableBox() const { return pBox; } static SwXCell* CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable = nullptr ); @@ -174,24 +173,18 @@ public: //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw(css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine); }; @@ -214,46 +207,30 @@ public: DECLARE_XINTERFACE() //XTextTableCursor - virtual OUString SAL_CALL getRangeName() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL mergeRange() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL splitRange( sal_Int16 Count, sal_Bool Horizontal ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual OUString SAL_CALL getRangeName() override; + virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) override; + virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) override; + virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) override; + virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) override; + virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) override; + virtual void SAL_CALL gotoStart( sal_Bool bExpand ) override; + virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) override; + virtual sal_Bool SAL_CALL mergeRange() override; + virtual sal_Bool SAL_CALL splitRange( sal_Int16 Count, sal_Bool Horizontal ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; @@ -314,95 +291,73 @@ public: SW_DLLPUBLIC SwFrameFormat* GetFrameFormat(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XTextTable - virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XTableRows > SAL_CALL getRows( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL getColumns( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByName( const OUString& aCellName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getCellNames( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextTableCursor > SAL_CALL createCursorByCellName( const OUString& aCellName ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) override; + virtual css::uno::Reference< css::table::XTableRows > SAL_CALL getRows( ) override; + virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL getColumns( ) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByName( const OUString& aCellName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getCellNames( ) override; + virtual css::uno::Reference< css::text::XTextTableCursor > SAL_CALL createCursorByCellName( const OUString& aCellName ) override; //XTextContent - virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor( ) 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 > & aListener) 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 > & aListener) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override; //XCellRange - virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override; //XChartDataArray - 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 - 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; //XSortable - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL sort(const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() override; + virtual void SAL_CALL sort(const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) override; //XAutoFormattable - virtual void SAL_CALL autoFormat(const OUString& aName) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL autoFormat(const OUString& aName) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw(css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XNamed - virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& Name_) override; //XCellRangeData - virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray( ) override; + virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -438,63 +393,48 @@ public: const SwUnoCursor* GetTableCursor() const; //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XCellRange - virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XChartData - 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; //XChartDataArray - 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; //XSortable - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL sort(const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() override; + virtual void SAL_CALL sort(const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) override; //XCellRangeData - virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray( ) override; + virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -514,25 +454,21 @@ public: SwXTableRows(SwFrameFormat& rFrameFormat); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XTableRows - virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) override; + virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class SwXTableColumns : public cppu::WeakImplHelper @@ -552,25 +488,21 @@ public: //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XTableColumns - virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) override; + virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; int sw_CompareCellRanges( diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx index fcfc86dabd21..6bb0681a3695 100644 --- a/sw/inc/unotext.hxx +++ b/sw/inc/unotext.hxx @@ -66,9 +66,7 @@ private: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException virtual bool CheckForOwnMemberMeta( - const SwPaM & rPam, const bool bAbsorb) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + const SwPaM & rPam, const bool bAbsorb); protected: @@ -90,164 +88,106 @@ public: /// @throws css::uno::RuntimeException virtual css::uno::Reference< css::text::XTextCursor > - CreateCursor() - throw (css::uno::RuntimeException); + CreateCursor(); // XInterface virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& rType) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& rType) override; // XTypeProvider virtual css::uno::Sequence< css::uno::Type > - SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getTypes() override; static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< - css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // XTextRange virtual css::uno::Reference< css::text::XText > - SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString(const OUString& rString) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getText() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString(const OUString& rString) override; // XSimpleText virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange > & xRange, - const OUString& aString, sal_Bool bAbsorb) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& aString, sal_Bool bAbsorb) override; virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange > & xRange, - sal_Int16 nControlCharacter, sal_Bool bAbsorb) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Int16 nControlCharacter, sal_Bool bAbsorb) override; // XText virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange > & xRange, const css::uno::Reference< css::text::XTextContent > & xContent, - sal_Bool bAbsorb) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bAbsorb) override; virtual void SAL_CALL removeTextContent( - const css::uno::Reference< css::text::XTextContent > & xContent) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent > & xContent) override; // XParagraphAppend virtual css::uno::Reference< css::text::XTextRange > SAL_CALL finishParagraph( - const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties) override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL finishParagraphInsert( const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties, - const css::uno::Reference< css::text::XTextRange >& xInsertPosition) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange >& xInsertPosition) override; // XTextPortionAppend virtual css::uno::Reference< css::text::XTextRange > SAL_CALL appendTextPortion( const OUString& rText, - const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties) - throw (css::lang::IllegalArgumentException, - css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties) override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL insertTextPortion( const OUString& rText, const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties, - const css::uno::Reference< css::text::XTextRange >& rTextRange) - throw (css::lang::IllegalArgumentException, - css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::uno::RuntimeException, - std::exception) override; + const css::uno::Reference< css::text::XTextRange >& rTextRange) override; // XTextContentAppend virtual css::uno::Reference< css::text::XTextRange > SAL_CALL appendTextContent( const css::uno::Reference< css::text::XTextContent >& xTextContent, - const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties) override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL insertTextContentWithProperties( const css::uno::Reference< css::text::XTextContent >& xTextContent, const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties, - const css::uno::Reference< css::text::XTextRange >& xInsertPosition) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange >& xInsertPosition) override; // XTextConvert virtual css::uno::Reference< css::text::XTextContent > SAL_CALL convertToTextFrame( const css::uno::Reference< css::text::XTextRange >& xStart, const css::uno::Reference< css::text::XTextRange >& xEnd, - const css::uno::Sequence< css::beans::PropertyValue >& xFrameProperties) - throw (css::lang::IllegalArgumentException, - css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& xFrameProperties) override; virtual css::uno::Reference< css::text::XTextTable > SAL_CALL convertToTable( @@ -268,48 +208,33 @@ public: rRowProperties, css::uno::Sequence< css::beans::PropertyValue > const& - rTableProperties) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + rTableProperties) override; // XTextCopy virtual void SAL_CALL copyText( - const css::uno::Reference< css::text::XTextCopy >& xSource ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextCopy >& xSource ) override; // XTextRangeCompare sal_Int16 SAL_CALL compareRegionStarts( const css::uno::Reference< css::text::XTextRange >& xR1, - const css::uno::Reference< css::text::XTextRange >& xR2) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange >& xR2) override; sal_Int16 SAL_CALL compareRegionEnds( const css::uno::Reference< css::text::XTextRange >& xR1, - const css::uno::Reference< css::text::XTextRange >& xR2) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange >& xR2) override; // XRelativeTextContentInsert virtual void SAL_CALL insertTextContentBefore( const css::uno::Reference< css::text::XTextContent>& xNewContent, - const css::uno::Reference< css::text::XTextContent>& xSuccessor) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent>& xSuccessor) override; virtual void SAL_CALL insertTextContentAfter( const css::uno::Reference< css::text::XTextContent>& xNewContent, - const css::uno::Reference< css::text::XTextContent>& xPredecessor) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent>& xPredecessor) override; // XRelativeTextContentRemove virtual void SAL_CALL removeTextContentBefore( - const css::uno::Reference< css::text::XTextContent>& xSuccessor) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent>& xSuccessor) override; virtual void SAL_CALL removeTextContentAfter( - const css::uno::Reference< css::text::XTextContent>& xPredecessor) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent>& xPredecessor) override; }; #endif // INCLUDED_SW_INC_UNOTEXT_HXX diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx index 41168442a24d..bb10b191d373 100644 --- a/sw/inc/unotextbodyhf.hxx +++ b/sw/inc/unotextbodyhf.hxx @@ -55,53 +55,41 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& rType) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& rType) override; virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XAggregation virtual css::uno::Any SAL_CALL queryAggregation( - const css::uno::Type& rType) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& rType) override; // XTypeProvider virtual css::uno::Sequence< css::uno::Type > - SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() - throw (css::uno::RuntimeException, std::exception) override; + createEnumeration() override; // XSimpleText virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL - createTextCursor() - throw (css::uno::RuntimeException, std::exception) override; + createTextCursor() override; virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange( - const css::uno::Reference< css::text::XTextRange > & xTextPosition) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextPosition) override; }; @@ -124,8 +112,7 @@ protected: virtual const SwStartNode *GetStartNode() const override; virtual css::uno::Reference< css::text::XTextCursor > - CreateCursor() - throw (css::uno::RuntimeException) override; + CreateCursor() override; virtual ~SwXHeadFootText() override; @@ -139,48 +126,37 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& rType) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& rType) override; virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XTypeProvider virtual css::uno::Sequence< css::uno::Type > - SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() - throw (css::uno::RuntimeException, std::exception) override; + createEnumeration() override; // XSimpleText virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL - createTextCursor() - throw (css::uno::RuntimeException, std::exception) override; + createTextCursor() override; virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange( - const css::uno::Reference< css::text::XTextRange > & xTextPosition) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextPosition) override; }; diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx index b3a57127f2d7..7f457fe506ef 100644 --- a/sw/inc/unotextcursor.hxx +++ b/sw/inc/unotextcursor.hxx @@ -107,247 +107,154 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< - css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< - css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< - css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< - css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::XVetoableChangeListener >& xListener) override; // XPropertyState virtual css::beans::PropertyState SAL_CALL - getPropertyState(const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyState(const OUString& rPropertyName) override; virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( - const css::uno::Sequence< OUString >& rPropertyNames) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) override; virtual void SAL_CALL setPropertyToDefault( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual css::uno::Any SAL_CALL getPropertyDefault( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, - const css::uno::Sequence< css::uno::Any >& aValues ) - throw ( - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aValues ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL - getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) - throw (css::uno::RuntimeException, std::exception) override; + 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 ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; virtual void SAL_CALL removePropertiesChangeListener( - const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; // XMultiPropertyStates - virtual void SAL_CALL setAllPropertiesToDefault() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault() override; virtual void SAL_CALL setPropertiesToDefault( - const css::uno::Sequence< OUString >& rPropertyNames) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( - const css::uno::Sequence< OUString >& rPropertyNames) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() - throw (css::uno::RuntimeException, std::exception) override; + createEnumeration() override; // XContentEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createContentEnumeration(const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + createContentEnumeration(const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getAvailableServiceNames() override; // XSortable virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - createSortDescriptor() - throw (css::uno::RuntimeException, std::exception) override; + createSortDescriptor() override; virtual void SAL_CALL sort( - const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) - throw (css::uno::RuntimeException, - std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) override; // XDocumentInsertable virtual void SAL_CALL insertDocumentFromURL( const OUString& rURL, - const css::uno::Sequence< css::beans::PropertyValue >& rOptions) - throw (css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rOptions) override; // XTextRange virtual css::uno::Reference< css::text::XText > - SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString(const OUString& rString) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getText() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString(const OUString& rString) override; // XTextCursor - virtual void SAL_CALL collapseToStart() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL collapseToEnd() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCollapsed() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goLeft(sal_Int16 nCount, sal_Bool bExpand) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goRight(sal_Int16 nCount, sal_Bool bExpand) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoStart(sal_Bool bExpand) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoEnd(sal_Bool bExpand) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL collapseToStart() override; + virtual void SAL_CALL collapseToEnd() override; + virtual sal_Bool SAL_CALL isCollapsed() override; + virtual sal_Bool SAL_CALL goLeft(sal_Int16 nCount, sal_Bool bExpand) override; + virtual sal_Bool SAL_CALL goRight(sal_Int16 nCount, sal_Bool bExpand) override; + virtual void SAL_CALL gotoStart(sal_Bool bExpand) override; + virtual void SAL_CALL gotoEnd(sal_Bool bExpand) override; virtual void SAL_CALL gotoRange( const css::uno::Reference< css::text::XTextRange >& xRange, - sal_Bool bExpand) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bExpand) override; // XWordCursor - virtual sal_Bool SAL_CALL isStartOfWord() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEndOfWord() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoNextWord(sal_Bool bExpand) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoPreviousWord(sal_Bool bExpand) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoEndOfWord(sal_Bool bExpand) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoStartOfWord(sal_Bool bExpand) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isStartOfWord() override; + virtual sal_Bool SAL_CALL isEndOfWord() override; + virtual sal_Bool SAL_CALL gotoNextWord(sal_Bool bExpand) override; + virtual sal_Bool SAL_CALL gotoPreviousWord(sal_Bool bExpand) override; + virtual sal_Bool SAL_CALL gotoEndOfWord(sal_Bool bExpand) override; + virtual sal_Bool SAL_CALL gotoStartOfWord(sal_Bool bExpand) override; // XSentenceCursor - virtual sal_Bool SAL_CALL isStartOfSentence() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEndOfSentence() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoNextSentence(sal_Bool Expand) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoPreviousSentence(sal_Bool Expand) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoStartOfSentence(sal_Bool Expand) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoEndOfSentence(sal_Bool Expand) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isStartOfSentence() override; + virtual sal_Bool SAL_CALL isEndOfSentence() override; + virtual sal_Bool SAL_CALL gotoNextSentence(sal_Bool Expand) override; + virtual sal_Bool SAL_CALL gotoPreviousSentence(sal_Bool Expand) override; + virtual sal_Bool SAL_CALL gotoStartOfSentence(sal_Bool Expand) override; + virtual sal_Bool SAL_CALL gotoEndOfSentence(sal_Bool Expand) override; // XParagraphCursor - virtual sal_Bool SAL_CALL isStartOfParagraph() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEndOfParagraph() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoStartOfParagraph(sal_Bool Expand) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoEndOfParagraph(sal_Bool Expand) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoNextParagraph(sal_Bool Expand) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoPreviousParagraph(sal_Bool Expand) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isStartOfParagraph() override; + virtual sal_Bool SAL_CALL isEndOfParagraph() override; + virtual sal_Bool SAL_CALL gotoStartOfParagraph(sal_Bool Expand) override; + virtual sal_Bool SAL_CALL gotoEndOfParagraph(sal_Bool Expand) override; + virtual sal_Bool SAL_CALL gotoNextParagraph(sal_Bool Expand) override; + virtual sal_Bool SAL_CALL gotoPreviousParagraph(sal_Bool Expand) override; // XRedline virtual void SAL_CALL makeRedline( const OUString& rRedlineType, - const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties) override; //XMarkingAccess - virtual void SAL_CALL invalidateMarkings(::sal_Int32 nType) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL invalidateMarkings(::sal_Int32 nType) override; }; diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index ae6941f2fcab..90b7851b6864 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -101,8 +101,7 @@ private: //TODO: new exception type for protected content /// @throws css::uno::RuntimeException void DeleteAndInsert( - const OUString& rText, const bool bForceExpandHints) - throw (css::uno::RuntimeException); + const OUString& rText, const bool bForceExpandHints); void Invalidate(); virtual ~SwXTextRange() override; @@ -127,121 +126,75 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // XPropertyState virtual css::beans::PropertyState SAL_CALL - getPropertyState(const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyState(const OUString& rPropertyName) override; virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( - const css::uno::Sequence< OUString >& rPropertyNames) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) override; virtual void SAL_CALL setPropertyToDefault( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual css::uno::Any SAL_CALL getPropertyDefault( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() - throw (css::uno::RuntimeException, std::exception) override; + createEnumeration() override; // XContentEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createContentEnumeration(const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + createContentEnumeration(const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getAvailableServiceNames() override; // XTextRange virtual css::uno::Reference< css::text::XText > - SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getText() override; virtual css::uno::Reference< - css::text::XTextRange > SAL_CALL getStart() - throw (css::uno::RuntimeException, std::exception) override; + css::text::XTextRange > SAL_CALL getStart() override; virtual css::uno::Reference< - css::text::XTextRange > SAL_CALL getEnd() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString(const OUString& rString) - throw (css::uno::RuntimeException, std::exception) override; + css::text::XTextRange > SAL_CALL getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString(const OUString& rString) override; // XRedline virtual void SAL_CALL makeRedline( const OUString& rRedlineType, - const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties) override; }; diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index e4aa520612c9..e358cbd0f19f 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -208,191 +208,170 @@ public: SwXTextDocument(SwDocShell* pShell); void NotifyRefreshListeners(); - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw() override; virtual void SAL_CALL release( ) throw() override; //XWeak - virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter( ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XTextDocument - virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL reformat() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override; + virtual void SAL_CALL reformat() override; //XModel - virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL lockControllers( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockControllers( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) override; + virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) override; + virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) override; + virtual void SAL_CALL lockControllers( ) override; + virtual void SAL_CALL unlockControllers( ) override; + virtual sal_Bool SAL_CALL hasControllersLocked( ) override; + virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) override; + virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) override; //XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) 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 > & aListener) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override; //XCloseable - virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) override; //XLineNumberingProperties - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getLineNumberingProperties() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getLineNumberingProperties() override; //XChapterNumberingSupplier - virtual css::uno::Reference< css::container::XIndexReplace > SAL_CALL getChapterNumberingRules() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XIndexReplace > SAL_CALL getChapterNumberingRules() override; //XNumberingRulesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getNumberingRules() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getNumberingRules() override; //XFootnotesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getFootnotes() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFootnoteSettings() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getFootnotes() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFootnoteSettings() override; //XEndnotesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getEndnotes() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEndnoteSettings() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getEndnotes() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEndnoteSettings() override; //XReplaceable - virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL replaceAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor() override; + virtual sal_Int32 SAL_CALL replaceAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) override; //XSearchable - virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL findAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findFirst(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findNext(const css::uno::Reference< css::uno::XInterface > & xStartAt, const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor() override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL findAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findFirst(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findNext(const css::uno::Reference< css::uno::XInterface > & xStartAt, const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) override; //XPagePrintable - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPagePrintSettings() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setPagePrintSettings(const css::uno::Sequence< css::beans::PropertyValue >& aSettings) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL printPages(const css::uno::Sequence< css::beans::PropertyValue >& xOptions) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPagePrintSettings() override; + virtual void SAL_CALL setPagePrintSettings(const css::uno::Sequence< css::beans::PropertyValue >& aSettings) override; + virtual void SAL_CALL printPages(const css::uno::Sequence< css::beans::PropertyValue >& xOptions) override; //XReferenceMarksSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getReferenceMarks() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getReferenceMarks() override; // css::text::XTextFieldsSupplier - virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getTextFields() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFieldMasters() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getTextFields() override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFieldMasters() override; // css::text::XTextEmbeddedObjectsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getEmbeddedObjects() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getEmbeddedObjects() override; // css::text::XBookmarksSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks() override; // css::text::XTextSectionsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextSections() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextSections() override; // css::text::XTextTablesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextTables() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextTables() override; // css::text::XTextGraphicObjectsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGraphicObjects() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGraphicObjects() override; // css::text::XTextFramesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFrames() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFrames() override; //XStyleFamiliesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies() override; //XAutoStylesSupplier - virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles( ) override; //XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) - throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, - const css::uno::Sequence< css::uno::Any >& Arguments) - throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::uno::Any >& Arguments) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::drawing::XDrawPageSupplier - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() override; // css::text::XDocumentIndexesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDocumentIndexes() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDocumentIndexes() override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) 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 >& rPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) override; //XLinkTargetSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks() override; //XRedlinesSupplier - virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getRedlines( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getRedlines( ) override; // css::util::XRefreshable - virtual void SAL_CALL refresh() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL refresh() override; + virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) override; + virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) override; // css::util::XLinkUpdate, - virtual void SAL_CALL updateLinks( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateLinks( ) override; // css::view::XRenderable - virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override; + virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override; // css::xforms::XFormsSupplier - virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getXForms( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getXForms( ) override; // css::document::XDocumentLanguages - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nCount ) override; // css::text::XFlatParagraphIteratorProvider: - virtual css::uno::Reference< css::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) override; // css::util::XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; /// @see vcl::ITiledRenderable::paintTile(). virtual void paintTile( VirtualDevice &rDevice, @@ -442,7 +421,7 @@ public: OUString getTrackedChangeAuthors() override; // css::tiledrendering::XTiledRenderable - virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) override; void Invalidate(); void Reactivate(SwDocShell* pNewDocShell); @@ -484,18 +463,18 @@ public: virtual ~SwXLinkTargetSupplier() override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void Invalidate() {pxDoc = nullptr;} }; @@ -522,30 +501,30 @@ public: virtual ~SwXLinkNameAccessWrapper() override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XLinkTargetSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -563,18 +542,18 @@ public: virtual ~SwXOutlineTarget() override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; enum class SwCreateDrawTable { diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index ae2ebe72f1d8..0a55c6c83e2f 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -770,8 +770,7 @@ public: { } - virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& rEvent) override { if (rEvent.State == frame::DispatchResultState::SUCCESS) { @@ -779,8 +778,7 @@ public: } } - virtual void SAL_CALL disposing(const css::lang::EventObject&) - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const css::lang::EventObject&) override { } }; diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 5a732e4af8cb..7d9b3c702934 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -235,25 +235,21 @@ SwAccessibleCell::~SwAccessibleCell() } OUString SAL_CALL SwAccessibleCell::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { return GetName(); } OUString SAL_CALL SwAccessibleCell::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString(sImplementationName); } sal_Bool SAL_CALL SwAccessibleCell::supportsService(const OUString& sTestServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sTestServiceName); } uno::Sequence< OUString > SAL_CALL SwAccessibleCell::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -285,7 +281,6 @@ void SwAccessibleCell::InvalidatePosOrSize( const SwRect& rOldBox ) // XAccessibleInterface uno::Any SwAccessibleCell::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { if (rType == cppu::UnoType<XAccessibleExtendedAttributes>::get()) { @@ -315,7 +310,6 @@ uno::Any SwAccessibleCell::queryInterface( const uno::Type& rType ) // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SwAccessibleCell::getTypes() - throw(uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() ); @@ -329,7 +323,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleCell::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -347,7 +340,6 @@ SwFrameFormat* SwAccessibleCell::GetTableBoxFormat() const //Implement TableCell currentValue uno::Any SwAccessibleCell::getCurrentValue( ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleValue ); @@ -356,7 +348,6 @@ uno::Any SwAccessibleCell::getCurrentValue( ) } sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleValue ); @@ -372,13 +363,11 @@ sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber ) } uno::Any SwAccessibleCell::getMaximumValue( ) - throw( uno::RuntimeException, std::exception ) { return uno::Any(DBL_MAX); } uno::Any SwAccessibleCell::getMinimumValue( ) - throw( uno::RuntimeException, std::exception ) { return uno::Any(-DBL_MAX); } @@ -406,7 +395,6 @@ static OUString ReplaceFourChar(const OUString& oldOUString) } css::uno::Any SAL_CALL SwAccessibleCell::getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -426,7 +414,6 @@ css::uno::Any SAL_CALL SwAccessibleCell::getExtendedAttributes() } sal_Int32 SAL_CALL SwAccessibleCell::getBackground() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -451,45 +438,38 @@ sal_Int32 SAL_CALL SwAccessibleCell::getBackground() // XAccessibleSelection void SwAccessibleCell::selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { m_aSelectionHelper.selectAccessibleChild(nChildIndex); } sal_Bool SwAccessibleCell::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { return m_aSelectionHelper.isAccessibleChildSelected(nChildIndex); } void SwAccessibleCell::clearAccessibleSelection( ) - throw ( uno::RuntimeException, std::exception ) { } void SwAccessibleCell::selectAllAccessibleChildren( ) - throw ( uno::RuntimeException, std::exception ) { m_aSelectionHelper.selectAllAccessibleChildren(); } sal_Int32 SwAccessibleCell::getSelectedAccessibleChildCount( ) - throw ( uno::RuntimeException, std::exception ) { return m_aSelectionHelper.getSelectedAccessibleChildCount(); } uno::Reference<XAccessible> SwAccessibleCell::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { return m_aSelectionHelper.getSelectedAccessibleChild(nSelectedChildIndex); } void SwAccessibleCell::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { m_aSelectionHelper.deselectAccessibleChild(nSelectedChildIndex); } diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index bb4cdb2f5b6e..213a4c1ff415 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -62,26 +62,22 @@ public: /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; // XServiceInfo // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override; @@ -93,8 +89,7 @@ public: // between those inherited through SwAccessibleContext and // XAccessibleValue). - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -103,55 +98,38 @@ public: { SwAccessibleContext::release(); }; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XAccessibleValue // XAccessibleExtendedAttributes - css::uno::Any SAL_CALL getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; + css::uno::Any SAL_CALL getExtendedAttributes() override ; private: SwFrameFormat* GetTableBoxFormat() const; public: - virtual css::uno::Any SAL_CALL getCurrentValue( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; - virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override; - virtual css::uno::Any SAL_CALL getMaximumValue( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) override; - virtual css::uno::Any SAL_CALL getMinimumValue( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) override; // XAccessibleComponent - sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getBackground() override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; - - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL clearAccessibleSelection( ) - throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nSelectedChildIndex ) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; }; #endif diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 52672aa34973..669773168b0d 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -540,14 +540,12 @@ SwAccessibleContext::~SwAccessibleContext() uno::Reference< XAccessibleContext > SAL_CALL SwAccessibleContext::getAccessibleContext() - throw (uno::RuntimeException, std::exception) { uno::Reference < XAccessibleContext > xRet( this ); return xRet; } sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -561,7 +559,6 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount() uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; @@ -609,7 +606,6 @@ uno::Reference< XAccessible> SAL_CALL } uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -634,7 +630,6 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent() } sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -657,27 +652,23 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent() } sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { return m_nRole; } OUString SAL_CALL SwAccessibleContext::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OSL_ENSURE(false, "description needs to be overriden"); THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overridden)" ); } OUString SAL_CALL SwAccessibleContext::getAccessibleName() - throw (uno::RuntimeException, std::exception) { return m_sName; } uno::Reference< XAccessibleRelationSet> SAL_CALL SwAccessibleContext::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { // by default there are no relations uno::Reference< XAccessibleRelationSet> xRet( new utl::AccessibleRelationSetHelper() ); @@ -686,7 +677,6 @@ uno::Reference< XAccessibleRelationSet> SAL_CALL uno::Reference<XAccessibleStateSet> SAL_CALL SwAccessibleContext::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -705,7 +695,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL } lang::Locale SAL_CALL SwAccessibleContext::getLocale() - throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -715,7 +704,6 @@ lang::Locale SAL_CALL SwAccessibleContext::getLocale() void SAL_CALL SwAccessibleContext::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -728,7 +716,6 @@ void SAL_CALL SwAccessibleContext::addAccessibleEventListener( void SAL_CALL SwAccessibleContext::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if (xListener.is() && m_nClientId) { @@ -760,7 +747,6 @@ static bool lcl_PointInRectangle(const awt::Point & aPoint, sal_Bool SAL_CALL SwAccessibleContext::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { awt::Rectangle aPixBounds = getBoundsImpl(true); aPixBounds.X = 0; @@ -771,7 +757,6 @@ sal_Bool SAL_CALL SwAccessibleContext::containsPoint( uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -827,7 +812,6 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint false: Use absolute mode. */ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -871,13 +855,11 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative) } awt::Rectangle SAL_CALL SwAccessibleContext::getBounds() - throw (uno::RuntimeException, std::exception) { return getBoundsImpl(true); } awt::Point SAL_CALL SwAccessibleContext::getLocation() - throw (uno::RuntimeException, std::exception) { awt::Rectangle aRect = getBoundsImpl(true); awt::Point aPoint(aRect.X, aRect.Y); @@ -886,7 +868,6 @@ awt::Point SAL_CALL SwAccessibleContext::getLocation() } awt::Point SAL_CALL SwAccessibleContext::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { awt::Rectangle aRect = getBoundsImpl(false); @@ -902,7 +883,6 @@ awt::Point SAL_CALL SwAccessibleContext::getLocationOnScreen() } awt::Size SAL_CALL SwAccessibleContext::getSize() - throw (uno::RuntimeException, std::exception) { awt::Rectangle aRect = getBoundsImpl(false); awt::Size aSize( aRect.Width, aRect.Height ); @@ -911,7 +891,6 @@ awt::Size SAL_CALL SwAccessibleContext::getSize() } void SAL_CALL SwAccessibleContext::grabFocus() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -952,19 +931,16 @@ void SAL_CALL SwAccessibleContext::grabFocus() } sal_Int32 SAL_CALL SwAccessibleContext::getForeground() - throw (uno::RuntimeException, std::exception) { return COL_BLACK; } sal_Int32 SAL_CALL SwAccessibleContext::getBackground() - throw (uno::RuntimeException, std::exception) { return COL_WHITE; } OUString SAL_CALL SwAccessibleContext::getImplementationName() - throw( uno::RuntimeException, std::exception ) { OSL_ENSURE( false, "implementation name needs to be overridden" ); @@ -972,13 +948,11 @@ OUString SAL_CALL SwAccessibleContext::getImplementationName() } sal_Bool SAL_CALL SwAccessibleContext::supportsService (const OUString& ServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL SwAccessibleContext::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { OSL_ENSURE( false, "supported services names needs to be overridden" ); THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supported services needs to be overridden" ) diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 6ffab870371c..764172e603f0 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -180,8 +180,7 @@ protected: /// @throws css::uno::RuntimeException css::awt::Rectangle SAL_CALL - getBoundsImpl(bool bRelative) - throw (css::uno::RuntimeException, std::exception); + getBoundsImpl(bool bRelative); // #i85634# inline void NotRegisteredAtAccessibleMap() @@ -200,118 +199,93 @@ public: // Return the XAccessibleContext. virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleContext() override; // XAccessibleContext // Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; // Return the specified child or NULL if index is invalid. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; + getAccessibleChild (sal_Int32 nIndex) override; // Return a reference to the parent. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleParent() override; // Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleIndexInParent() override; // Return this object's role. virtual sal_Int16 SAL_CALL - getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRole() override; // Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; // Return the object's current name. virtual OUString SAL_CALL - getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleName() override; // Return NULL to indicate that an empty relation set. virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRelationSet() override; // Return the set of current states. virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual css::lang::Locale SAL_CALL - getLocale() - throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + getLocale() override; // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( - const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint ) override; - virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; - virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() override; - virtual void SAL_CALL grabFocus() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() override; - virtual sal_Int32 SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground() override; + virtual sal_Int32 SAL_CALL getBackground() override; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // thread safe C++ interface diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index b64c39a9bb52..c206dcae072b 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -133,7 +133,6 @@ void SwAccessibleDocumentBase::RemoveChild( vcl::Window *pWin ) } sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -148,8 +147,6 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount() uno::Reference< XAccessible> SAL_CALL SwAccessibleDocumentBase::getAccessibleChild( sal_Int32 nIndex ) - throw (uno::RuntimeException, - lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; @@ -166,13 +163,11 @@ uno::Reference< XAccessible> SAL_CALL } uno::Reference< XAccessible> SAL_CALL SwAccessibleDocumentBase::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { return mxParent; } sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -196,13 +191,11 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent() } OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { return GetResource( STR_ACCESS_DOC_DESC ); } OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -230,7 +223,6 @@ OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName() } awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds() - throw (uno::RuntimeException, std::exception) { try { @@ -253,7 +245,6 @@ awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds() } awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -268,7 +259,6 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation() } css::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -283,7 +273,6 @@ css::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen() } css::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -299,7 +288,6 @@ css::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize() sal_Bool SAL_CALL SwAccessibleDocumentBase::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -316,7 +304,6 @@ sal_Bool SAL_CALL SwAccessibleDocumentBase::containsPoint( uno::Reference< XAccessible > SAL_CALL SwAccessibleDocumentBase::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -421,19 +408,16 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } OUString SAL_CALL SwAccessibleDocument::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString(sImplementationName); } sal_Bool SAL_CALL SwAccessibleDocument::supportsService(const OUString& sTestServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sTestServiceName); } uno::Sequence< OUString > SAL_CALL SwAccessibleDocument::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -446,7 +430,6 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleDocument::getSupportedServiceName uno::Any SwAccessibleDocument::queryInterface( const uno::Type& rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet; if ( rType == cppu::UnoType<XAccessibleSelection>::get() ) @@ -471,7 +454,6 @@ uno::Any SwAccessibleDocument::queryInterface( // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes() - throw(uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( SwAccessibleDocumentBase::getTypes() ); @@ -485,7 +467,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -494,41 +475,32 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId() void SwAccessibleDocument::selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception ) { maSelectionHelper.selectAccessibleChild(nChildIndex); } sal_Bool SwAccessibleDocument::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception ) { return maSelectionHelper.isAccessibleChildSelected(nChildIndex); } void SwAccessibleDocument::clearAccessibleSelection( ) - throw ( uno::RuntimeException, std::exception ) { } void SwAccessibleDocument::selectAllAccessibleChildren( ) - throw ( uno::RuntimeException, std::exception ) { maSelectionHelper.selectAllAccessibleChildren(); } sal_Int32 SwAccessibleDocument::getSelectedAccessibleChildCount( ) - throw ( uno::RuntimeException, std::exception ) { return maSelectionHelper.getSelectedAccessibleChildCount(); } uno::Reference<XAccessible> SwAccessibleDocument::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { return maSelectionHelper.getSelectedAccessibleChild(nSelectedChildIndex); } @@ -536,16 +508,11 @@ uno::Reference<XAccessible> SwAccessibleDocument::getSelectedAccessibleChild( // index has to be treated as global child index. void SwAccessibleDocument::deselectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception ) { maSelectionHelper.deselectAccessibleChild( nChildIndex ); } uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) { SolarMutexGuard g; @@ -776,7 +743,6 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() } sal_Int32 SAL_CALL SwAccessibleDocument::getBackground() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return SW_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor; @@ -784,8 +750,6 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground() css::uno::Sequence< css::uno::Any > SAL_CALL SwAccessibleDocument::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) - throw (css::uno::RuntimeException, - std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 342676aef5c4..b1cd613d7ebd 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -52,52 +52,41 @@ public: // XAccessibleContext // Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; // Return the specified child or NULL if index is invalid. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; + getAccessibleChild (sal_Int32 nIndex) override; // Return a reference to the parent. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleParent() override; // Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleIndexInParent() override; // Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; - virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName() override; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( - const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint ) override; - virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; - virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() override; }; /** @@ -127,19 +116,16 @@ public: // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XInterface @@ -148,8 +134,7 @@ public: // ambiguities. virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -158,41 +143,27 @@ public: { SwAccessibleContext::release(); }; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL clearAccessibleSelection( ) - throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nSelectedChildIndex ) override; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; - virtual css::uno::Any SAL_CALL getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Any SAL_CALL getExtendedAttributes() override; // thread safe C++ interface @@ -200,14 +171,11 @@ public: virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override; // XAccessibleComponent - sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getBackground() override; // XAccessibleGetAccFlowTo css::uno::Sequence< css::uno::Any > - SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) - throw (css::uno::RuntimeException, - std::exception) override; + SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) override; }; #endif diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index ef3b70b992d2..e0481fd46688 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -49,7 +49,6 @@ SwAccessibleEmbeddedObject::~SwAccessibleEmbeddedObject() // XInterface css::uno::Any SAL_CALL SwAccessibleEmbeddedObject::queryInterface (const css::uno::Type & rType) - throw (css::uno::RuntimeException, std::exception) { css::uno::Any aReturn = SwAccessibleNoTextFrame::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -73,19 +72,16 @@ void SAL_CALL } OUString SAL_CALL SwAccessibleEmbeddedObject::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString(sImplementationName); } sal_Bool SAL_CALL SwAccessibleEmbeddedObject::supportsService(const OUString& sTestServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sTestServiceName); } uno::Sequence< OUString > SAL_CALL SwAccessibleEmbeddedObject::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -95,14 +91,12 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleEmbeddedObject::getSupportedServi } uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XAccessibleExtendedAttributes css::uno::Any SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx index 76792b649c5c..5d37eb4d455c 100644 --- a/sw/source/core/access/accembedded.hxx +++ b/sw/source/core/access/accembedded.hxx @@ -38,8 +38,7 @@ public: // XInterface virtual css::uno::Any SAL_CALL - queryInterface (const css::uno::Type & rType) - throw (css::uno::RuntimeException, std::exception) override; + queryInterface (const css::uno::Type & rType) override; virtual void SAL_CALL acquire() @@ -53,26 +52,22 @@ public: // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XAccessibleExtendedAttributes - virtual css::uno::Any SAL_CALL getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getExtendedAttributes() override ; }; #endif diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index a2ec4ceb3e30..300b87495a69 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -69,7 +69,6 @@ SwAccessibleFootnote::~SwAccessibleFootnote() } OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -92,7 +91,6 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription() } OUString SAL_CALL SwAccessibleFootnote::getImplementationName() - throw( RuntimeException, std::exception ) { if( AccessibleRole::END_NOTE == GetRole() ) return OUString(sImplementationNameEndnote); @@ -101,13 +99,11 @@ OUString SAL_CALL SwAccessibleFootnote::getImplementationName() } sal_Bool SAL_CALL SwAccessibleFootnote::supportsService(const OUString& sTestServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sTestServiceName); } Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -120,7 +116,6 @@ Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames() } Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId() - throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index 12ff3e70e8de..01970eb9e916 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -40,29 +40,25 @@ public: /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; static bool IsEndnote( const SwFootnoteFrame *pFrame ); }; diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index 6c6a697d9adc..68952434684c 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -43,19 +43,16 @@ SwAccessibleGraphic::~SwAccessibleGraphic() } OUString SAL_CALL SwAccessibleGraphic::getImplementationName() - throw( RuntimeException, std::exception ) { return OUString("com.sun.star.comp.Writer.SwAccessibleGraphic"); } sal_Bool SAL_CALL SwAccessibleGraphic::supportsService(const OUString& sTestServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sTestServiceName); } Sequence< OUString > SAL_CALL SwAccessibleGraphic::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -65,14 +62,12 @@ Sequence< OUString > SAL_CALL SwAccessibleGraphic::getSupportedServiceNames() } Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId() - throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // Return this object's role. sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx index 754604d25511..038a3be708e2 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -35,24 +35,21 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; }; #endif diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index eb87ee5c4976..f9ecac61fc7a 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -62,7 +62,6 @@ SwAccessibleHeaderFooter::~SwAccessibleHeaderFooter() } OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -78,7 +77,6 @@ OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription() } OUString SAL_CALL SwAccessibleHeaderFooter::getImplementationName() - throw( RuntimeException, std::exception ) { if( AccessibleRole::HEADER == GetRole() ) return OUString(sImplementationNameHeader); @@ -87,13 +85,11 @@ OUString SAL_CALL SwAccessibleHeaderFooter::getImplementationName() } sal_Bool SAL_CALL SwAccessibleHeaderFooter::supportsService(const OUString& sTestServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sTestServiceName); } Sequence< OUString > SAL_CALL SwAccessibleHeaderFooter::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -106,13 +102,11 @@ Sequence< OUString > SAL_CALL SwAccessibleHeaderFooter::getSupportedServiceNames } Sequence< sal_Int8 > SAL_CALL SwAccessibleHeaderFooter::getImplementationId() - throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } sal_Int32 SAL_CALL SwAccessibleHeaderFooter::getBackground() - throw (css::uno::RuntimeException, std::exception) { Reference< XAccessible > xParent = getAccessibleParent(); if (xParent.is()) diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index fded39e7d55a..ce7eaa406eb2 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -40,32 +40,27 @@ public: /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XAccessibleComponent - sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getBackground() override; }; #endif diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index a62075282611..49f7c554023e 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -63,13 +63,11 @@ const SwTextAttr *SwAccessibleHyperlink::GetTextAttr() const // XAccessibleAction sal_Int32 SAL_CALL SwAccessibleHyperlink::getAccessibleActionCount() - throw (uno::RuntimeException, std::exception) { return isValid() ? 1 : 0; } sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -106,7 +104,6 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex ) OUString SAL_CALL SwAccessibleHyperlink::getAccessibleActionDescription( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { if(nIndex != 0) throw lang::IndexOutOfBoundsException(); @@ -123,7 +120,6 @@ OUString SAL_CALL SwAccessibleHyperlink::getAccessibleActionDescription( uno::Reference< XAccessibleKeyBinding > SAL_CALL SwAccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { uno::Reference< XAccessibleKeyBinding > xKeyBinding; @@ -147,7 +143,6 @@ uno::Reference< XAccessibleKeyBinding > SAL_CALL // XAccessibleHyperlink uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionAnchor( sal_Int32 nIndex) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -162,7 +157,6 @@ uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionAnchor( uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionObject( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -181,19 +175,16 @@ uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionObject( } sal_Int32 SAL_CALL SwAccessibleHyperlink::getStartIndex() - throw (uno::RuntimeException, std::exception) { return nStartIdx; } sal_Int32 SAL_CALL SwAccessibleHyperlink::getEndIndex() - throw (uno::RuntimeException, std::exception) { return nEndIdx; } sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (xPara.is()) diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx index 060be01b617d..24be02b59730 100644 --- a/sw/source/core/access/acchyperlink.hxx +++ b/sw/source/core/access/acchyperlink.hxx @@ -48,36 +48,22 @@ class SwAccessibleHyperlink : public: // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount() override; + virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override; virtual OUString SAL_CALL getAccessibleActionDescription( - sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL - getAccessibleActionKeyBinding( sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleHyperlink virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( - sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; virtual css::uno::Any SAL_CALL getAccessibleActionObject( - sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getStartIndex() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getEndIndex() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid( ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getStartIndex() override; + virtual sal_Int32 SAL_CALL getEndIndex() override; + virtual sal_Bool SAL_CALL isValid( ) override; }; #endif diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 10f6945a239f..3c484701c717 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -128,8 +128,8 @@ protected: public: explicit SwDrawModellListener_Impl( SdrModel *pDrawModel ); - virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void Dispose(); @@ -147,12 +147,12 @@ SwDrawModellListener_Impl::~SwDrawModellListener_Impl() Dispose(); } -void SAL_CALL SwDrawModellListener_Impl::addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwDrawModellListener_Impl::addEventListener( const uno::Reference< document::XEventListener >& xListener ) { maEventListeners.addInterface( xListener ); } -void SAL_CALL SwDrawModellListener_Impl::removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwDrawModellListener_Impl::removeEventListener( const uno::Reference< document::XEventListener >& xListener ) { maEventListeners.removeInterface( xListener ); } @@ -3109,7 +3109,7 @@ bool SwAccessibleMap::ReplaceChild ( const uno::Reference< drawing::XShape >& _rxShape, const long /*_nIndex*/, const ::accessibility::AccessibleShapeTreeInfo& /*_rShapeTreeInfo*/ - ) throw (uno::RuntimeException, std::exception) + ) { const SdrObject *pObj = nullptr; { @@ -3182,7 +3182,7 @@ bool SwAccessibleMap::ReplaceChild ( } //Get the accessible control shape from the model object, here model object is with XPropertySet type -::accessibility::AccessibleControlShape * SwAccessibleMap::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException) +::accessibility::AccessibleControlShape * SwAccessibleMap::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) { if( mpShapeMap ) { @@ -3207,7 +3207,6 @@ bool SwAccessibleMap::ReplaceChild ( css::uno::Reference< XAccessible > SwAccessibleMap::GetAccessibleCaption (const css::uno::Reference< css::drawing::XShape >&) - throw (css::uno::RuntimeException) { return nullptr; } diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 4163fc1db223..faa5736ad860 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -173,7 +173,6 @@ void SwAccessibleNoTextFrame::Dispose(bool bRecursive, bool bCanSkipInvisible) // #i73249# OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -188,7 +187,6 @@ OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName() } OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -200,7 +198,6 @@ OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleDescription() // XInterface uno::Any SAL_CALL SwAccessibleNoTextFrame::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { if( aType == ::cppu::UnoType<XAccessibleImage>::get() ) @@ -219,7 +216,7 @@ uno::Any SAL_CALL SwAccessibleNoTextFrame::queryInterface( const uno::Type& aTyp // XTypeProvider -uno::Sequence< uno::Type > SAL_CALL SwAccessibleNoTextFrame::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > SAL_CALL SwAccessibleNoTextFrame::getTypes() { uno::Sequence< uno::Type > aTypes( SwAccessibleFrameBase::getTypes() ); @@ -238,66 +235,62 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleNoTextFrame::getTypes() throw(un methods. So we just delegate to those. */ OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageDescription() - throw ( uno::RuntimeException, std::exception ) { return getAccessibleDescription(); } sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageHeight( ) - throw ( uno::RuntimeException, std::exception ) { return getSize().Height; } sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageWidth( ) - throw ( uno::RuntimeException, std::exception ) { return getSize().Width; } // XAccesibleText -sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCaretPosition( ) throw (css::uno::RuntimeException, std::exception){return 0;} -sal_Bool SAL_CALL SwAccessibleNoTextFrame::setCaretPosition( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return false;} -sal_Unicode SAL_CALL SwAccessibleNoTextFrame::getCharacter( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;} -css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SwAccessibleNoTextFrame::getCharacterAttributes( sal_Int32 , const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCaretPosition( ){return 0;} +sal_Bool SAL_CALL SwAccessibleNoTextFrame::setCaretPosition( sal_Int32 ){return false;} +sal_Unicode SAL_CALL SwAccessibleNoTextFrame::getCharacter( sal_Int32 ){return 0;} +css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SwAccessibleNoTextFrame::getCharacterAttributes( sal_Int32 , const css::uno::Sequence< OUString >& ) { uno::Sequence<beans::PropertyValue> aValues(0); return aValues; } -css::awt::Rectangle SAL_CALL SwAccessibleNoTextFrame::getCharacterBounds( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL SwAccessibleNoTextFrame::getCharacterBounds( sal_Int32 ) { return css::awt::Rectangle(0, 0, 0, 0 ); } -sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCharacterCount( ) throw (css::uno::RuntimeException, std::exception){return 0;} -sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getIndexAtPoint( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception){return 0;} -OUString SAL_CALL SwAccessibleNoTextFrame::getSelectedText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} -sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception){return 0;} -sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception){return 0;} -sal_Bool SAL_CALL SwAccessibleNoTextFrame::setSelection( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;} -OUString SAL_CALL SwAccessibleNoTextFrame::getText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} -OUString SAL_CALL SwAccessibleNoTextFrame::getTextRange( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();} -css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextAtIndex( sal_Int32 , sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCharacterCount( ){return 0;} +sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getIndexAtPoint( const css::awt::Point& ){return 0;} +OUString SAL_CALL SwAccessibleNoTextFrame::getSelectedText( ){return OUString();} +sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionStart( ){return 0;} +sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionEnd( ){return 0;} +sal_Bool SAL_CALL SwAccessibleNoTextFrame::setSelection( sal_Int32 , sal_Int32 ){return true;} +OUString SAL_CALL SwAccessibleNoTextFrame::getText( ){return OUString();} +OUString SAL_CALL SwAccessibleNoTextFrame::getTextRange( sal_Int32 , sal_Int32 ){return OUString();} +css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextAtIndex( sal_Int32 , sal_Int16 ) { css::accessibility::TextSegment aResult; return aResult; } -css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBeforeIndex( sal_Int32, sal_Int16 ) { css::accessibility::TextSegment aResult; return aResult; } -css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBehindIndex( sal_Int32 , sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBehindIndex( sal_Int32 , sal_Int16 ) { css::accessibility::TextSegment aResult; return aResult; } -sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;} +sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ){return true;} // XAccessibleHyperText sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getHyperLinkCount() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -314,7 +307,6 @@ throw (uno::RuntimeException, std::exception) uno::Reference< XAccessibleHyperlink > SAL_CALL SwAccessibleNoTextFrame::getHyperLink( sal_Int32 nLinkIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleHypertext ); @@ -340,13 +332,11 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL } sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getHyperLinkIndex( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { return 0; } uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleNoTextFrame::getAccessibleRelationSet( ) - throw ( uno::RuntimeException, std::exception ) { return new AccessibleRelationSetHelper(); } diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index ba7c9ec35257..746901455236 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -59,21 +59,18 @@ public: // #i73249# - Return the object's current name. virtual OUString SAL_CALL - getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleName() override; /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; // XInterface methods need to be implemented to disambiguate // between those inherited through SwAccessibleContext and // XAccessibleImage. virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -82,59 +79,50 @@ public: { SwAccessibleContext::release(); }; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XAccessibleImage virtual OUString SAL_CALL - getAccessibleImageDescription( ) - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleImageDescription( ) override; virtual sal_Int32 SAL_CALL - getAccessibleImageHeight( ) - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleImageHeight( ) override; virtual sal_Int32 SAL_CALL - getAccessibleImageWidth( ) - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleImageWidth( ) override; // The object is not visible an longer and should be destroyed virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override; - virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32 - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition( ) override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32 + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getCharacterCount( ) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual OUString SAL_CALL getSelectedText( ) override; + virtual sal_Int32 SAL_CALL getSelectionStart( ) override; + virtual sal_Int32 SAL_CALL getSelectionEnd( ) override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual OUString SAL_CALL getText( ) override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleHypertext - virtual sal_Int32 SAL_CALL getHyperLinkCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getHyperLinkCount() override; virtual css::uno::Reference< css::accessibility::XAccessibleHyperlink > - SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) override; + virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) override; SwAccessibleMap *GetAccessibleMap(){ return GetMap();} public: virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRelationSet() override; }; #endif diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx index d1aebb9cc33c..491c76c6d062 100644 --- a/sw/source/core/access/accnotexthyperlink.cxx +++ b/sw/source/core/access/accnotexthyperlink.cxx @@ -45,7 +45,6 @@ SwAccessibleNoTextHyperlink::SwAccessibleNoTextHyperlink( SwAccessibleNoTextFram // XAccessibleAction sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionCount() - throw (RuntimeException, std::exception) { SolarMutexGuard g; @@ -64,7 +63,6 @@ sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionCount() } sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIndex ) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -104,7 +102,6 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn OUString SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionDescription( sal_Int32 nIndex ) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard g; @@ -131,7 +128,6 @@ OUString SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionDescription( Reference< XAccessibleKeyBinding > SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex ) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard g; @@ -172,7 +168,6 @@ Reference< XAccessibleKeyBinding > SAL_CALL // XAccessibleHyperlink Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionAnchor( sal_Int32 nIndex ) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard g; @@ -190,7 +185,6 @@ Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionAnchor( Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionObject( sal_Int32 nIndex ) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard g; @@ -215,19 +209,16 @@ Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionObject( } sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getStartIndex() - throw (RuntimeException, std::exception) { return 0; } sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getEndIndex() - throw (RuntimeException, std::exception) { return 0; } sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid( ) - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx index 7629ef8272cc..d57cd29f2e86 100644 --- a/sw/source/core/access/accnotexthyperlink.hxx +++ b/sw/source/core/access/accnotexthyperlink.hxx @@ -46,35 +46,21 @@ public: SwAccessibleNoTextHyperlink( SwAccessibleNoTextFrame *p, const SwFrame* aFrame ); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount() override; + virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override; virtual OUString SAL_CALL getAccessibleActionDescription( - sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL - getAccessibleActionKeyBinding( sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleHyperlink virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( - sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; virtual css::uno::Any SAL_CALL getAccessibleActionObject( - sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getStartIndex() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getEndIndex() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid( ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getStartIndex() override; + virtual sal_Int32 SAL_CALL getEndIndex() override; + virtual sal_Bool SAL_CALL isValid( ) override; }; #endif diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index 0bf30f7be3ec..6c2d444af7d3 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -135,19 +135,16 @@ bool SwAccessiblePage::HasCursor() } OUString SwAccessiblePage::getImplementationName( ) - throw( RuntimeException, std::exception ) { return OUString(sImplementationName); } sal_Bool SwAccessiblePage::supportsService( const OUString& rServiceName) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence<OUString> SwAccessiblePage::getSupportedServiceNames( ) - throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -157,13 +154,11 @@ Sequence<OUString> SwAccessiblePage::getSupportedServiceNames( ) } Sequence< sal_Int8 > SAL_CALL SwAccessiblePage::getImplementationId() - throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } OUString SwAccessiblePage::getAccessibleDescription( ) - throw( RuntimeException, std::exception ) { CHECK_FOR_DEFUNC( css::accessibility::XAccessibleContext ); diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index ed6e25cbd3f4..61cd7a7457c3 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -55,22 +55,18 @@ public: // XAccessibleContext methods that need to be overridden - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService ( - const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& sServiceName) override; virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; virtual bool HasCursor() override; // required by map to remember that object }; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 92b0f99df6bf..624928acbc4a 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -573,7 +573,6 @@ bool SwAccessibleParagraph::HasCursor() } void SwAccessibleParagraph::UpdatePortionData() - throw( uno::RuntimeException ) { // obtain the text frame OSL_ENSURE( GetFrame() != nullptr, "The text frame has vanished!" ); @@ -871,11 +870,6 @@ bool SwAccessibleParagraph::GetTextBoundary( const OUString& rText, sal_Int32 nPos, sal_Int16 nTextType ) - throw ( - lang::IndexOutOfBoundsException, - lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) { // error checking if( !( AccessibleTextType::LINE == nTextType @@ -927,7 +921,6 @@ bool SwAccessibleParagraph::GetTextBoundary( } OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -941,7 +934,6 @@ OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription() } lang::Locale SAL_CALL SwAccessibleParagraph::getLocale() - throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -959,7 +951,6 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale() // #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccessibleRelationSet() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ); @@ -994,7 +985,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess } void SAL_CALL SwAccessibleParagraph::grabFocus() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1066,7 +1056,6 @@ static bool lcl_GetBackgroundColor( Color & rColor, } sal_Int32 SAL_CALL SwAccessibleParagraph::getForeground() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1088,7 +1077,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getForeground() } sal_Int32 SAL_CALL SwAccessibleParagraph::getBackground() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1103,20 +1091,17 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getBackground() } OUString SAL_CALL SwAccessibleParagraph::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString(sImplementationName); } sal_Bool SAL_CALL SwAccessibleParagraph::supportsService( const OUString& sTestServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sTestServiceName); } uno::Sequence< OUString > SAL_CALL SwAccessibleParagraph::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -1189,7 +1174,6 @@ uno::Sequence< OUString > const & getSupplementalAttributeNames() // XInterface uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType ) - throw (uno::RuntimeException, std::exception) { uno::Any aRet; if ( rType == cppu::UnoType<XAccessibleText>::get()) @@ -1251,7 +1235,7 @@ uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType ) } // XTypeProvider -uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() { uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() ); @@ -1273,7 +1257,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(uno: } uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1281,7 +1264,6 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId() // XAccesibleText sal_Int32 SwAccessibleParagraph::getCaretPosition() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1303,7 +1285,6 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition() } sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1336,7 +1317,6 @@ sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex ) } sal_Unicode SwAccessibleParagraph::getCharacter( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1611,9 +1591,6 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex) uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes( sal_Int32 nIndex, const uno::Sequence< OUString >& aRequestedAttributes ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -1883,7 +1860,6 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes( const uno::Sequence< OUString >& aRequestedAttributes ) - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -2053,8 +2029,6 @@ void SwAccessibleParagraph::_getRunAttributesImpl( uno::Sequence< PropertyValue > SwAccessibleParagraph::getRunAttributes( sal_Int32 nIndex, const uno::Sequence< OUString >& aRequestedAttributes ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -2353,7 +2327,6 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, awt::Rectangle SwAccessibleParagraph::getCharacterBounds( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2408,7 +2381,6 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds( } sal_Int32 SwAccessibleParagraph::getCharacterCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2418,7 +2390,6 @@ sal_Int32 SwAccessibleParagraph::getCharacterCount() } sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2494,7 +2465,6 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) } OUString SwAccessibleParagraph::getSelectedText() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2508,7 +2478,6 @@ OUString SwAccessibleParagraph::getSelectedText() } sal_Int32 SwAccessibleParagraph::getSelectionStart() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2520,7 +2489,6 @@ sal_Int32 SwAccessibleParagraph::getSelectionStart() } sal_Int32 SwAccessibleParagraph::getSelectionEnd() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2532,7 +2500,6 @@ sal_Int32 SwAccessibleParagraph::getSelectionEnd() } sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2568,7 +2535,6 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n } OUString SwAccessibleParagraph::getText() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2579,7 +2545,6 @@ OUString SwAccessibleParagraph::getText() OUString SwAccessibleParagraph::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2596,7 +2561,7 @@ OUString SwAccessibleParagraph::getTextRange( throw lang::IndexOutOfBoundsException(); } -/*accessibility::*/TextSegment SwAccessibleParagraph::getTextAtIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, std::exception) +/*accessibility::*/TextSegment SwAccessibleParagraph::getTextAtIndex( sal_Int32 nIndex, sal_Int16 nTextType ) { SolarMutexGuard aGuard; @@ -2632,7 +2597,7 @@ OUString SwAccessibleParagraph::getTextRange( return aResult; } -/*accessibility::*/TextSegment SwAccessibleParagraph::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, std::exception) +/*accessibility::*/TextSegment SwAccessibleParagraph::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 nTextType ) { SolarMutexGuard aGuard; @@ -2703,7 +2668,7 @@ OUString SwAccessibleParagraph::getTextRange( return aResult; } -/*accessibility::*/TextSegment SwAccessibleParagraph::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, std::exception) +/*accessibility::*/TextSegment SwAccessibleParagraph::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 nTextType ) { SolarMutexGuard aGuard; @@ -2801,7 +2766,6 @@ OUString SwAccessibleParagraph::getTextRange( } sal_Bool SwAccessibleParagraph::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); SolarMutexGuard aGuard; @@ -2815,7 +2779,6 @@ sal_Bool SwAccessibleParagraph::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI // XAccesibleEditableText sal_Bool SwAccessibleParagraph::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { CHECK_FOR_DEFUNC( XAccessibleEditableText ); SolarMutexGuard aGuard; @@ -2830,7 +2793,6 @@ sal_Bool SwAccessibleParagraph::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIn } sal_Bool SwAccessibleParagraph::pasteText( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { CHECK_FOR_DEFUNC( XAccessibleEditableText ); SolarMutexGuard aGuard; @@ -2845,13 +2807,11 @@ sal_Bool SwAccessibleParagraph::pasteText( sal_Int32 nIndex ) } sal_Bool SwAccessibleParagraph::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { return replaceText( nStartIndex, nEndIndex, OUString() ); } sal_Bool SwAccessibleParagraph::insertText( const OUString& sText, sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { return replaceText( nIndex, nIndex, sText ); } @@ -2859,7 +2819,6 @@ sal_Bool SwAccessibleParagraph::insertText( const OUString& sText, sal_Int32 nIn sal_Bool SwAccessibleParagraph::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2911,7 +2870,6 @@ sal_Bool SwAccessibleParagraph::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const uno::Sequence<PropertyValue>& rAttributeSet ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleEditableText ); @@ -2967,7 +2925,6 @@ sal_Bool SwAccessibleParagraph::setAttributes( } sal_Bool SwAccessibleParagraph::setText( const OUString& sText ) - throw (uno::RuntimeException, std::exception) { return replaceText(0, GetString().getLength(), sText); } @@ -2976,8 +2933,6 @@ sal_Bool SwAccessibleParagraph::setText( const OUString& sText ) void SwAccessibleParagraph::selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception ) { CHECK_FOR_DEFUNC( XAccessibleSelection ); @@ -2986,8 +2941,6 @@ void SwAccessibleParagraph::selectAccessibleChild( sal_Bool SwAccessibleParagraph::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception ) { CHECK_FOR_DEFUNC( XAccessibleSelection ); @@ -2995,13 +2948,11 @@ sal_Bool SwAccessibleParagraph::isAccessibleChildSelected( } void SwAccessibleParagraph::clearAccessibleSelection( ) - throw ( uno::RuntimeException, std::exception ) { CHECK_FOR_DEFUNC( XAccessibleSelection ); } void SwAccessibleParagraph::selectAllAccessibleChildren( ) - throw ( uno::RuntimeException, std::exception ) { CHECK_FOR_DEFUNC( XAccessibleSelection ); @@ -3009,7 +2960,6 @@ void SwAccessibleParagraph::selectAllAccessibleChildren( ) } sal_Int32 SwAccessibleParagraph::getSelectedAccessibleChildCount( ) - throw ( uno::RuntimeException, std::exception ) { CHECK_FOR_DEFUNC( XAccessibleSelection ); @@ -3018,8 +2968,6 @@ sal_Int32 SwAccessibleParagraph::getSelectedAccessibleChildCount( ) uno::Reference<XAccessible> SwAccessibleParagraph::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { CHECK_FOR_DEFUNC( XAccessibleSelection ); @@ -3029,8 +2977,6 @@ uno::Reference<XAccessible> SwAccessibleParagraph::getSelectedAccessibleChild( // index has to be treated as global child index. void SwAccessibleParagraph::deselectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception ) { CHECK_FOR_DEFUNC( XAccessibleSelection ); @@ -3091,7 +3037,6 @@ const SwTextAttr *SwHyperlinkIter_Impl::next() }; sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3110,7 +3055,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount() uno::Reference< XAccessibleHyperlink > SAL_CALL SwAccessibleParagraph::getHyperLink( sal_Int32 nLinkIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleHypertext ); @@ -3199,7 +3143,6 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL } sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleHypertext ); @@ -3239,8 +3182,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde // #i71360#, #i108125# - adjustments for change tracking text markup sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMarkupType ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -3267,14 +3208,11 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar //MSAA Extension Implementation in app module sal_Bool SAL_CALL SwAccessibleParagraph::scrollToPosition( const css::awt::Point&, sal_Bool ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { return false; } sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( ) - throw (css::uno::RuntimeException, - std::exception) { SolarMutexGuard g; @@ -3312,9 +3250,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( ) } sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionStart( sal_Int32 nSelectedPortionIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -3326,9 +3261,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionStart( sal_Int32 nSe } sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -3340,9 +3272,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionEnd( sal_Int32 nSele } sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) { SolarMutexGuard g; @@ -3398,9 +3327,6 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd } sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 startOffset, sal_Int32 endOffset) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -3465,9 +3391,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta /*accessibility::*/TextSegment SAL_CALL SwAccessibleParagraph::getTextMarkup( sal_Int32 nTextMarkupIndex, sal_Int32 nTextMarkupType ) - throw (lang::IndexOutOfBoundsException, - lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -3495,9 +3418,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL SwAccessibleParagraph::getTextMarkupAtIndex( sal_Int32 nCharIndex, sal_Int32 nTextMarkupType ) - throw (lang::IndexOutOfBoundsException, - lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -3531,8 +3451,6 @@ uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL // #i89175# sal_Int32 SAL_CALL SwAccessibleParagraph::getLineNumberAtIndex( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -3549,8 +3467,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getLineNumberAtIndex( sal_Int32 nIndex /*accessibility::*/TextSegment SAL_CALL SwAccessibleParagraph::getTextAtLineNumber( sal_Int32 nLineNo ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -3575,7 +3491,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getLineNumberAtIndex( sal_Int32 nIndex } /*accessibility::*/TextSegment SAL_CALL SwAccessibleParagraph::getTextAtLineWithCaret() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -3591,7 +3506,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getLineNumberAtIndex( sal_Int32 nIndex } sal_Int32 SAL_CALL SwAccessibleParagraph::getNumberOfLineWithCaret() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -3797,7 +3711,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex( return bRet; } -sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() throw (css::uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() { SolarMutexGuard g; @@ -3836,7 +3750,6 @@ sal_Int32 SwAccessibleParagraph::GetRealHeadingLevel() } uno::Any SAL_CALL SwAccessibleParagraph::getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 22054d82935f..11e05b9486fb 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -182,8 +182,7 @@ protected: // force update of new portion data /// @throws css::uno::RuntimeException - void UpdatePortionData() - throw( css::uno::RuntimeException ); + void UpdatePortionData(); // remove the current portion data void ClearPortionData(); @@ -191,7 +190,6 @@ protected: // get portion data; update if necessary /// @throws css::uno::RuntimeException SwAccessiblePortionData& GetPortionData() - throw( css::uno::RuntimeException ) { if( pPortionData == nullptr ) UpdatePortionData(); @@ -230,12 +228,7 @@ protected: bool GetTextBoundary( css::i18n::Boundary& rBound, const OUString& rText, sal_Int32 nPos, - sal_Int16 aTextType ) - throw ( - css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception); + sal_Int16 aTextType ); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew) override; @@ -249,54 +242,45 @@ public: virtual bool HasCursor() override; // required by map to remember that object css::uno::Sequence< css::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex ); - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; // XAccessibleContext // Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; // Return the parents locale or throw exception if this object has no // parent yet/anymore. virtual css::lang::Locale SAL_CALL - getLocale() - throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + getLocale() override; // #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRelationSet() override; // XAccessibleComponent - virtual void SAL_CALL grabFocus() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() override; // #i71385# - virtual sal_Int32 SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground() override; + virtual sal_Int32 SAL_CALL getBackground() override; // XServiceInfo // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XInterface @@ -305,8 +289,7 @@ public: // XAccessibleEditableText). virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -315,131 +298,81 @@ public: { SwAccessibleContext::release(); }; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getCharacterCount( ) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual OUString SAL_CALL getSelectedText( ) override; + virtual sal_Int32 SAL_CALL getSelectionStart() override; + virtual sal_Int32 SAL_CALL getSelectionEnd() override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual OUString SAL_CALL getText( ) override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleEditableText - virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) override; + virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) override; + virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) override; + virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) override; + virtual sal_Bool SAL_CALL setText( const OUString& sText ) override; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL clearAccessibleSelection( ) - throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nSelectedChildIndex ) override; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; // XAccessibleHypertext - virtual sal_Int32 SAL_CALL getHyperLinkCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getHyperLinkCount() override; virtual css::uno::Reference< css::accessibility::XAccessibleHyperlink > - SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) override; + virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) override; // #i71360# // XAccesibleTextMarkup - virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType ) override; virtual css::accessibility::TextSegment SAL_CALL getTextMarkup( sal_Int32 nTextMarkupIndex, - sal_Int32 nTextMarkupType ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nTextMarkupType ) override; virtual css::uno::Sequence< css::accessibility::TextSegment > SAL_CALL getTextMarkupAtIndex( sal_Int32 nCharIndex, - sal_Int32 nTextMarkupType ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nTextMarkupType ) override; // XAccessibleTextSelection - virtual sal_Bool SAL_CALL scrollToPosition( const css::awt::Point& aPoint, sal_Bool isLeftTop ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectedPortionCount( ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; - virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; - virtual sal_Int32 SAL_CALL addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + virtual sal_Bool SAL_CALL scrollToPosition( const css::awt::Point& aPoint, sal_Bool isLeftTop ) override; + virtual sal_Int32 SAL_CALL getSelectedPortionCount( ) override; + virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex ) override; + virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex ) override; + virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex ) override; + virtual sal_Int32 SAL_CALL addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset) override; // XAccessibleExtendedAttributes - virtual css::uno::Any SAL_CALL getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getExtendedAttributes() override ; bool GetSelectionAtIndex(sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd); sal_Int32 GetRealHeadingLevel(); // XAccessibleComponent @@ -447,26 +380,20 @@ public: // #i89175# // XAccessibleMultiLineText - virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex ) override; virtual css::accessibility::TextSegment SAL_CALL - getTextAtLineNumber( sal_Int32 nLineNo ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getTextAtLineNumber( sal_Int32 nLineNo ) override; virtual css::accessibility::TextSegment SAL_CALL - getTextAtLineWithCaret() - throw (css::uno::RuntimeException, std::exception) override; + getTextAtLineWithCaret() override; - virtual sal_Int32 SAL_CALL getNumberOfLineWithCaret() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getNumberOfLineWithCaret() override; // #i63870# // XAccesibleTextAttributes - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; }; inline SwAccessibleParagraph::operator css::accessibility::XAccessibleText *() diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 269e1ed82c10..2489dc307a06 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -40,36 +40,32 @@ SwAccessiblePreview::~SwAccessiblePreview() } OUString SwAccessiblePreview::getImplementationName( ) - throw( RuntimeException, std::exception ) { return OUString( sImplementationName ); } sal_Bool SwAccessiblePreview::supportsService( const OUString& rServiceName ) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence<OUString> SwAccessiblePreview::getSupportedServiceNames( ) - throw( RuntimeException, std::exception ) { return {"com.sun.star.text.AccessibleTextDocumentPageView", sAccessibleServiceName}; } Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId() - throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } -OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription() { return GetResource( STR_ACCESS_PREVIEW_DOC_NAME ); } -OUString SAL_CALL SwAccessiblePreview::getAccessibleName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL SwAccessiblePreview::getAccessibleName() { return SwAccessibleDocumentBase::getAccessibleName() + " " + GetResource( STR_ACCESS_PREVIEW_DOC_SUFFIX ); } diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index ad807fbc7ac7..cc9cab268795 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -42,27 +42,24 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; - OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getAccessibleDescription() override; + OUString SAL_CALL getAccessibleName() override; virtual void InvalidateFocus_() override; }; diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index 475990901759..ebe0cb4777d4 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -66,7 +66,6 @@ SwFEShell* SwAccessibleSelectionHelper::GetFEShell() } void SwAccessibleSelectionHelper::throwIndexOutOfBoundsException() - throw ( lang::IndexOutOfBoundsException ) { Reference < XAccessibleContext > xThis( &m_rContext ); Reference < XAccessibleSelection >xSelThis( xThis, UNO_QUERY ); @@ -79,8 +78,6 @@ void SwAccessibleSelectionHelper::throwIndexOutOfBoundsException() // XAccessibleSelection void SwAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - RuntimeException ) { SolarMutexGuard aGuard; @@ -139,8 +136,6 @@ static bool lcl_getSelectedState(const SwAccessibleChild& aChild, bool SwAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - RuntimeException ) { SolarMutexGuard aGuard; @@ -175,7 +170,6 @@ bool SwAccessibleSelectionHelper::isAccessibleChildSelected( } void SwAccessibleSelectionHelper::selectAllAccessibleChildren( ) - throw ( RuntimeException ) { SolarMutexGuard aGuard; @@ -207,7 +201,6 @@ void SwAccessibleSelectionHelper::selectAllAccessibleChildren( ) } sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) - throw ( RuntimeException ) { SolarMutexGuard aGuard; @@ -272,8 +265,6 @@ sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, - RuntimeException) { SolarMutexGuard aGuard; @@ -367,8 +358,6 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( // index has to be treated as global child index. void SwAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - RuntimeException ) { SolarMutexGuard g; diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx index e1ab1e8924ef..497c071f02fe 100644 --- a/sw/source/core/access/accselectionhelper.hxx +++ b/sw/source/core/access/accselectionhelper.hxx @@ -33,8 +33,7 @@ class SwAccessibleSelectionHelper SwFEShell* GetFEShell(); /// @throws css::lang::IndexOutOfBoundsException - void throwIndexOutOfBoundsException() - throw ( css::lang::IndexOutOfBoundsException ); + void throwIndexOutOfBoundsException(); public: SwAccessibleSelectionHelper( SwAccessibleContext& rContext ); @@ -45,35 +44,25 @@ public: /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException void selectAccessibleChild( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException ); + sal_Int32 nChildIndex ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException bool isAccessibleChildSelected( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException ); + sal_Int32 nChildIndex ); /// @throws css::uno::RuntimeException - void selectAllAccessibleChildren( ) - throw ( css::uno::RuntimeException ); + void selectAllAccessibleChildren( ); /// @throws css::uno::RuntimeException - sal_Int32 getSelectedAccessibleChildCount( ) - throw ( css::uno::RuntimeException ); + sal_Int32 getSelectedAccessibleChildCount( ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException css::uno::Reference< css::accessibility::XAccessible > getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + sal_Int32 nSelectedChildIndex ); // index has to be treated as global child index. /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException void deselectAccessibleChild( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException ); + sal_Int32 nChildIndex ); }; #endif diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 7a2463c1905f..12afc54a8db5 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -117,8 +117,7 @@ public: /// @throws lang::IndexOutOfBoundsException /// @throws uno::RuntimeException - const SwFrame *GetCell( sal_Int32 nRow, sal_Int32 nColumn, SwAccessibleTable *pThis ) const - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception); + const SwFrame *GetCell( sal_Int32 nRow, sal_Int32 nColumn, SwAccessibleTable *pThis ) const; const SwFrame *GetCellAtPos( sal_Int32 nLeft, sal_Int32 nTop ) const; inline sal_Int32 GetRowCount() const; inline sal_Int32 GetColumnCount() const; @@ -131,8 +130,7 @@ public: /// @throws lang::IndexOutOfBoundsException void CheckRowAndCol( sal_Int32 nRow, sal_Int32 nCol, - SwAccessibleTable *pThis ) const - throw(lang::IndexOutOfBoundsException ); + SwAccessibleTable *pThis ) const; void GetRowColumnAndExtent( const SwRect& rBox, sal_Int32& rRow, sal_Int32& rColumn, @@ -419,7 +417,6 @@ void SwAccessibleTableData_Impl::GetSelection( const SwFrame *SwAccessibleTableData_Impl::GetCell( sal_Int32 nRow, sal_Int32 nColumn, SwAccessibleTable *pThis ) const - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { CheckRowAndCol( nRow, nColumn, pThis ); @@ -536,7 +533,6 @@ inline Int32Set_Impl::const_iterator SwAccessibleTableData_Impl::GetColumnIter( void SwAccessibleTableData_Impl::CheckRowAndCol( sal_Int32 nRow, sal_Int32 nCol, SwAccessibleTable *pThis ) const - throw(lang::IndexOutOfBoundsException ) { if( ( nRow < 0 || nRow >= static_cast< sal_Int32 >( maRows.size() ) ) || ( nCol < 0 || nCol >= static_cast< sal_Int32 >( maColumns.size() ) ) ) @@ -846,7 +842,6 @@ void SwAccessibleTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew } uno::Any SwAccessibleTable::queryInterface( const uno::Type& rType ) - throw (uno::RuntimeException, std::exception) { uno::Any aRet; if ( rType == cppu::UnoType<XAccessibleTable>::get() ) @@ -874,7 +869,6 @@ uno::Any SwAccessibleTable::queryInterface( const uno::Type& rType ) // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SwAccessibleTable::getTypes() - throw(uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() ); @@ -889,7 +883,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleTable::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTable::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -915,7 +908,6 @@ void SwAccessibleTable::ClearTableData() } OUString SAL_CALL SwAccessibleTable::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -925,7 +917,6 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleDescription() } sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -935,7 +926,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowCount() } sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnCount( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -946,7 +936,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnCount( ) OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription( sal_Int32 nRow ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { // #i87532# - determine table cell in <nRow>th row and // in first column of row header table and return its text content. @@ -980,7 +969,6 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription( OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { // #i87532# - determine table cell in first row and // in <nColumn>th column of column header table and return its text content. @@ -1014,7 +1002,6 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription( sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { sal_Int32 nExtend = -1; @@ -1045,7 +1032,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt( sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { sal_Int32 nExtend = -1; @@ -1076,7 +1062,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt( uno::Reference< XAccessibleTable > SAL_CALL SwAccessibleTable::getAccessibleRowHeaders( ) - throw (uno::RuntimeException, std::exception) { // Row headers aren't supported return uno::Reference< XAccessibleTable >(); @@ -1084,7 +1069,6 @@ uno::Reference< XAccessibleTable > SAL_CALL uno::Reference< XAccessibleTable > SAL_CALL SwAccessibleTable::getAccessibleColumnHeaders( ) - throw (uno::RuntimeException, std::exception) { // #i87532# - assure that return accessible object is empty, // if no column header exists. @@ -1100,7 +1084,6 @@ uno::Reference< XAccessibleTable > SAL_CALL } uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleRows() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1124,7 +1107,6 @@ uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleRows } uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleColumns() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1147,7 +1129,6 @@ uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleColu } sal_Bool SAL_CALL SwAccessibleTable::isAccessibleRowSelected( sal_Int32 nRow ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1174,7 +1155,6 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleRowSelected( sal_Int32 nRow ) sal_Bool SAL_CALL SwAccessibleTable::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1202,7 +1182,6 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleColumnSelected( uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { uno::Reference< XAccessible > xRet; @@ -1219,14 +1198,12 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCellAt( } uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCaption() - throw (uno::RuntimeException, std::exception) { // captions aren't supported return uno::Reference< XAccessible >(); } uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleSummary() - throw (uno::RuntimeException, std::exception) { // summaries aren't supported return uno::Reference< XAccessible >(); @@ -1234,7 +1211,6 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleSummary() sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { bool bRet = false; @@ -1261,7 +1237,6 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected( sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { sal_Int32 nRet = -1; @@ -1279,7 +1254,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex( } sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { sal_Int32 nRet = -1; @@ -1317,7 +1291,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex ) sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { sal_Int32 nRet = -1; @@ -1354,20 +1327,17 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn( } OUString SAL_CALL SwAccessibleTable::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.Writer.SwAccessibleTableView"); } sal_Bool SAL_CALL SwAccessibleTable::supportsService( const OUString& sTestServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sTestServiceName); } uno::Sequence< OUString > SAL_CALL SwAccessibleTable::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -1488,7 +1458,6 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil void SAL_CALL SwAccessibleTable::selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); @@ -1567,8 +1536,6 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild( sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); @@ -1580,7 +1547,6 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected( } void SAL_CALL SwAccessibleTable::clearAccessibleSelection( ) - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -1596,7 +1562,6 @@ void SAL_CALL SwAccessibleTable::clearAccessibleSelection( ) } void SAL_CALL SwAccessibleTable::selectAllAccessibleChildren( ) - throw ( uno::RuntimeException, std::exception ) { // first clear selection, then select first and last child clearAccessibleSelection(); @@ -1605,7 +1570,6 @@ void SAL_CALL SwAccessibleTable::selectAllAccessibleChildren( ) } sal_Int32 SAL_CALL SwAccessibleTable::getSelectedAccessibleChildCount( ) - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); @@ -1623,8 +1587,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getSelectedAccessibleChildCount( ) uno::Reference<XAccessible> SAL_CALL SwAccessibleTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); @@ -1651,8 +1613,6 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTable::getSelectedAccessibleChi // index has to be treated as global child index. void SAL_CALL SwAccessibleTable::deselectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); @@ -1701,7 +1661,6 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild( } sal_Int32 SAL_CALL SwAccessibleTable::getBackground() - throw (css::uno::RuntimeException, std::exception) { const SvxBrushItem &rBack = GetFrame()->GetAttrSet()->GetBackground(); sal_uInt32 crBack = rBack.GetColor().GetColor(); @@ -1780,7 +1739,6 @@ void SwAccessibleTable::AddSelectionCell( // XAccessibleTableSelection sal_Bool SAL_CALL SwAccessibleTable::selectRow( sal_Int32 row ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1797,7 +1755,6 @@ sal_Bool SAL_CALL SwAccessibleTable::selectRow( sal_Int32 row ) return true; } sal_Bool SAL_CALL SwAccessibleTable::selectColumn( sal_Int32 column ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1815,9 +1772,6 @@ sal_Bool SAL_CALL SwAccessibleTable::selectColumn( sal_Int32 column ) } sal_Bool SAL_CALL SwAccessibleTable::unselectRow( sal_Int32 row ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, - std::exception) { SolarMutexGuard g; @@ -1836,9 +1790,6 @@ sal_Bool SAL_CALL SwAccessibleTable::unselectRow( sal_Int32 row ) } sal_Bool SAL_CALL SwAccessibleTable::unselectColumn( sal_Int32 column ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, - std::exception) { SolarMutexGuard g; @@ -1888,14 +1839,12 @@ void SwAccessibleTableColHeaders::Modify( const SfxPoolItem * /*pOld*/, const Sf // XInterface uno::Any SAL_CALL SwAccessibleTableColHeaders::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { return SwAccessibleTable::queryInterface( aType ); } // XAccessibleContext sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1933,7 +1882,6 @@ sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount() uno::Reference< XAccessible> SAL_CALL SwAccessibleTableColHeaders::getAccessibleChild (sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { if ( nIndex < 0 || nIndex >= getAccessibleChildCount() ) { @@ -1946,14 +1894,12 @@ uno::Reference< XAccessible> SAL_CALL // XAccessibleTable uno::Reference< XAccessibleTable > SAL_CALL SwAccessibleTableColHeaders::getAccessibleRowHeaders() - throw (uno::RuntimeException, std::exception) { return uno::Reference< XAccessibleTable >(); } uno::Reference< XAccessibleTable > SAL_CALL SwAccessibleTableColHeaders::getAccessibleColumnHeaders() - throw (uno::RuntimeException, std::exception) { return uno::Reference< XAccessibleTable >(); } @@ -1961,7 +1907,6 @@ uno::Reference< XAccessibleTable > // XServiceInfo OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName() - throw (uno::RuntimeException, std::exception) { static const sal_Char sImplName[] = "com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView"; return OUString(sImplName); diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 830798c15e1e..db4e9c32f2bb 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -95,8 +95,7 @@ public: // XAccessibleTable). virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -105,118 +104,76 @@ public: { SwAccessibleContext::release(); }; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XAccessibleContext /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; // XAccessibleTable - virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleRowCount() override; + virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) override; virtual OUString SAL_CALL getAccessibleRowDescription( - sal_Int32 nRow ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nRow ) override; virtual OUString SAL_CALL getAccessibleColumnDescription( - sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nColumn ) override; virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( - sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nRow, sal_Int32 nColumn ) override; virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( - sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nRow, sal_Int32 nColumn ) override; virtual css::uno::Reference< css::accessibility::XAccessibleTable > - SAL_CALL getAccessibleRowHeaders( ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getAccessibleRowHeaders( ) override; virtual css::uno::Reference< css::accessibility::XAccessibleTable > - SAL_CALL getAccessibleColumnHeaders( ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getAccessibleColumnHeaders( ) override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleRows( ) - throw (css::uno::RuntimeException, std::exception) override; + getSelectedAccessibleRows( ) override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleColumns( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getSelectedAccessibleColumns( ) override; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCaption( ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleCaption( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleSummary( ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleSummary( ) override; virtual sal_Bool SAL_CALL isAccessibleSelected( - sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nRow, sal_Int32 nColumn ) override; virtual sal_Int32 SAL_CALL getAccessibleIndex( - sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; // XAccessibleTableSelection - virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; - virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; - virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override ; + virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override ; + virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) override; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // C++ interface @@ -234,38 +191,26 @@ public: // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; - virtual void SAL_CALL clearAccessibleSelection( ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nSelectedChildIndex ) override; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; // XAccessibleComponent - sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getBackground() override; typedef std::vector< std::pair<SwAccessibleContext*, css::uno::WeakReference<css::accessibility::XAccessible> > > Cells_t; Cells_t m_vecCellAdd; @@ -297,39 +242,32 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& aType ) override; // XAccessibleContext /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; + getAccessibleChild (sal_Int32 nIndex) override; // XAccessibleTable virtual css::uno::Reference< css::accessibility::XAccessibleTable > - SAL_CALL getAccessibleRowHeaders( ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getAccessibleRowHeaders( ) override; virtual css::uno::Reference< css::accessibility::XAccessibleTable > - SAL_CALL getAccessibleColumnHeaders( ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getAccessibleColumnHeaders( ) override; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; }; #endif diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index c253eacd572a..61ae50523920 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -142,7 +142,6 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * css::uno::Any SAL_CALL SwAccessibleTextFrame::queryInterface (const css::uno::Type & rType) - throw (css::uno::RuntimeException, std::exception) { css::uno::Any aReturn = SwAccessibleContext::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -169,13 +168,11 @@ void SAL_CALL // XAccessibleSelection void SAL_CALL SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 )> - missing implementation"); } sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -201,19 +198,16 @@ sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nC } void SAL_CALL SwAccessibleTextFrame::clearAccessibleSelection( ) - throw ( uno::RuntimeException, std::exception ) { SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::clearAccessibleSelection()> - missing implementation"); } void SAL_CALL SwAccessibleTextFrame::selectAllAccessibleChildren( ) - throw ( uno::RuntimeException, std::exception ) { SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::selectAllAccessibleChildren()> - missing implementation"); } sal_Int32 SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChildCount() - throw ( uno::RuntimeException, std::exception ) { sal_Int32 nCount = 0; sal_Int32 TotalCount = getAccessibleChildCount(); @@ -224,7 +218,6 @@ sal_Int32 SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChildCount() } uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -242,14 +235,12 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibl } void SAL_CALL SwAccessibleTextFrame::deselectAccessibleChild( sal_Int32 ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::selectAllAccessibleChildren( sal_Int32 )> - missing implementation"); } // #i73249# OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -264,7 +255,6 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName() } OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -275,19 +265,16 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription() } OUString SAL_CALL SwAccessibleTextFrame::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.Writer.SwAccessibleTextFrameView"); } sal_Bool SAL_CALL SwAccessibleTextFrame::supportsService(const OUString& sTestServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sTestServiceName); } uno::Sequence< OUString > SAL_CALL SwAccessibleTextFrame::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -297,7 +284,6 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleTextFrame::getSupportedServiceNam } uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTextFrame::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -325,7 +311,6 @@ AccessibleRelation SwAccessibleTextFrame::makeRelation( sal_Int16 nType, const S } uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleTextFrame::getAccessibleRelationSet( ) - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ); diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index bfe74eeb0038..3b6d5cec590c 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -46,74 +46,57 @@ public: SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrame& rFlyFrame ); virtual css::uno::Any SAL_CALL queryInterface( - css::uno::Type const & rType ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Type const & rType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( - sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nChildIndex ) override; - virtual void SAL_CALL clearAccessibleSelection( ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nSelectedChildIndex ) override; virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nSelectedChildIndex ) override; // XAccessibleContext // #i73249# - Return the object's current name. virtual OUString SAL_CALL - getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleName() override; /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XAccessibleContext::getAccessibleRelationSet @@ -128,8 +111,7 @@ private: sal_Int16 nType, const SwFlyFrame* pFrame ); public: - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() override; }; #endif diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx index 407458aa75b2..4372df0ab1fb 100644 --- a/sw/source/core/access/textmarkuphelper.cxx +++ b/sw/source/core/access/textmarkuphelper.cxx @@ -37,8 +37,6 @@ namespace { /// @throws css::uno::RuntimeException const SwWrongList* getTextMarkupList( const SwTextNode& rTextNode, const sal_Int32 nTextMarkupType ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) { const SwWrongList* pTextMarkupList( nullptr ); switch ( nTextMarkupType ) @@ -90,8 +88,6 @@ SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionD } sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupType ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) { sal_Int32 nTextMarkupCount( 0 ); @@ -111,9 +107,6 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp css::accessibility::TextSegment SwTextMarkupHelper::getTextMarkup( const sal_Int32 nTextMarkupIndex, const sal_Int32 nTextMarkupType ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException) { if ( nTextMarkupIndex >= getTextMarkupCount( nTextMarkupType ) || nTextMarkupIndex < 0 ) @@ -157,9 +150,6 @@ css::accessibility::TextSegment css::uno::Sequence< css::accessibility::TextSegment > SwTextMarkupHelper::getTextMarkupAtIndex( const sal_Int32 nCharIndex, const sal_Int32 nTextMarkupType ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException) { // assumption: // value of <nCharIndex> is in range [0..length of accessible text) diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx index 642f4c75fccf..de3af6013dc6 100644 --- a/sw/source/core/access/textmarkuphelper.hxx +++ b/sw/source/core/access/textmarkuphelper.hxx @@ -42,29 +42,21 @@ class SwTextMarkupHelper /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - sal_Int32 getTextMarkupCount( const sal_Int32 nTextMarkupType ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + sal_Int32 getTextMarkupCount( const sal_Int32 nTextMarkupType ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException css::accessibility::TextSegment getTextMarkup( const sal_Int32 nTextMarkupIndex, - const sal_Int32 nTextMarkupType ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException); + const sal_Int32 nTextMarkupType ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException css::uno::Sequence< css::accessibility::TextSegment > getTextMarkupAtIndex( const sal_Int32 nCharIndex, - const sal_Int32 nTextMarkupType ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException); + const sal_Int32 nTextMarkupType ); private: SwTextMarkupHelper( const SwTextMarkupHelper& ) = delete; diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx index ae43d6c62e6d..5cab3c578a20 100644 --- a/sw/source/core/bastyp/SwSmartTagMgr.cxx +++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx @@ -48,7 +48,7 @@ SwSmartTagMgr::~SwSmartTagMgr() { } -void SwSmartTagMgr::modified( const lang::EventObject& rEO ) throw( RuntimeException, std::exception ) +void SwSmartTagMgr::modified( const lang::EventObject& rEO ) { SolarMutexGuard aGuard; @@ -58,7 +58,7 @@ void SwSmartTagMgr::modified( const lang::EventObject& rEO ) throw( RuntimeExcep SmartTagMgr::modified( rEO ); } -void SwSmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( RuntimeException, std::exception) +void SwSmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) { SolarMutexGuard aGuard; diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index 3bf4a6a86013..8ccc886fd1a9 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -181,7 +181,7 @@ sal_Int32 SwTextBoxHelper::getCount(const SwDoc* pDoc) return nRet; } -uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex) throw(lang::IndexOutOfBoundsException) +uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex) { if (nIndex < 0) throw lang::IndexOutOfBoundsException(); diff --git a/sw/source/core/docnode/cancellablejob.cxx b/sw/source/core/docnode/cancellablejob.cxx index 9704824e10ce..2326ba479e36 100644 --- a/sw/source/core/docnode/cancellablejob.cxx +++ b/sw/source/core/docnode/cancellablejob.cxx @@ -25,7 +25,7 @@ CancellableJob::CancellableJob( const rtl::Reference< ObservableThread >& rThrea } // css::util::XCancellable: -void SAL_CALL CancellableJob::cancel() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL CancellableJob::cancel() { mrThread->join(); } diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx index 6f6a051b8ce1..ac3a8ed18c4f 100644 --- a/sw/source/core/docnode/cancellablejob.hxx +++ b/sw/source/core/docnode/cancellablejob.hxx @@ -34,7 +34,7 @@ public: explicit CancellableJob( const ::rtl::Reference< ObservableThread >& rThread ); // css::util::XCancellable: - virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() override; private: CancellableJob( CancellableJob& ) = delete; diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 288dc1a3914d..da4ca6bd2650 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -278,24 +278,24 @@ FinalThreadManager::~FinalThreadManager() } // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL FinalThreadManager::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL FinalThreadManager::getImplementationName() { return OUString("com.sun.star.util.comp.FinalThreadManager"); } -sal_Bool SAL_CALL FinalThreadManager::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL FinalThreadManager::supportsService(OUString const & serviceName) { return cppu::supportsService(this, serviceName); } -css::uno::Sequence< OUString > SAL_CALL FinalThreadManager::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL FinalThreadManager::getSupportedServiceNames() { css::uno::Sequence< OUString > s { "com.sun.star.util.JobManager" }; return s; } // css::util::XJobManager: -void SAL_CALL FinalThreadManager::registerJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL FinalThreadManager::registerJob(const css::uno::Reference< css::util::XCancellable > & Job) { osl::MutexGuard aGuard(maMutex); @@ -308,14 +308,14 @@ void SAL_CALL FinalThreadManager::registerJob(const css::uno::Reference< css::ut } } -void SAL_CALL FinalThreadManager::releaseJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL FinalThreadManager::releaseJob(const css::uno::Reference< css::util::XCancellable > & Job) { osl::MutexGuard aGuard(maMutex); maThreads.remove( Job ); } -void SAL_CALL FinalThreadManager::cancelAllJobs() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL FinalThreadManager::cancelAllJobs() { std::list< css::uno::Reference< css::util::XCancellable > > aThreads; { @@ -349,7 +349,7 @@ void SAL_CALL FinalThreadManager::cancelAllJobs() throw (css::uno::RuntimeExcept } // css::frame::XTerminateListener -void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject& ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) +void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject& ) { osl::MutexGuard aGuard(maMutex); @@ -393,7 +393,7 @@ void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject return; } -void SAL_CALL FinalThreadManager::cancelTermination( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL FinalThreadManager::cancelTermination( const css::lang::EventObject& ) { if ( mpPauseThreadStarting != nullptr ) { @@ -404,7 +404,7 @@ void SAL_CALL FinalThreadManager::cancelTermination( const css::lang::EventObjec return; } -void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObject& ) { if ( mpTerminateOfficeThread != nullptr ) { @@ -434,7 +434,7 @@ void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObjec } // ::com::sun:star::lang::XEventListener (inherited via css::frame::XTerminateListener) -void SAL_CALL FinalThreadManager::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL FinalThreadManager::disposing( const css::lang::EventObject& ) { // nothing to do, because instance doesn't hold any references of observed objects } diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 056b3feaa8a6..be658b8567dc 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -73,8 +73,7 @@ public: virtual ~SwXMLTextBlockImport() throw() override; - virtual void SAL_CALL endDocument() - throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL endDocument() override; }; enum SwXMLTextBlockToken : sal_Int32 @@ -95,10 +94,8 @@ public: virtual ~SwXMLTextBlockTokenHandler() override; //XFastTokenHandler - sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) override; //Much fast direct C++ shortcut to the method that matters virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const override; @@ -124,10 +121,8 @@ public: virtual ~SwXMLBlockListTokenHandler() override; //XFastTokenHandler - sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) override; + css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) override; //Much fast direct C++ shortcut to the method that matters virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const override; diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index c0bee0532fbb..773259e59163 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -42,35 +42,24 @@ public: virtual ~SwXTextDefaults () override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, 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& rPropertyName ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, 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& rPropertyName, 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& rPropertyName, 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& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) - 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 >& rPropertyNames ) - throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) - throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; #endif diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx index a813db9b6244..901fa79db575 100644 --- a/sw/source/core/inc/dumpfilter.hxx +++ b/sw/source/core/inc/dumpfilter.hxx @@ -38,26 +38,19 @@ namespace sw { virtual ~LayoutDumpFilter() override; // XFilter - virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override; + virtual void SAL_CALL cancel( ) override; // XExporter - virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; } diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 122f240cc604..5b13c57b66c2 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -59,15 +59,11 @@ protected: /// @throws css::uno::RuntimeException void attachToRangeEx( const css::uno::Reference< css::text::XTextRange > & xTextRange, - IDocumentMarkAccess::MarkType eType) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException ); + IDocumentMarkAccess::MarkType eType); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException virtual void attachToRange( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + const css::uno::Reference< css::text::XTextRange > & xTextRange); const ::sw::mark::IMark* GetBookmark() const; @@ -98,85 +94,52 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< - css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::XVetoableChangeListener >& xListener) override; // XNamed - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName(const OUString& rName) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& rName) override; // XTextContent virtual void SAL_CALL attach( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override; }; @@ -191,23 +154,23 @@ class SwXFieldmarkParameters } // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; protected: //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; private: /// @throws css::uno::RuntimeException - ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (css::uno::RuntimeException); + ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters(); }; typedef cppu::ImplInheritanceHelper< SwXBookmark, @@ -233,29 +196,16 @@ public: bool isReplacementObject = false); virtual void attachToRange( - const css::uno::Reference<css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override; - virtual OUString SAL_CALL getFieldType() - throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setFieldType(const OUString& description ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getParameters( ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::text::XTextRange > & xTextRange) override; + virtual OUString SAL_CALL getFieldType() override; + virtual void SAL_CALL setFieldType(const OUString& description ) override; + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getParameters( ) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index 452ff9d5441f..7e28be9cdcc1 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -33,8 +33,7 @@ class SwFormatINetFormat; class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor { //XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; protected: virtual ~SwHyperlinkEventDescriptor() override; public: @@ -66,8 +65,7 @@ public: virtual ~SwFrameEventDescriptor() override; - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; protected: virtual void setMacroItem(const SvxMacroItem& rItem) override; @@ -86,8 +84,7 @@ public: virtual ~SwFrameStyleEventDescriptor() override; - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; protected: virtual void setMacroItem(const SvxMacroItem& rItem) override; diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx index 360a98cbaf52..e864587bdfa4 100644 --- a/sw/source/core/inc/unofield.hxx +++ b/sw/source/core/inc/unofield.hxx @@ -73,70 +73,42 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; }; @@ -175,94 +147,58 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // XUpdatable - virtual void SAL_CALL update() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; // XTextContent virtual void SAL_CALL attach( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override; // XTextField - virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) override; // XDependentTextField virtual void SAL_CALL attachTextFieldMaster( - const css::uno::Reference< css::beans::XPropertySet > & xFieldMaster) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL getTextFieldMaster() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet > & xFieldMaster) override; + virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL getTextFieldMaster() override; }; @@ -285,22 +221,15 @@ public: explicit SwXFieldEnumeration(SwDoc & rDoc); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL nextElement() - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual css::uno::Any SAL_CALL nextElement() override; }; diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index 2751d2c4d58a..5c6eb130232e 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -59,73 +59,51 @@ public: // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // text::XTextMarkup: - virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() override; virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) override; virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const css::uno::Reference< css::text::XTextRange> & xRange, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) override; // text::XFlatParagraph: - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setChecked(::sal_Int32 nType, sal_Bool bVal) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() override; + virtual sal_Bool SAL_CALL isModified() override; + virtual void SAL_CALL setChecked(::sal_Int32 nType, sal_Bool bVal) override; + virtual sal_Bool SAL_CALL isChecked(::sal_Int32 nType) override; + virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) override; + virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) override; + virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) override; + virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) override; + virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() override; using SwXTextMarkup::GetTextNode; static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence< sal_Int8 >& rId) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence< sal_Int8 >& rId) override; private: SwXFlatParagraph( const SwXFlatParagraph & ) = delete; @@ -146,11 +124,11 @@ public: virtual ~SwXFlatParagraphIterator() override; // text::XFlatParagraphIterator: - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) override; protected: // SwClient diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx index b39a5227e4cc..75b6513ac664 100644 --- a/sw/source/core/inc/unofootnote.hxx +++ b/sw/source/core/inc/unofootnote.hxx @@ -57,8 +57,7 @@ protected: virtual const SwStartNode *GetStartNode() const override; - virtual css::uno::Reference< css::text::XTextCursor > CreateCursor() - throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::text::XTextCursor > CreateCursor() override; virtual ~SwXFootnote() override; @@ -73,121 +72,80 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& rType) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& rType) override; virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XTypeProvider virtual css::uno::Sequence< css::uno::Type > - SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() - throw (css::uno::RuntimeException, std::exception) override; + createEnumeration() override; // XTextContent virtual void SAL_CALL attach( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override; // XFootnote - virtual OUString SAL_CALL getLabel() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabel(const OUString& rLabel) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLabel() override; + virtual void SAL_CALL setLabel(const OUString& rLabel) override; // XSimpleText virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL - createTextCursor() - throw (css::uno::RuntimeException, std::exception) override; + createTextCursor() override; virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange( - const css::uno::Reference< css::text::XTextRange > & xTextPosition) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextPosition) override; }; diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx index 42339b84b75f..698a6bc0fa0d 100644 --- a/sw/source/core/inc/unofreg.hxx +++ b/sw/source/core/inc/unofreg.hxx @@ -34,13 +34,13 @@ namespace com { namespace sun { namespace star { namespace lang { css::uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw(); OUString SAL_CALL SwUnoModule_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL SwUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ) throw( css::uno::Exception ); +css::uno::Reference< css::uno::XInterface > SAL_CALL SwUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ); // writer documents css::uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw(); OUString SAL_CALL SwTextDocument_getImplementationName() throw(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > SAL_CALL SwTextDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr, SfxModelFlags _nCreationFlags ) throw( css::uno::Exception ); +css::uno::Reference< css::uno::XInterface > SAL_CALL SwTextDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr, SfxModelFlags _nCreationFlags ); #endif diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx index 0d1c474187cb..c87460a3dd69 100644 --- a/sw/source/core/inc/unoidx.hxx +++ b/sw/source/core/inc/unoidx.hxx @@ -83,100 +83,62 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // XNamed - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName(const OUString& rName) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& rName) override; // XRefreshable - virtual void SAL_CALL refresh() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh() override; virtual void SAL_CALL addRefreshListener( - const css::uno::Reference< css::util::XRefreshListener>& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XRefreshListener>& xListener) override; virtual void SAL_CALL removeRefreshListener( - const css::uno::Reference< css::util::XRefreshListener>& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XRefreshListener>& xListener) override; // XTextContent virtual void SAL_CALL attach( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override; // XDocumentIndex - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL update() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL update() override; }; @@ -214,84 +176,51 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference<css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // XTextContent virtual void SAL_CALL attach( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override; // XDocumentIndexMark - virtual OUString SAL_CALL getMarkEntry() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getMarkEntry() override; + virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry) override; }; diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 2af5b0ad7a81..90573dd83970 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -73,9 +73,7 @@ protected: /// @throws css::uno::RuntimeException void SAL_CALL AttachImpl( const css::uno::Reference< css::text::XTextRange > & xTextRange, - const sal_uInt16 nWhich) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + const sal_uInt16 nWhich); virtual ~SwXMeta() override; @@ -106,9 +104,7 @@ public: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb); // MetadatableMixin virtual ::sfx2::Metadatable * GetCoreObject() override; @@ -119,100 +115,71 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& Identifier ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XChild virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getParent() - throw (css::uno::RuntimeException, std::exception) override; + getParent() override; virtual void SAL_CALL setParent( - css::uno::Reference< css::uno::XInterface> const& xParent) - throw (css::uno::RuntimeException, - css::lang::NoSupportException, std::exception) override; + css::uno::Reference< css::uno::XInterface> const& xParent) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() - throw (css::uno::RuntimeException, std::exception) override; + createEnumeration() override; // XTextContent virtual void SAL_CALL attach( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override; // XTextRange virtual css::uno::Reference< css::text::XText > - SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getText() override; virtual css::uno::Reference< - css::text::XTextRange > SAL_CALL getStart() - throw (css::uno::RuntimeException, std::exception) override; + css::text::XTextRange > SAL_CALL getStart() override; virtual css::uno::Reference< - css::text::XTextRange > SAL_CALL getEnd() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString(const OUString& rString) - throw (css::uno::RuntimeException, std::exception) override; + css::text::XTextRange > SAL_CALL getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString(const OUString& rString) override; // XSimpleText virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL - createTextCursor() - throw (css::uno::RuntimeException, std::exception) override; + createTextCursor() override; virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange( - const css::uno::Reference< css::text::XTextRange > & xTextPosition) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextPosition) override; virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange > & xRange, - const OUString& aString, sal_Bool bAbsorb) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& aString, sal_Bool bAbsorb) override; virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange > & xRange, - sal_Int16 nControlCharacter, sal_Bool bAbsorb) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Int16 nControlCharacter, sal_Bool bAbsorb) override; // XText virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange > & xRange, const css::uno::Reference< css::text::XTextContent > & xContent, - sal_Bool bAbsorb) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bAbsorb) override; virtual void SAL_CALL removeTextContent( - const css::uno::Reference< css::text::XTextContent > & xContent) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent > & xContent) override; }; @@ -247,78 +214,47 @@ private: public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& ServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL - getPropertyValue(const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + getPropertyValue(const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // XTextContent virtual void SAL_CALL attach( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw ( css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override; // XTextField - virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) override; }; diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 154068af8e95..5eed3898698b 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -129,22 +129,19 @@ protected: /// @trhows css::uno::RuntimeException void SAL_CALL SetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames, - const css::uno::Sequence< css::uno::Any >& aValues ) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + const css::uno::Sequence< css::uno::Any >& aValues ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @trhows css::uno::RuntimeException css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl( - const css::uno::Sequence< OUString >& aPropertyNames ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + const css::uno::Sequence< OUString >& aPropertyNames ); void GetPropertyValue( css::uno::Any &rVal, const SfxItemPropertySimpleEntry& rEntry, SwUnoCursor *pUnoCursor, SfxItemSet *&pSet ); /// @throws css::uno::RuntimeException css::uno::Sequence<css::beans::GetDirectPropertyTolerantResult> SAL_CALL GetPropertyValuesTolerant_Impl( - const css::uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly ) - throw (css::uno::RuntimeException, std::exception); + const css::uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly ); virtual ~SwXTextPortion() override; @@ -162,51 +159,51 @@ public: bool bIsEnd ); //XTextRange - virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() throw( css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getString() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setString(const OUString& aString) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString(const OUString& aString) override; //XTolerantMultiPropertySet - virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual css::uno::Sequence< css::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) override; //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - 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; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //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; //XUnoTunnel static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //XContentEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; void SetRefMark( css::uno::Reference< css::text::XTextContent > const & xMark) { m_xRefMark = xMark; } @@ -259,25 +256,17 @@ public: //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL nextElement() - throw( css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual css::uno::Any SAL_CALL nextElement() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; }; class SwXRedlinePortion : public SwXTextPortion @@ -286,7 +275,7 @@ private: SwRangeRedline const& m_rRedline; /// @throws css::uno::RuntimeException - void Validate() throw (css::uno::RuntimeException); + void Validate(); using SwXTextPortion::GetPropertyValue; @@ -301,20 +290,17 @@ public: /// @throws std::exception static css::uno::Any GetPropertyValue( - OUString const& PropertyName, SwRangeRedline const& rRedline) throw (std::exception); + OUString const& PropertyName, SwRangeRedline const& rRedline); /// @throws std::exception static css::uno::Sequence< css::beans::PropertyValue > CreateRedlineProperties( - SwRangeRedline const& rRedline, bool const bIsStart) throw (std::exception); + SwRangeRedline const& rRedline, bool const bIsStart); virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; // XPropertySet virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; }; OUString SwRedlineTypeToOUString(RedlineType_t eType); diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx index b34b23203395..c65b65009f30 100644 --- a/sw/source/core/inc/unorefmark.hxx +++ b/sw/source/core/inc/unorefmark.hxx @@ -63,84 +63,51 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // XNamed - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName(const OUString& rName) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& rName) override; // XTextContent virtual void SAL_CALL attach( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override; }; diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index afff7f158003..370ed909f512 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -77,136 +77,84 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence< sal_Int8 >& rIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& rServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override; // XPropertyState virtual css::beans::PropertyState SAL_CALL - getPropertyState(const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyState(const OUString& rPropertyName) override; virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( - const css::uno::Sequence< OUString >& rPropertyNames) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) override; virtual void SAL_CALL setPropertyToDefault( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; virtual css::uno::Any SAL_CALL getPropertyDefault( - const OUString& rPropertyName) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& rPropertyName) override; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::uno::Any >& rValues) - throw (css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& rValues) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( - const css::uno::Sequence< OUString >& rPropertyNames) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) override; virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override; virtual void SAL_CALL removePropertiesChangeListener( - const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override; virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override; // XNamed - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName(const OUString& rName) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& rName) override; // XTextContent virtual void SAL_CALL attach( - const css::uno::Reference< css::text::XTextRange > & xTextRange) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override; // XTextSection virtual css::uno::Reference< css::text::XTextSection > SAL_CALL - getParentSection() - throw (css::uno::RuntimeException, std::exception) override; + getParentSection() override; virtual css::uno::Sequence< css::uno::Reference< css::text::XTextSection > > SAL_CALL - getChildSections() - throw (css::uno::RuntimeException, std::exception) override; + getChildSections() override; }; diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index 20844ea72aad..d3f63063e22d 100644 --- a/sw/source/core/inc/unotextmarkup.hxx +++ b/sw/source/core/inc/unotextmarkup.hxx @@ -54,16 +54,16 @@ public: virtual ~SwXTextMarkup() override; // css::text::XTextMarkup: - virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() override; virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) override; virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const css::uno::Reference< css::text::XTextRange> & xRange, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) override; // css::text::XMultiTextMarkup: - virtual void SAL_CALL commitMultiTextMarkup( const css::uno::Sequence< css::text::TextMarkupDescriptor >& aMarkups ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commitMultiTextMarkup( const css::uno::Sequence< css::text::TextMarkupDescriptor >& aMarkups ) override; private: SwXTextMarkup( const SwXTextMarkup & ) = delete; @@ -88,12 +88,12 @@ public: SwXStringKeyMap(); // css::container::XStringKeyMap: - virtual css::uno::Any SAL_CALL getValue(const OUString & aKey) throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception) override; - virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertValue(const OUString & aKey, const css::uno::Any & aValue) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; - virtual css::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue(const OUString & aKey) override; + virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) override; + virtual void SAL_CALL insertValue(const OUString & aKey, const css::uno::Any & aValue) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) override; + virtual css::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) override; private: SwXStringKeyMap(SwXStringKeyMap &) = delete; diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx index e0c0649bcba6..c4eac12058da 100644 --- a/sw/source/core/layout/dumpfilter.cxx +++ b/sw/source/core/layout/dumpfilter.cxx @@ -76,7 +76,6 @@ namespace sw // XFilter sal_Bool LayoutDumpFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) - throw (uno::RuntimeException, std::exception) { bool bRet = false; @@ -122,38 +121,33 @@ namespace sw return bRet; } - void LayoutDumpFilter::cancel( ) throw (uno::RuntimeException, std::exception) + void LayoutDumpFilter::cancel( ) { } // XExporter void LayoutDumpFilter::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { m_xSrcDoc = xDoc; } // XInitialization void LayoutDumpFilter::initialize( const uno::Sequence< uno::Any >& ) - throw (uno::Exception, uno::RuntimeException, std::exception) { } // XServiceInfo OUString LayoutDumpFilter::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.comp.Writer.LayoutDump" ); } sal_Bool LayoutDumpFilter::supportsService( const OUString& rServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > LayoutDumpFilter::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence<OUString> aSeq { "com.sun.star.document.ExportFilter" }; return aSeq; diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 6e731a889cdd..6675b6178478 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -91,9 +91,9 @@ class SwOLEListener_Impl : public ::cppu::WeakImplHelper< embed::XStateChangeLis public: explicit SwOLEListener_Impl( SwOLEObj* pObj ); void Release(); - virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override; + virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) override; }; SwOLEListener_Impl::SwOLEListener_Impl( SwOLEObj* pObj ) @@ -105,11 +105,11 @@ SwOLEListener_Impl::SwOLEListener_Impl( SwOLEObj* pObj ) } } -void SAL_CALL SwOLEListener_Impl::changingState( const lang::EventObject&, ::sal_Int32 , ::sal_Int32 ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) +void SAL_CALL SwOLEListener_Impl::changingState( const lang::EventObject&, ::sal_Int32 , ::sal_Int32 ) { } -void SAL_CALL SwOLEListener_Impl::stateChanged( const lang::EventObject&, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwOLEListener_Impl::stateChanged( const lang::EventObject&, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) { if ( mpObj && nOldState == embed::EmbedStates::LOADED && nNewState == embed::EmbedStates::RUNNING ) { @@ -136,7 +136,7 @@ void SwOLEListener_Impl::Release() release(); } -void SAL_CALL SwOLEListener_Impl::disposing( const lang::EventObject& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwOLEListener_Impl::disposing( const lang::EventObject& ) { if (mpObj && g_pOLELRU_Cache) g_pOLELRU_Cache->RemoveObj( *mpObj ); diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx index 2fae105f0862..7c91e9deff01 100644 --- a/sw/source/core/swg/SwXMLBlockImport.cxx +++ b/sw/source/core/swg/SwXMLBlockImport.cxx @@ -53,8 +53,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( - sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; }; class SwXMLBlockContext : public SvXMLImportContext @@ -74,8 +73,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( - sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; }; class SwXMLTextBlockBodyContext : public SvXMLImportContext @@ -88,8 +86,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( - sal_Int32, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + sal_Int32, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; }; class SwXMLTextBlockTextContext : public SvXMLImportContext @@ -103,8 +100,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, - const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; }; class SwXMLTextBlockParContext : public SvXMLImportContext @@ -116,8 +112,7 @@ public: SwXMLTextBlockParContext( SwXMLTextBlockImport & rImport, sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); - virtual void SAL_CALL characters( const OUString & aChars ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL characters( const OUString & aChars ) override; virtual ~SwXMLTextBlockParContext() override; }; @@ -131,13 +126,11 @@ SwXMLTextBlockTokenHandler::~SwXMLTextBlockTokenHandler() } sal_Int32 SAL_CALL SwXMLTextBlockTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) { return getTokenDirect( reinterpret_cast< const char* >( Identifier.getConstArray() ), Identifier.getLength() ); } Sequence< sal_Int8 > SAL_CALL SwXMLTextBlockTokenHandler::getUTF8Identifier( sal_Int32 ) - throw (css::uno::RuntimeException, std::exception) { return Sequence< sal_Int8 >(); } @@ -159,13 +152,11 @@ SwXMLBlockListTokenHandler::~SwXMLBlockListTokenHandler() } sal_Int32 SAL_CALL SwXMLBlockListTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) { return getTokenDirect( reinterpret_cast< const char* >( Identifier.getConstArray() ), Identifier.getLength() ); } Sequence< sal_Int8 > SAL_CALL SwXMLBlockListTokenHandler::getUTF8Identifier( sal_Int32 ) - throw (css::uno::RuntimeException, std::exception) { return Sequence< sal_Int8 >(); } @@ -192,7 +183,6 @@ SwXMLBlockListContext::SwXMLBlockListContext( uno::Reference< ::xml::sax::XFastContextHandler > SAL_CALL SwXMLBlockListContext::createFastChildContext( sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if ( Element == SwXMLBlockListToken::BLOCK ) return new SwXMLBlockContext( rLocalRef, Element, xAttrList ); @@ -241,7 +231,6 @@ SwXMLTextBlockDocumentContext::SwXMLTextBlockDocumentContext( uno::Reference< ::xml::sax::XFastContextHandler > SAL_CALL SwXMLTextBlockDocumentContext::createFastChildContext( sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if ( Element == SwXMLTextBlockToken::OFFICE_BODY ) return new SwXMLTextBlockBodyContext( rLocalRef, Element, xAttrList ); @@ -261,7 +250,6 @@ SwXMLTextBlockTextContext::SwXMLTextBlockTextContext( uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SwXMLTextBlockTextContext::createFastChildContext( sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if ( Element == SwXMLTextBlockToken::TEXT_P ) return new SwXMLTextBlockParContext( rLocalRef, Element, xAttrList ); @@ -281,7 +269,6 @@ SwXMLTextBlockBodyContext::SwXMLTextBlockBodyContext( uno::Reference < xml::sax::XFastContextHandler > SAL_CALL SwXMLTextBlockBodyContext::createFastChildContext( sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if( Element == SwXMLTextBlockToken::OFFICE_TEXT ) return new SwXMLTextBlockTextContext( rLocalRef, Element, xAttrList ); @@ -301,7 +288,6 @@ SwXMLTextBlockParContext::SwXMLTextBlockParContext( } void SAL_CALL SwXMLTextBlockParContext::characters( const OUString & aChars ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { rLocalRef.m_rText += aChars; } @@ -366,7 +352,6 @@ SvXMLImportContext* SwXMLTextBlockImport::CreateFastContext( sal_Int32 Element, } void SAL_CALL SwXMLTextBlockImport::endDocument() - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index 4aa4c012ad41..fd3c90d5d1d6 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -53,14 +53,12 @@ SwXTextDefaults::~SwXTextDefaults () } uno::Reference< XPropertySetInfo > SAL_CALL SwXTextDefaults::getPropertySetInfo( ) - throw(RuntimeException, std::exception) { static uno::Reference < XPropertySetInfo > xRef = m_pPropSet->getPropertySetInfo(); return xRef; } void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, const Any& aValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!m_pDoc) @@ -125,7 +123,6 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, } Any SAL_CALL SwXTextDefaults::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!m_pDoc) @@ -140,32 +137,27 @@ Any SAL_CALL SwXTextDefaults::getPropertyValue( const OUString& rPropertyName ) } void SAL_CALL SwXTextDefaults::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL ( "not implemented" ); } void SAL_CALL SwXTextDefaults::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL ( "not implemented" ); } void SAL_CALL SwXTextDefaults::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL ( "not implemented" ); } void SAL_CALL SwXTextDefaults::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL ( "not implemented" ); } // XPropertyState PropertyState SAL_CALL SwXTextDefaults::getPropertyState( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException, std::exception) { SolarMutexGuard aGuard; PropertyState eRet = PropertyState_DIRECT_VALUE; @@ -182,7 +174,6 @@ PropertyState SAL_CALL SwXTextDefaults::getPropertyState( const OUString& rPrope } Sequence< PropertyState > SAL_CALL SwXTextDefaults::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); const OUString * pNames = rPropertyNames.getConstArray(); @@ -196,7 +187,6 @@ Sequence< PropertyState > SAL_CALL SwXTextDefaults::getPropertyStates( const Seq } void SAL_CALL SwXTextDefaults::setPropertyToDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException, std::exception) { if (!m_pDoc) throw RuntimeException(); @@ -210,7 +200,6 @@ void SAL_CALL SwXTextDefaults::setPropertyToDefault( const OUString& rPropertyNa } Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { if (!m_pDoc) throw RuntimeException(); @@ -228,19 +217,16 @@ Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName } OUString SAL_CALL SwXTextDefaults::getImplementationName( ) - throw (RuntimeException, std::exception) { return OUString("SwXTextDefaults"); } sal_Bool SAL_CALL SwXTextDefaults::supportsService( const OUString& rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SwXTextDefaults::getSupportedServiceNames( ) - throw (RuntimeException, std::exception) { uno::Sequence< OUString > aRet(7); OUString* pArr = aRet.getArray(); diff --git a/sw/source/core/unocore/TextCursorHelper.cxx b/sw/source/core/unocore/TextCursorHelper.cxx index 251b22ae91ee..973757ac328c 100644 --- a/sw/source/core/unocore/TextCursorHelper.cxx +++ b/sw/source/core/unocore/TextCursorHelper.cxx @@ -36,7 +36,6 @@ const uno::Sequence< sal_Int8 > & OTextCursorHelper::getUnoTunnelId() //XUnoTunnel sal_Int64 SAL_CALL OTextCursorHelper::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index feca7d3cdee8..a7a62f713ce6 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -190,7 +190,6 @@ const uno::Sequence< sal_Int8 > & SwXBookmark::getUnoTunnelId() } sal_Int64 SAL_CALL SwXBookmark::getSomething( const uno::Sequence< sal_Int8 >& rId ) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXBookmark>(rId, this); } @@ -198,7 +197,6 @@ throw (uno::RuntimeException, std::exception) void SwXBookmark::attachToRangeEx( const uno::Reference< text::XTextRange > & xTextRange, IDocumentMarkAccess::MarkType eType) -throw (lang::IllegalArgumentException, uno::RuntimeException) { if (m_pImpl->m_pRegisteredBookmark) { @@ -258,20 +256,17 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) } void SwXBookmark::attachToRange( const uno::Reference< text::XTextRange > & xTextRange ) -throw (lang::IllegalArgumentException, uno::RuntimeException) { attachToRangeEx(xTextRange, IDocumentMarkAccess::MarkType::BOOKMARK); } void SAL_CALL SwXBookmark::attach( const uno::Reference< text::XTextRange > & xTextRange ) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; attachToRange( xTextRange ); } uno::Reference< text::XTextRange > SAL_CALL SwXBookmark::getAnchor() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -287,7 +282,6 @@ throw (uno::RuntimeException, std::exception) } void SAL_CALL SwXBookmark::dispose() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_pImpl->m_pRegisteredBookmark) @@ -298,7 +292,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXBookmark::addEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -306,14 +299,12 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXBookmark::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); } OUString SAL_CALL SwXBookmark::getName() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -323,7 +314,6 @@ throw (uno::RuntimeException, std::exception) } void SAL_CALL SwXBookmark::setName(const OUString& rName) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -353,7 +343,7 @@ throw (uno::RuntimeException, std::exception) } OUString SAL_CALL -SwXBookmark::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXBookmark::getImplementationName() { return OUString("SwXBookmark"); } @@ -367,13 +357,12 @@ static char const*const g_ServicesBookmark[] = static const size_t g_nServicesBookmark(SAL_N_ELEMENTS(g_ServicesBookmark)); sal_Bool SAL_CALL SwXBookmark::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXBookmark::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXBookmark::getSupportedServiceNames() { return ::sw::GetSupportedServiceNamesImpl( g_nServicesBookmark, g_ServicesBookmark); @@ -396,7 +385,7 @@ uno::Reference<frame::XModel> SwXBookmark::GetModel() } uno::Reference< beans::XPropertySetInfo > SAL_CALL -SwXBookmark::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +SwXBookmark::getPropertySetInfo() { SolarMutexGuard g; @@ -409,9 +398,6 @@ SwXBookmark::getPropertySetInfo() throw (uno::RuntimeException, std::exception) void SAL_CALL SwXBookmark::setPropertyValue(const OUString& PropertyName, const uno::Any& /*rValue*/) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { // nothing to set here throw lang::IllegalArgumentException("Property is read-only: " @@ -419,8 +405,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } uno::Any SAL_CALL SwXBookmark::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -439,8 +423,6 @@ void SAL_CALL SwXBookmark::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXBookmark::addPropertyChangeListener(): not implemented"); } @@ -449,8 +431,6 @@ void SAL_CALL SwXBookmark::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXBookmark::removePropertyChangeListener(): not implemented"); } @@ -459,8 +439,6 @@ void SAL_CALL SwXBookmark::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXBookmark::addVetoableChangeListener(): not implemented"); } @@ -469,8 +447,6 @@ void SAL_CALL SwXBookmark::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXBookmark::removeVetoableChangeListener(): not implemented"); } @@ -481,7 +457,6 @@ SwXFieldmark::SwXFieldmark(bool _isReplacementObject, ::sw::mark::IMark* pBkm, S { } void SwXFieldmarkParameters::insertByName(const OUString& aName, const uno::Any& aElement) - throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IFieldmark::parameter_map_t* pParameters = getCoreParameters(); @@ -491,7 +466,6 @@ void SwXFieldmarkParameters::insertByName(const OUString& aName, const uno::Any& } void SwXFieldmarkParameters::removeByName(const OUString& aName) - throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!getCoreParameters()->erase(aName)) @@ -499,7 +473,6 @@ void SwXFieldmarkParameters::removeByName(const OUString& aName) } void SwXFieldmarkParameters::replaceByName(const OUString& aName, const uno::Any& aElement) - throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IFieldmark::parameter_map_t* pParameters = getCoreParameters(); @@ -510,7 +483,6 @@ void SwXFieldmarkParameters::replaceByName(const OUString& aName, const uno::Any } uno::Any SwXFieldmarkParameters::getByName(const OUString& aName) - throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IFieldmark::parameter_map_t* pParameters = getCoreParameters(); @@ -521,7 +493,6 @@ uno::Any SwXFieldmarkParameters::getByName(const OUString& aName) } uno::Sequence<OUString> SwXFieldmarkParameters::getElementNames() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IFieldmark::parameter_map_t* pParameters = getCoreParameters(); @@ -529,7 +500,6 @@ uno::Sequence<OUString> SwXFieldmarkParameters::getElementNames() } sal_Bool SwXFieldmarkParameters::hasByName(const OUString& aName) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IFieldmark::parameter_map_t* pParameters = getCoreParameters(); @@ -537,13 +507,11 @@ sal_Bool SwXFieldmarkParameters::hasByName(const OUString& aName) } uno::Type SwXFieldmarkParameters::getElementType() - throw (uno::RuntimeException, std::exception) { return ::cppu::UnoType<void>::get(); } sal_Bool SwXFieldmarkParameters::hasElements() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return !getCoreParameters()->empty(); @@ -555,7 +523,6 @@ void SwXFieldmarkParameters::Modify(const SfxPoolItem *pOld, const SfxPoolItem * } IFieldmark::parameter_map_t* SwXFieldmarkParameters::getCoreParameters() - throw (uno::RuntimeException) { const IFieldmark* pFieldmark = dynamic_cast< const IFieldmark* >(GetRegisteredIn()); if(!pFieldmark) @@ -564,7 +531,6 @@ IFieldmark::parameter_map_t* SwXFieldmarkParameters::getCoreParameters() } void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTextRange ) - throw(lang::IllegalArgumentException, uno::RuntimeException) { attachToRangeEx( xTextRange, @@ -572,7 +538,6 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe } OUString SwXFieldmark::getFieldType() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const IFieldmark *pBkm = dynamic_cast<const IFieldmark*>(GetBookmark()); @@ -582,7 +547,6 @@ OUString SwXFieldmark::getFieldType() } void SwXFieldmark::setFieldType(const OUString & fieldType) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IFieldmark *pBkm = const_cast<IFieldmark*>( @@ -593,7 +557,6 @@ void SwXFieldmark::setFieldType(const OUString & fieldType) } uno::Reference<container::XNameContainer> SwXFieldmark::getParameters() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IFieldmark *pBkm = const_cast<IFieldmark*>( @@ -654,9 +617,6 @@ SwXFieldmark::getCheckboxFieldmark() void SAL_CALL SwXFieldmark::setPropertyValue(const OUString& PropertyName, const uno::Any& rValue) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; if ( PropertyName == "Checked" ) @@ -677,8 +637,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, // docx import filter thus not published via PropertySet info ) uno::Any SAL_CALL SwXFieldmark::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; if ( rPropertyName == "Checked" ) diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 786f12ad0ca4..c72b7c02708e 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -539,8 +539,6 @@ SwChartDataProvider::~SwChartDataProvider() uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createDataSource( const uno::Sequence< beans::PropertyValue >& rArguments, bool bTestOnly ) - throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; if (bDisposed) @@ -957,7 +955,6 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData sal_Bool SAL_CALL SwChartDataProvider::createDataSourcePossible( const uno::Sequence< beans::PropertyValue >& rArguments ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -976,7 +973,6 @@ sal_Bool SAL_CALL SwChartDataProvider::createDataSourcePossible( uno::Reference< chart2::data::XDataSource > SAL_CALL SwChartDataProvider::createDataSource( const uno::Sequence< beans::PropertyValue >& rArguments ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return Impl_createDataSource( rArguments ); @@ -1020,7 +1016,6 @@ OUString SwChartDataProvider::GetBrokenCellRangeForExport( uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArguments( const uno::Reference< chart2::data::XDataSource >& xDataSource ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (bDisposed) @@ -1361,8 +1356,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume uno::Reference< chart2::data::XDataSequence > SwChartDataProvider::Impl_createDataSequenceByRangeRepresentation( const OUString& rRangeRepresentation, bool bTestOnly ) - throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) { if (bDisposed) throw lang::DisposedException(); @@ -1391,7 +1384,6 @@ uno::Reference< chart2::data::XDataSequence > SwChartDataProvider::Impl_createDa sal_Bool SAL_CALL SwChartDataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& rRangeRepresentation ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1410,14 +1402,12 @@ sal_Bool SAL_CALL SwChartDataProvider::createDataSequenceByRangeRepresentationPo uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartDataProvider::createDataSequenceByRangeRepresentation( const OUString& rRangeRepresentation ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return Impl_createDataSequenceByRangeRepresentation( rRangeRepresentation ); } uno::Reference< sheet::XRangeSelection > SAL_CALL SwChartDataProvider::getRangeSelection( ) - throw (uno::RuntimeException, std::exception) { // note: it is no error to return nothing here return uno::Reference< sheet::XRangeSelection >(); @@ -1426,13 +1416,11 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL SwChartDataProvider::getRangeS uno::Reference<css::chart2::data::XDataSequence> SAL_CALL SwChartDataProvider::createDataSequenceByValueArray( const OUString& /*aRole*/, const OUString& /*aRangeRepresentation*/ ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return uno::Reference<css::chart2::data::XDataSequence>(); } void SAL_CALL SwChartDataProvider::dispose( ) - throw (uno::RuntimeException, std::exception) { bool bMustDispose( false ); { @@ -1461,7 +1449,6 @@ void SAL_CALL SwChartDataProvider::dispose( ) void SAL_CALL SwChartDataProvider::addEventListener( const uno::Reference< lang::XEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); if (!bDisposed && rxListener.is()) @@ -1470,7 +1457,6 @@ void SAL_CALL SwChartDataProvider::addEventListener( void SAL_CALL SwChartDataProvider::removeEventListener( const uno::Reference< lang::XEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); if (!bDisposed && rxListener.is()) @@ -1478,19 +1464,16 @@ void SAL_CALL SwChartDataProvider::removeEventListener( } OUString SAL_CALL SwChartDataProvider::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString("SwChartDataProvider"); } sal_Bool SAL_CALL SwChartDataProvider::supportsService(const OUString& rServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SwChartDataProvider::getSupportedServiceNames( ) - throw (uno::RuntimeException, std::exception) { return { "com.sun.star.chart2.data.DataProvider"}; } @@ -1728,8 +1711,6 @@ void SwChartDataProvider::AddRowCols( // XRangeXMLConversion OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRangeRepresentation ) - throw (uno::RuntimeException, lang::IllegalArgumentException, - std::exception) { SolarMutexGuard aGuard; if (bDisposed) @@ -1798,7 +1779,6 @@ OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRange } OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXMLRange ) - throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { SolarMutexGuard aGuard; if (bDisposed) @@ -1855,26 +1835,22 @@ SwChartDataSource::~SwChartDataSource() } uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL SwChartDataSource::getDataSequences( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return aLDS; } OUString SAL_CALL SwChartDataSource::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString("SwChartDataSource"); } sal_Bool SAL_CALL SwChartDataSource::supportsService(const OUString& rServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SwChartDataSource::getSupportedServiceNames( ) - throw (uno::RuntimeException, std::exception) { return { "com.sun.star.chart2.data.DataSource" }; } @@ -1989,7 +1965,6 @@ const uno::Sequence< sal_Int8 > & SwChartDataSequence::getUnoTunnelId() } sal_Int64 SAL_CALL SwChartDataSequence::getSomething( const uno::Sequence< sal_Int8 > &rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -2002,7 +1977,6 @@ sal_Int64 SAL_CALL SwChartDataSequence::getSomething( const uno::Sequence< sal_I OUString SAL_CALL SwChartDataSequence::getSourceRangeRepresentation( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_bDisposed) @@ -2021,7 +1995,6 @@ OUString SAL_CALL SwChartDataSequence::getSourceRangeRepresentation( ) uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( chart2::data::LabelOrigin eLabelOrigin ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_bDisposed) @@ -2126,8 +2099,6 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( ::sal_Int32 SAL_CALL SwChartDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 /*nIndex*/ ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { return 0; } @@ -2149,7 +2120,6 @@ std::vector< css::uno::Reference< css::table::XCell > > SwChartDataSequence::Get } uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getTextualData() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; auto vCells(GetCells()); @@ -2163,7 +2133,6 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getTextualData() } uno::Sequence< uno::Any > SAL_CALL SwChartDataSequence::getData() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; auto vCells(GetCells()); @@ -2177,7 +2146,6 @@ uno::Sequence< uno::Any > SAL_CALL SwChartDataSequence::getData() } uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; auto vCells(GetCells()); @@ -2191,7 +2159,6 @@ uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData() } uno::Reference< util::XCloneable > SAL_CALL SwChartDataSequence::createClone( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_bDisposed) @@ -2200,7 +2167,6 @@ uno::Reference< util::XCloneable > SAL_CALL SwChartDataSequence::createClone( ) } uno::Reference< beans::XPropertySetInfo > SAL_CALL SwChartDataSequence::getPropertySetInfo( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_bDisposed) @@ -2213,7 +2179,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwChartDataSequence::getPrope void SAL_CALL SwChartDataSequence::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_bDisposed) @@ -2230,7 +2195,6 @@ void SAL_CALL SwChartDataSequence::setPropertyValue( uno::Any SAL_CALL SwChartDataSequence::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_bDisposed) @@ -2248,7 +2212,6 @@ uno::Any SAL_CALL SwChartDataSequence::getPropertyValue( void SAL_CALL SwChartDataSequence::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "not implemented" ); } @@ -2256,7 +2219,6 @@ void SAL_CALL SwChartDataSequence::addPropertyChangeListener( void SAL_CALL SwChartDataSequence::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "not implemented" ); } @@ -2264,7 +2226,6 @@ void SAL_CALL SwChartDataSequence::removePropertyChangeListener( void SAL_CALL SwChartDataSequence::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "not implemented" ); } @@ -2272,25 +2233,21 @@ void SAL_CALL SwChartDataSequence::addVetoableChangeListener( void SAL_CALL SwChartDataSequence::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "not implemented" ); } OUString SAL_CALL SwChartDataSequence::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString("SwChartDataSequence"); } sal_Bool SAL_CALL SwChartDataSequence::supportsService(const OUString& rServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getSupportedServiceNames( ) - throw (uno::RuntimeException, std::exception) { return { "com.sun.star.chart2.data.DataSequence" }; } @@ -2312,7 +2269,6 @@ void SwChartDataSequence::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pN } sal_Bool SAL_CALL SwChartDataSequence::isModified( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_bDisposed) @@ -2323,7 +2279,6 @@ sal_Bool SAL_CALL SwChartDataSequence::isModified( ) void SAL_CALL SwChartDataSequence::setModified( sal_Bool bModified ) - throw (beans::PropertyVetoException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_bDisposed) @@ -2335,7 +2290,6 @@ void SAL_CALL SwChartDataSequence::setModified( void SAL_CALL SwChartDataSequence::addModifyListener( const uno::Reference< util::XModifyListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); if (!m_bDisposed && rxListener.is()) @@ -2344,7 +2298,6 @@ void SAL_CALL SwChartDataSequence::addModifyListener( void SAL_CALL SwChartDataSequence::removeModifyListener( const uno::Reference< util::XModifyListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); if (!m_bDisposed && rxListener.is()) @@ -2352,7 +2305,6 @@ void SAL_CALL SwChartDataSequence::removeModifyListener( } void SAL_CALL SwChartDataSequence::disposing( const lang::EventObject& rSource ) - throw (uno::RuntimeException, std::exception) { if (m_bDisposed) throw lang::DisposedException(); @@ -2363,7 +2315,6 @@ void SAL_CALL SwChartDataSequence::disposing( const lang::EventObject& rSource ) } void SAL_CALL SwChartDataSequence::dispose( ) - throw (uno::RuntimeException, std::exception) { bool bMustDispose( false ); { @@ -2420,7 +2371,6 @@ void SAL_CALL SwChartDataSequence::dispose( ) void SAL_CALL SwChartDataSequence::addEventListener( const uno::Reference< lang::XEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); if (!m_bDisposed && rxListener.is()) @@ -2429,7 +2379,6 @@ void SAL_CALL SwChartDataSequence::addEventListener( void SAL_CALL SwChartDataSequence::removeEventListener( const uno::Reference< lang::XEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); if (!m_bDisposed && rxListener.is()) @@ -2667,7 +2616,6 @@ SwChartLabeledDataSequence::~SwChartLabeledDataSequence() } uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequence::getValues( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (bDisposed) @@ -2703,7 +2651,6 @@ void SwChartLabeledDataSequence::SetDataSequence( void SAL_CALL SwChartLabeledDataSequence::setValues( const uno::Reference< chart2::data::XDataSequence >& rxSequence ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (bDisposed) @@ -2718,7 +2665,6 @@ void SAL_CALL SwChartLabeledDataSequence::setValues( } uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequence::getLabel( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (bDisposed) @@ -2728,7 +2674,6 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequenc void SAL_CALL SwChartLabeledDataSequence::setLabel( const uno::Reference< chart2::data::XDataSequence >& rxSequence ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (bDisposed) @@ -2743,7 +2688,6 @@ void SAL_CALL SwChartLabeledDataSequence::setLabel( } uno::Reference< util::XCloneable > SAL_CALL SwChartLabeledDataSequence::createClone( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (bDisposed) @@ -2770,27 +2714,23 @@ uno::Reference< util::XCloneable > SAL_CALL SwChartLabeledDataSequence::createCl } OUString SAL_CALL SwChartLabeledDataSequence::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString("SwChartLabeledDataSequence"); } sal_Bool SAL_CALL SwChartLabeledDataSequence::supportsService( const OUString& rServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SwChartLabeledDataSequence::getSupportedServiceNames( ) - throw (uno::RuntimeException, std::exception) { return { "com.sun.star.chart2.data.LabeledDataSequence" }; } void SAL_CALL SwChartLabeledDataSequence::disposing( const lang::EventObject& rSource ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); uno::Reference< uno::XInterface > xRef( rSource.Source ); @@ -2804,7 +2744,6 @@ void SAL_CALL SwChartLabeledDataSequence::disposing( void SAL_CALL SwChartLabeledDataSequence::modified( const lang::EventObject& rEvent ) - throw (uno::RuntimeException, std::exception) { if (rEvent.Source == xData || rEvent.Source == xLabels) { @@ -2814,7 +2753,6 @@ void SAL_CALL SwChartLabeledDataSequence::modified( void SAL_CALL SwChartLabeledDataSequence::addModifyListener( const uno::Reference< util::XModifyListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); if (!bDisposed && rxListener.is()) @@ -2823,7 +2761,6 @@ void SAL_CALL SwChartLabeledDataSequence::addModifyListener( void SAL_CALL SwChartLabeledDataSequence::removeModifyListener( const uno::Reference< util::XModifyListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); if (!bDisposed && rxListener.is()) @@ -2831,7 +2768,6 @@ void SAL_CALL SwChartLabeledDataSequence::removeModifyListener( } void SAL_CALL SwChartLabeledDataSequence::dispose( ) - throw (uno::RuntimeException, std::exception) { bool bMustDispose( false ); { @@ -2853,7 +2789,6 @@ void SAL_CALL SwChartLabeledDataSequence::dispose( ) void SAL_CALL SwChartLabeledDataSequence::addEventListener( const uno::Reference< lang::XEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); if (!bDisposed && rxListener.is()) @@ -2862,7 +2797,6 @@ void SAL_CALL SwChartLabeledDataSequence::addEventListener( void SAL_CALL SwChartLabeledDataSequence::removeEventListener( const uno::Reference< lang::XEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetChartMutex() ); if (!bDisposed && rxListener.is()) diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 6b183b033ff4..f6db86e07ea9 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -100,13 +100,13 @@ public: explicit SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {} // XCodeNameQuery - OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException, std::exception ) override + OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) override { // #FIXME not implemented... return OUString(); } - OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException, std::exception ) override + OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) override { // Initialise the code name if ( msThisDocumentCodeName.isEmpty() ) @@ -180,22 +180,22 @@ public: SwVbaProjectNameProvider() { } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() ); } - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); return uno::makeAny( mTemplateToProject.find( aName )->second ); } - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override { return comphelper::mapKeysToSequence( mTemplateToProject ); } - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, std::exception ) override + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override { OUString sProjectName; @@ -205,24 +205,24 @@ public: mTemplateToProject[ aName ] = sProjectName; } - virtual void SAL_CALL removeByName( const OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception ) override + virtual void SAL_CALL removeByName( const OUString& Name ) override { if ( !hasByName( Name ) ) throw container::NoSuchElementException(); mTemplateToProject.erase( Name ); } - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception ) override + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); insertByName( aName, aElement ); // insert will overwrite } // XElemenAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType( ) override { return ::cppu::UnoType<OUString>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasElements( ) override { return ( !mTemplateToProject.empty() ); @@ -239,7 +239,7 @@ public: // #FIXME #TODO is the code name for ThisDocument read anywhere? } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { // #FIXME #TODO we really need to be checking against the codename for // ThisDocument @@ -248,7 +248,7 @@ public: return false; } - css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + css::uno::Any SAL_CALL getByName( const OUString& aName ) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -260,14 +260,14 @@ public: "Creating Object ( ooo.vba.word.Document ) 0x" << xDocObj.get()); return uno::makeAny( xDocObj ); } - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override { uno::Sequence< OUString > aNames; return aNames; } // XElemenAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override { return uno::Type(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override { return true; } + virtual css::uno::Type SAL_CALL getElementType( ) override { return uno::Type(); } + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } }; @@ -848,7 +848,7 @@ SwXTextTables::~SwXTextTables() } -sal_Int32 SwXTextTables::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXTextTables::getCount() { SolarMutexGuard aGuard; sal_Int32 nRet = 0; @@ -858,7 +858,6 @@ sal_Int32 SwXTextTables::getCount() throw( uno::RuntimeException, std::exception } uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex) - throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -879,7 +878,6 @@ uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex) } uno::Any SwXTextTables::getByName(const OUString& rItemName) - throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -906,7 +904,6 @@ uno::Any SwXTextTables::getByName(const OUString& rItemName) } uno::Sequence< OUString > SwXTextTables::getElementNames() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -927,7 +924,6 @@ uno::Sequence< OUString > SwXTextTables::getElementNames() } sal_Bool SwXTextTables::hasByName(const OUString& rName) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; bool bRet= false; @@ -951,12 +947,11 @@ sal_Bool SwXTextTables::hasByName(const OUString& rName) uno::Type SAL_CALL SwXTextTables::getElementType( ) - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<XTextTable>::get(); } -sal_Bool SwXTextTables::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTables::hasElements() { SolarMutexGuard aGuard; if(!IsValid()) @@ -964,17 +959,17 @@ sal_Bool SwXTextTables::hasElements() throw( uno::RuntimeException, std::excepti return 0 != GetDoc()->GetTableFrameFormatCount(true); } -OUString SwXTextTables::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTextTables::getImplementationName() { return OUString("SwXTextTables"); } -sal_Bool SwXTextTables::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTables::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames() { uno::Sequence< OUString > aRet { "com.sun.star.text.TextTables" }; return aRet; @@ -1039,7 +1034,7 @@ namespace // runtime adapter for lcl_UnoWrapFrame /// @throws uno::RuntimeException - uno::Any lcl_UnoWrapFrame(SwFrameFormat* pFormat, FlyCntType eType) throw(uno::RuntimeException) + uno::Any lcl_UnoWrapFrame(SwFrameFormat* pFormat, FlyCntType eType) { switch(eType) { @@ -1067,13 +1062,13 @@ namespace SwXFrameEnumeration(const SwDoc* const pDoc); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw( RuntimeException, std::exception ) override; - virtual Any SAL_CALL nextElement() throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual Any SAL_CALL nextElement() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; } @@ -1107,14 +1102,14 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc) } template<FlyCntType T> -sal_Bool SwXFrameEnumeration<T>::hasMoreElements() throw( RuntimeException, std::exception ) +sal_Bool SwXFrameEnumeration<T>::hasMoreElements() { SolarMutexGuard aGuard; return !m_aFrames.empty(); } template<FlyCntType T> -Any SwXFrameEnumeration<T>::nextElement() throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) +Any SwXFrameEnumeration<T>::nextElement() { SolarMutexGuard aGuard; if(m_aFrames.empty()) @@ -1125,34 +1120,34 @@ Any SwXFrameEnumeration<T>::nextElement() throw( NoSuchElementException, Wrapped } template<FlyCntType T> -OUString SwXFrameEnumeration<T>::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXFrameEnumeration<T>::getImplementationName() { return OUString("SwXFrameEnumeration"); } template<FlyCntType T> -sal_Bool SwXFrameEnumeration<T>::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXFrameEnumeration<T>::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } template<FlyCntType T> -Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames() { return { OUString("com.sun.star.container.XEnumeration") }; } -OUString SwXFrames::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXFrames::getImplementationName() { return OUString("SwXFrames"); } -sal_Bool SwXFrames::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXFrames::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence<OUString> SwXFrames::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence<OUString> SwXFrames::getSupportedServiceNames() { return { OUString("com.sun.star.text.TextFrames") }; } @@ -1165,7 +1160,7 @@ SwXFrames::SwXFrames(SwDoc* _pDoc, FlyCntType eSet) : SwXFrames::~SwXFrames() {} -uno::Reference<container::XEnumeration> SwXFrames::createEnumeration() throw(uno::RuntimeException, std::exception) +uno::Reference<container::XEnumeration> SwXFrames::createEnumeration() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1186,7 +1181,7 @@ uno::Reference<container::XEnumeration> SwXFrames::createEnumeration() throw(uno } } -sal_Int32 SwXFrames::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SwXFrames::getCount() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1196,7 +1191,6 @@ sal_Int32 SwXFrames::getCount() throw(uno::RuntimeException, std::exception) } uno::Any SwXFrames::getByIndex(sal_Int32 nIndex) - throw(IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1211,7 +1205,6 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex) } uno::Any SwXFrames::getByName(const OUString& rName) - throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1234,7 +1227,7 @@ uno::Any SwXFrames::getByName(const OUString& rName) return lcl_UnoWrapFrame(const_cast<SwFrameFormat*>(pFormat), m_eType); } -uno::Sequence<OUString> SwXFrames::getElementNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SwXFrames::getElementNames() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1251,7 +1244,7 @@ uno::Sequence<OUString> SwXFrames::getElementNames() throw( uno::RuntimeExceptio return ::comphelper::containerToSequence(vNames); } -sal_Bool SwXFrames::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXFrames::hasByName(const OUString& rName) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1267,7 +1260,7 @@ sal_Bool SwXFrames::hasByName(const OUString& rName) throw( uno::RuntimeExceptio } } -uno::Type SAL_CALL SwXFrames::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL SwXFrames::getElementType() { SolarMutexGuard aGuard; switch(m_eType) @@ -1283,7 +1276,7 @@ uno::Type SAL_CALL SwXFrames::getElementType() throw(uno::RuntimeException, std: } } -sal_Bool SwXFrames::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SwXFrames::hasElements() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1292,17 +1285,17 @@ sal_Bool SwXFrames::hasElements() throw(uno::RuntimeException, std::exception) } -OUString SwXTextFrames::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXTextFrames::getImplementationName() { return OUString("SwXTextFrames"); } -sal_Bool SwXTextFrames::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXTextFrames::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextFrames::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextFrames::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.TextFrames" }; return aRet; @@ -1317,17 +1310,17 @@ SwXTextFrames::~SwXTextFrames() { } -OUString SwXTextGraphicObjects::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXTextGraphicObjects::getImplementationName() { return OUString("SwXTextGraphicObjects"); } -sal_Bool SwXTextGraphicObjects::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXTextGraphicObjects::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextGraphicObjects::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextGraphicObjects::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.TextGraphicObjects" }; return aRet; @@ -1342,17 +1335,17 @@ SwXTextGraphicObjects::~SwXTextGraphicObjects() { } -OUString SwXTextEmbeddedObjects::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXTextEmbeddedObjects::getImplementationName() { return OUString("SwXTextEmbeddedObjects"); } -sal_Bool SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextEmbeddedObjects::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextEmbeddedObjects::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.TextEmbeddedObjects" }; return aRet; @@ -1367,17 +1360,17 @@ SwXTextEmbeddedObjects::~SwXTextEmbeddedObjects() { } -OUString SwXTextSections::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXTextSections::getImplementationName() { return OUString("SwXTextSections"); } -sal_Bool SwXTextSections::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXTextSections::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextSections::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextSections::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.TextSections" }; return aRet; @@ -1392,7 +1385,7 @@ SwXTextSections::~SwXTextSections() { } -sal_Int32 SwXTextSections::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXTextSections::getCount() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1408,7 +1401,6 @@ sal_Int32 SwXTextSections::getCount() throw( uno::RuntimeException, std::excepti } uno::Any SwXTextSections::getByIndex(sal_Int32 nIndex) - throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< XTextSection > xRet; @@ -1441,7 +1433,6 @@ uno::Any SwXTextSections::getByIndex(sal_Int32 nIndex) } uno::Any SwXTextSections::getByName(const OUString& rName) - throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -1469,7 +1460,6 @@ uno::Any SwXTextSections::getByName(const OUString& rName) } uno::Sequence< OUString > SwXTextSections::getElementNames() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1502,7 +1492,6 @@ uno::Sequence< OUString > SwXTextSections::getElementNames() } sal_Bool SwXTextSections::hasByName(const OUString& rName) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; bool bRet = false; @@ -1528,12 +1517,12 @@ sal_Bool SwXTextSections::hasByName(const OUString& rName) return bRet; } -uno::Type SAL_CALL SwXTextSections::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL SwXTextSections::getElementType() { return cppu::UnoType<XTextSection>::get(); } -sal_Bool SwXTextSections::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextSections::hasElements() { SolarMutexGuard aGuard; size_t nCount = 0; @@ -1552,17 +1541,17 @@ uno::Reference< XTextSection > SwXTextSections::GetObject( SwSectionFormat& rFo return SwXTextSection::CreateXTextSection(&rFormat); } -OUString SwXBookmarks::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXBookmarks::getImplementationName() { return OUString("SwXBookmarks"); } -sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXBookmarks::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXBookmarks::getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.text.Bookmarks" }; return aRet; @@ -1576,7 +1565,6 @@ SwXBookmarks::~SwXBookmarks() { } sal_Int32 SwXBookmarks::getCount() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1598,7 +1586,6 @@ sal_Int32 SwXBookmarks::getCount() } uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex) - throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1630,7 +1617,6 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex) } uno::Any SwXBookmarks::getByName(const OUString& rName) - throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1649,7 +1635,6 @@ uno::Any SwXBookmarks::getByName(const OUString& rName) } uno::Sequence< OUString > SwXBookmarks::getElementNames() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1671,7 +1656,6 @@ uno::Sequence< OUString > SwXBookmarks::getElementNames() } sal_Bool SwXBookmarks::hasByName(const OUString& rName) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1682,13 +1666,11 @@ sal_Bool SwXBookmarks::hasByName(const OUString& rName) } uno::Type SAL_CALL SwXBookmarks::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<XTextContent>::get(); } sal_Bool SwXBookmarks::hasElements() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1717,7 +1699,7 @@ SwXNumberingRulesCollection::~SwXNumberingRulesCollection() { } -sal_Int32 SwXNumberingRulesCollection::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXNumberingRulesCollection::getCount() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1726,7 +1708,6 @@ sal_Int32 SwXNumberingRulesCollection::getCount() throw( uno::RuntimeException, } uno::Any SwXNumberingRulesCollection::getByIndex(sal_Int32 nIndex) - throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -1747,12 +1728,12 @@ uno::Any SwXNumberingRulesCollection::getByIndex(sal_Int32 nIndex) return aRet; } -uno::Type SAL_CALL SwXNumberingRulesCollection::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL SwXNumberingRulesCollection::getElementType() { return cppu::UnoType<XIndexReplace>::get(); } -sal_Bool SwXNumberingRulesCollection::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXNumberingRulesCollection::hasElements() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1760,17 +1741,17 @@ sal_Bool SwXNumberingRulesCollection::hasElements() throw( uno::RuntimeException return !GetDoc()->GetNumRuleTable().empty(); } -OUString SwXFootnotes::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXFootnotes::getImplementationName() { return OUString("SwXFootnotes"); } -sal_Bool SwXFootnotes::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXFootnotes::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXFootnotes::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXFootnotes::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.Footnotes" }; return aRet; @@ -1786,7 +1767,7 @@ SwXFootnotes::~SwXFootnotes() { } -sal_Int32 SwXFootnotes::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXFootnotes::getCount() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1806,7 +1787,6 @@ sal_Int32 SwXFootnotes::getCount() throw( uno::RuntimeException, std::exception } uno::Any SwXFootnotes::getByIndex(sal_Int32 nIndex) - throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -1840,12 +1820,12 @@ uno::Any SwXFootnotes::getByIndex(sal_Int32 nIndex) return aRet; } -uno::Type SAL_CALL SwXFootnotes::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL SwXFootnotes::getElementType() { return cppu::UnoType<XFootnote>::get(); } -sal_Bool SwXFootnotes::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXFootnotes::hasElements() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1858,17 +1838,17 @@ Reference<XFootnote> SwXFootnotes::GetObject( SwDoc& rDoc, const SwFormatFoot return SwXFootnote::CreateXFootnote(rDoc, &const_cast<SwFormatFootnote&>(rFormat)); } -OUString SwXReferenceMarks::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXReferenceMarks::getImplementationName() { return OUString("SwXReferenceMarks"); } -sal_Bool SwXReferenceMarks::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXReferenceMarks::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXReferenceMarks::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXReferenceMarks::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.ReferenceMarks" }; return aRet; @@ -1883,7 +1863,7 @@ SwXReferenceMarks::~SwXReferenceMarks() { } -sal_Int32 SwXReferenceMarks::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXReferenceMarks::getCount() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1892,7 +1872,6 @@ sal_Int32 SwXReferenceMarks::getCount() throw( uno::RuntimeException, std::excep } uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex) - throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -1915,7 +1894,6 @@ uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex) } uno::Any SwXReferenceMarks::getByName(const OUString& rName) - throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -1937,7 +1915,7 @@ uno::Any SwXReferenceMarks::getByName(const OUString& rName) return aRet; } -uno::Sequence< OUString > SwXReferenceMarks::getElementNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXReferenceMarks::getElementNames() { SolarMutexGuard aGuard; uno::Sequence<OUString> aRet; @@ -1955,7 +1933,7 @@ uno::Sequence< OUString > SwXReferenceMarks::getElementNames() throw( uno::Runti return aRet; } -sal_Bool SwXReferenceMarks::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXReferenceMarks::hasByName(const OUString& rName) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1963,12 +1941,12 @@ sal_Bool SwXReferenceMarks::hasByName(const OUString& rName) throw( uno::Runtime return nullptr != GetDoc()->GetRefMark( rName); } -uno::Type SAL_CALL SwXReferenceMarks::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL SwXReferenceMarks::getElementType() { return cppu::UnoType<XTextContent>::get(); } -sal_Bool SwXReferenceMarks::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXReferenceMarks::hasElements() { SolarMutexGuard aGuard; if(!IsValid()) diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 6ee2bb80b4e5..880ae23e4993 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -952,8 +952,6 @@ void resetCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& r void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rOptions) - throw (lang::IllegalArgumentException, io::IOException, - uno::RuntimeException, std::exception) { std::unique_ptr<SfxMedium> pMed; SwDoc* pDoc = pUnoCursor->GetDoc(); @@ -1152,7 +1150,6 @@ bool DocInsertStringSplitCR( void makeRedline( SwPaM& rPaM, const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties ) - throw (lang::IllegalArgumentException, uno::RuntimeException) { IDocumentRedlineAccess* pRedlineAccess = &rPaM.GetDoc()->getIDocumentRedlineAccess(); @@ -1268,7 +1265,6 @@ void makeRedline( SwPaM& rPaM, void makeTableRowRedline( SwTableLine& rTableLine, const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties ) - throw (lang::IllegalArgumentException, uno::RuntimeException) { IDocumentRedlineAccess* pRedlineAccess = &rTableLine.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess(); @@ -1318,7 +1314,6 @@ void makeTableRowRedline( SwTableLine& rTableLine, void makeTableCellRedline( SwTableBox& rTableBox, const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties ) - throw (lang::IllegalArgumentException, uno::RuntimeException) { IDocumentRedlineAccess* pRedlineAccess = &rTableBox.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess(); diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 6d39a48129ea..35f794a6a206 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -298,7 +298,6 @@ uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj } uno::Reference< drawing::XShape > SwFmDrawPage::CreateShape( SdrObject *pObj ) const - throw (uno::RuntimeException, std::exception) { uno::Reference< drawing::XShape > xRet; if(dynamic_cast<const SwVirtFlyDrawObj*>( pObj) != nullptr || pObj->GetObjInventor() == SdrInventor::Swg) @@ -381,13 +380,13 @@ namespace explicit SwXShapesEnumeration(SwXDrawPage* const pDrawPage); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual uno::Any SAL_CALL nextElement() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(uno::RuntimeException, std::exception) override; - virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; } @@ -404,13 +403,13 @@ SwXShapesEnumeration::SwXShapesEnumeration(SwXDrawPage* const pDrawPage) } } -sal_Bool SwXShapesEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception) +sal_Bool SwXShapesEnumeration::hasMoreElements() { SolarMutexGuard aGuard; return !m_aShapes.empty(); } -uno::Any SwXShapesEnumeration::nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SwXShapesEnumeration::nextElement() { SolarMutexGuard aGuard; if(m_aShapes.empty()) @@ -420,39 +419,39 @@ uno::Any SwXShapesEnumeration::nextElement() throw(container::NoSuchElementExcep return aResult; } -OUString SwXShapesEnumeration::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SwXShapesEnumeration::getImplementationName() { return OUString("SwXShapeEnumeration"); } -sal_Bool SwXShapesEnumeration::supportsService(const OUString& ServiceName) throw(uno::RuntimeException, std::exception) +sal_Bool SwXShapesEnumeration::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames() { return { OUString("com.sun.star.container.XEnumeration") }; } -uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration() throw( uno::RuntimeException, std::exception ) +uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration() { SolarMutexGuard aGuard; return uno::Reference< container::XEnumeration >( new SwXShapesEnumeration(this)); } -OUString SwXDrawPage::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXDrawPage::getImplementationName() { return OUString("SwXDrawPage"); } -sal_Bool SwXDrawPage::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXDrawPage::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXDrawPage::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXDrawPage::getSupportedServiceNames() { uno::Sequence<OUString> aRet { "com.sun.star.drawing.GenericDrawPage" }; return aRet; @@ -474,7 +473,6 @@ SwXDrawPage::~SwXDrawPage() } uno::Any SwXDrawPage::queryInterface( const uno::Type& aType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aRet = SwXDrawPageBaseClass::queryInterface(aType); if(!aRet.hasValue()) @@ -493,7 +491,7 @@ uno::Any SwXDrawPage::queryInterface( const uno::Type& aType ) return aRet; } -uno::Sequence< uno::Type > SwXDrawPage::getTypes() throw( uno::RuntimeException, std::exception ) +uno::Sequence< uno::Type > SwXDrawPage::getTypes() { uno::Sequence< uno::Type > aPageTypes = SwXDrawPageBaseClass::getTypes(); uno::Sequence< uno::Type > aSvxTypes = GetSvxPage()->getTypes(); @@ -512,7 +510,7 @@ uno::Sequence< uno::Type > SwXDrawPage::getTypes() throw( uno::RuntimeException, return aPageTypes; } -sal_Int32 SwXDrawPage::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXDrawPage::getCount() { SolarMutexGuard aGuard; if(!pDoc) @@ -527,8 +525,6 @@ sal_Int32 SwXDrawPage::getCount() throw( uno::RuntimeException, std::exception ) } uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!pDoc) @@ -540,12 +536,12 @@ uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex) return SwTextBoxHelper::getByIndex(pDrawPage->GetSdrPage(), nIndex); } -uno::Type SwXDrawPage::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SwXDrawPage::getElementType() { return cppu::UnoType<drawing::XShape>::get(); } -sal_Bool SwXDrawPage::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXDrawPage::hasElements() { SolarMutexGuard aGuard; if(!pDoc) @@ -557,7 +553,6 @@ sal_Bool SwXDrawPage::hasElements() throw( uno::RuntimeException, std::exception } void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!pDoc) @@ -725,7 +720,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) delete pInternalPam; } -void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) throw( uno::RuntimeException, std::exception ) +void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) { SolarMutexGuard aGuard; if(!pDoc) @@ -735,7 +730,6 @@ void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) throw } uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference< drawing::XShapes > & xShapes) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!pDoc || !xShapes.is()) @@ -789,7 +783,7 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference< return xRet; } -void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & rShapeGroup) throw( uno::RuntimeException, std::exception ) +void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & rShapeGroup) { SolarMutexGuard aGuard; if(!pDoc) @@ -855,7 +849,6 @@ const uno::Sequence< sal_Int8 > & SwXShape::getUnoTunnelId() } sal_Int64 SAL_CALL SwXShape::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -979,7 +972,7 @@ SwXShape::~SwXShape() GetRegisteredIn()->Remove(this); } -uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( uno::RuntimeException, std::exception ) +uno::Any SwXShape::queryInterface( const uno::Type& aType ) { uno::Any aRet = SwTextBoxHelper::queryInterface(GetFrameFormat(), aType); if (aRet.hasValue()) @@ -999,7 +992,7 @@ uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( uno::RuntimeE return aRet; } -uno::Sequence< uno::Type > SwXShape::getTypes( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > SwXShape::getTypes( ) { uno::Sequence< uno::Type > aRet = SwXShapeBaseClass::getTypes(); if(xShapeAgg.is()) @@ -1023,12 +1016,12 @@ uno::Sequence< uno::Type > SwXShape::getTypes( ) throw(uno::RuntimeException, s return aRet; } -uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } -uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo() { SolarMutexGuard aGuard; uno::Reference< beans::XPropertySetInfo > aRet; @@ -1051,9 +1044,6 @@ uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo() throw( } void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -1454,8 +1444,6 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a } uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -1741,8 +1729,6 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName) } uno::Any SwXShape::_getPropAtAggrObj( const OUString& _rPropertyName ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) { uno::Any aRet; @@ -1760,7 +1746,6 @@ uno::Any SwXShape::_getPropAtAggrObj( const OUString& _rPropertyName ) } beans::PropertyState SwXShape::getPropertyState( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence< OUString > aNames { rPropertyName }; @@ -1770,7 +1755,6 @@ beans::PropertyState SwXShape::getPropertyState( const OUString& rPropertyName ) uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( const uno::Sequence< OUString >& aPropertyNames ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -1885,7 +1869,6 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( } void SwXShape::setPropertyToDefault( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -1948,8 +1931,6 @@ void SwXShape::setPropertyToDefault( const OUString& rPropertyName ) } uno::Any SwXShape::getPropertyDefault( const OUString& rPropertyName ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -1987,8 +1968,6 @@ uno::Any SwXShape::getPropertyDefault( const OUString& rPropertyName ) void SwXShape::addPropertyChangeListener( const OUString& _propertyName, const uno::Reference< beans::XPropertyChangeListener > & _listener ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { if ( !xShapeAgg.is() ) throw uno::RuntimeException("no shape aggregate", *this ); @@ -2002,8 +1981,6 @@ void SwXShape::addPropertyChangeListener( void SwXShape::removePropertyChangeListener( const OUString& _propertyName, const uno::Reference< beans::XPropertyChangeListener > & _listener) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { if ( !xShapeAgg.is() ) throw uno::RuntimeException("no shape aggregate", *this ); @@ -2017,8 +1994,6 @@ void SwXShape::removePropertyChangeListener( void SwXShape::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/ ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } @@ -2026,8 +2001,6 @@ void SwXShape::addVetoableChangeListener( void SwXShape::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } @@ -2038,7 +2011,6 @@ void SwXShape::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) } void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -2105,7 +2077,7 @@ void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange) } } -uno::Reference< text::XTextRange > SwXShape::getAnchor() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXShape::getAnchor() { SolarMutexGuard aGuard; uno::Reference< text::XTextRange > aRef; @@ -2127,7 +2099,7 @@ uno::Reference< text::XTextRange > SwXShape::getAnchor() throw( uno::RuntimeExc return aRef; } -void SwXShape::dispose() throw( uno::RuntimeException, std::exception ) +void SwXShape::dispose() { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -2177,7 +2149,6 @@ void SwXShape::dispose() throw( uno::RuntimeException, std::exception ) void SwXShape::addEventListener( const uno::Reference< lang::XEventListener > & aListener) - throw( uno::RuntimeException, std::exception ) { uno::Reference< lang::XUnoTunnel > xShapeTunnel(xShapeAgg, uno::UNO_QUERY); SvxShape* pSvxShape = GetSvxShape(); @@ -2187,24 +2158,23 @@ void SwXShape::addEventListener( void SwXShape::removeEventListener( const uno::Reference< lang::XEventListener > & aListener) - throw( uno::RuntimeException, std::exception ) { SvxShape* pSvxShape = GetSvxShape(); if(pSvxShape) pSvxShape->removeEventListener(aListener); } -OUString SwXShape::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXShape::getImplementationName() { return OUString("SwXShape"); } -sal_Bool SwXShape::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXShape::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXShape::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXShape::getSupportedServiceNames() { uno::Sequence< OUString > aSeq; if (SvxShape* pSvxShape = GetSvxShape()) @@ -2229,7 +2199,7 @@ SvxShape* SwXShape::GetSvxShape() // #i31698# // implementation of virtual methods from drawing::XShape -awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException, std::exception ) +awt::Point SAL_CALL SwXShape::getPosition() { awt::Point aPos( GetAttrPosition() ); @@ -2270,7 +2240,6 @@ awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException, std:: } void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition ) - throw ( uno::RuntimeException, std::exception ) { SdrObject* pTopGroupObj = GetTopGroupObj(); if ( !pTopGroupObj ) @@ -2358,7 +2327,7 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition ) } } -awt::Size SAL_CALL SwXShape::getSize() throw ( uno::RuntimeException, std::exception ) +awt::Size SAL_CALL SwXShape::getSize() { awt::Size aSize; if ( mxShape.is() ) @@ -2369,8 +2338,6 @@ awt::Size SAL_CALL SwXShape::getSize() throw ( uno::RuntimeException, std::excep } void SAL_CALL SwXShape::setSize( const awt::Size& aSize ) - throw ( beans::PropertyVetoException, - uno::RuntimeException, std::exception ) { if ( mxShape.is() ) { @@ -2380,7 +2347,7 @@ void SAL_CALL SwXShape::setSize( const awt::Size& aSize ) } // #i31698# // implementation of virtual methods from drawing::XShapeDescriptor -OUString SAL_CALL SwXShape::getShapeType() throw ( uno::RuntimeException, std::exception ) +OUString SAL_CALL SwXShape::getShapeType() { if ( mxShape.is() ) { @@ -2746,7 +2713,7 @@ SwXGroupShape::~SwXGroupShape() { } -uno::Any SwXGroupShape::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SwXGroupShape::queryInterface( const uno::Type& rType ) { uno::Any aRet; if(rType == cppu::UnoType<XShapes>::get()) @@ -2766,7 +2733,7 @@ void SwXGroupShape::release( ) throw() SwXShape::release(); } -void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::RuntimeException, std::exception) +void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) { SolarMutexGuard aGuard; SvxShape* pSvxShape = GetSvxShape(); @@ -2825,7 +2792,7 @@ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::Ru throw uno::RuntimeException(); } -void SwXGroupShape::remove( const uno::Reference< XShape >& xShape ) throw (uno::RuntimeException, std::exception) +void SwXGroupShape::remove( const uno::Reference< XShape >& xShape ) { SolarMutexGuard aGuard; uno::Reference<XShapes> xShapes; @@ -2840,7 +2807,7 @@ void SwXGroupShape::remove( const uno::Reference< XShape >& xShape ) throw (uno: xShapes->remove(xShape); } -sal_Int32 SwXGroupShape::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXGroupShape::getCount() { SolarMutexGuard aGuard; uno::Reference<XIndexAccess> xAcc; @@ -2856,8 +2823,6 @@ sal_Int32 SwXGroupShape::getCount() throw( uno::RuntimeException, std::exception } uno::Any SwXGroupShape::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference<XIndexAccess> xAcc; @@ -2872,7 +2837,7 @@ uno::Any SwXGroupShape::getByIndex(sal_Int32 nIndex) return xAcc->getByIndex(nIndex); } -uno::Type SwXGroupShape::getElementType( ) throw(uno::RuntimeException, std::exception) +uno::Type SwXGroupShape::getElementType( ) { SolarMutexGuard aGuard; uno::Reference<XIndexAccess> xAcc; @@ -2887,7 +2852,7 @@ uno::Type SwXGroupShape::getElementType( ) throw(uno::RuntimeException, std::ex return xAcc->getElementType(); } -sal_Bool SwXGroupShape::hasElements( ) throw(uno::RuntimeException, std::exception) +sal_Bool SwXGroupShape::hasElements( ) { SolarMutexGuard aGuard; uno::Reference<XIndexAccess> xAcc; diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index ddecea980abf..f29aa1a0f8da 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -104,7 +104,6 @@ SwHyperlinkEventDescriptor::~SwHyperlinkEventDescriptor() } OUString SwHyperlinkEventDescriptor::getImplementationName() - throw( RuntimeException, std::exception ) { return OUString("SwHyperlinkEventDescriptor"); } @@ -198,7 +197,6 @@ sal_uInt16 SwFrameEventDescriptor::getMacroItemWhich() const } OUString SwFrameEventDescriptor::getImplementationName() - throw( RuntimeException, std::exception ) { return sSwFrameEventDescriptor; } @@ -230,7 +228,6 @@ const SvxMacroItem& SwFrameStyleEventDescriptor::getMacroItem() } OUString SwFrameStyleEventDescriptor::getImplementationName() - throw( RuntimeException, std::exception ) { return sSwFrameStyleEventDescriptor; } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index b23aedd099ff..d7df39bf4884 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -462,14 +462,12 @@ const uno::Sequence< sal_Int8 > & SwXFieldMaster::getUnoTunnelId() sal_Int64 SAL_CALL SwXFieldMaster::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXFieldMaster>(rId, this); } OUString SAL_CALL SwXFieldMaster::getImplementationName() -throw (uno::RuntimeException, std::exception) { return OUString("SwXFieldMaster"); } @@ -507,13 +505,12 @@ OUString getServiceName(const sal_uInt16 aId) } sal_Bool SAL_CALL SwXFieldMaster::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXFieldMaster::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXFieldMaster::getSupportedServiceNames() { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -565,7 +562,6 @@ SwXFieldMaster::CreateXFieldMaster(SwDoc * pDoc, SwFieldType *const pType, uno::Reference<beans::XPropertySetInfo> SAL_CALL SwXFieldMaster::getPropertySetInfo() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< beans::XPropertySetInfo > aRef = @@ -576,9 +572,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwFieldType* pType = GetFieldType(true); @@ -815,8 +808,6 @@ SwFieldType* SwXFieldMaster::GetFieldType(bool const bDontCreate) const uno::Any SAL_CALL SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -955,28 +946,27 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aRet; } -void SwXFieldMaster::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXFieldMaster::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } -void SwXFieldMaster::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXFieldMaster::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } -void SwXFieldMaster::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXFieldMaster::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } -void SwXFieldMaster::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXFieldMaster::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } void SAL_CALL SwXFieldMaster::dispose() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwFieldType *const pFieldType = GetFieldType(true); @@ -1008,7 +998,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXFieldMaster::addEventListener( const uno::Reference<lang::XEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -1016,7 +1005,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXFieldMaster::removeEventListener( const uno::Reference<lang::XEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); @@ -1185,7 +1173,6 @@ const uno::Sequence< sal_Int8 > & SwXTextField::getUnoTunnelId() sal_Int64 SAL_CALL SwXTextField::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXTextField>(rId, this); } @@ -1257,7 +1244,6 @@ SwServiceType SwXTextField::GetServiceId() const void SAL_CALL SwXTextField::attachTextFieldMaster( const uno::Reference< beans::XPropertySet > & xFieldMaster) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1280,7 +1266,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } uno::Reference< beans::XPropertySet > SAL_CALL -SwXTextField::getTextFieldMaster() throw (uno::RuntimeException, std::exception) +SwXTextField::getTextFieldMaster() { SolarMutexGuard aGuard; SwFieldType* pType = nullptr; @@ -1302,7 +1288,6 @@ SwXTextField::getTextFieldMaster() throw (uno::RuntimeException, std::exception) } OUString SAL_CALL SwXTextField::getPresentation(sal_Bool bShowCommand) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1316,7 +1301,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextField::attach( const uno::Reference< text::XTextRange > & xTextRange) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_pImpl->m_bIsDescriptor) @@ -2044,7 +2028,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXTextField::getAnchor() throw (uno::RuntimeException, std::exception) +SwXTextField::getAnchor() { SolarMutexGuard aGuard; @@ -2081,7 +2065,7 @@ SwXTextField::getAnchor() throw (uno::RuntimeException, std::exception) return xRange; } -void SAL_CALL SwXTextField::dispose() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXTextField::dispose() { SolarMutexGuard aGuard; SwField const*const pField = m_pImpl->GetField(); @@ -2102,7 +2086,6 @@ void SAL_CALL SwXTextField::dispose() throw (uno::RuntimeException, std::excepti void SAL_CALL SwXTextField::addEventListener( const uno::Reference<lang::XEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -2110,7 +2093,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextField::removeEventListener( const uno::Reference<lang::XEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); @@ -2118,7 +2100,6 @@ throw (uno::RuntimeException, std::exception) uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXTextField::getPropertySetInfo() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // no static @@ -2141,9 +2122,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextField::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwField const*const pField = m_pImpl->GetField(); @@ -2294,8 +2272,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } uno::Any SAL_CALL SwXTextField::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -2484,27 +2460,27 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aRet; } -void SwXTextField::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextField::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } -void SwXTextField::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextField::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } -void SwXTextField::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextField::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } -void SwXTextField::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextField::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } -void SAL_CALL SwXTextField::update() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXTextField::update() { SolarMutexGuard aGuard; SwField * pField = const_cast<SwField*>(m_pImpl->GetField()); @@ -2560,7 +2536,6 @@ void SAL_CALL SwXTextField::update() throw (uno::RuntimeException, std::exceptio } OUString SAL_CALL SwXTextField::getImplementationName() -throw (uno::RuntimeException, std::exception) { return OUString("SwXTextField"); } @@ -2580,13 +2555,11 @@ static OUString OldNameToNewName_Impl( const OUString &rOld ) } sal_Bool SAL_CALL SwXTextField::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SwXTextField::getSupportedServiceNames() -throw (uno::RuntimeException, std::exception) { const OUString sServiceName = SwXServiceProvider::GetProviderName(m_pImpl->m_nServiceId); @@ -2651,17 +2624,17 @@ const SwField* SwXTextField::Impl::GetField() const return nullptr; } -OUString SwXTextFieldMasters::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTextFieldMasters::getImplementationName() { return OUString("SwXTextFieldMasters"); } -sal_Bool SwXTextFieldMasters::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextFieldMasters::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames() { uno::Sequence<OUString> aRet { "com.sun.star.text.TextFieldMasters" }; return aRet; @@ -2727,7 +2700,6 @@ static sal_uInt16 lcl_GetIdByName( OUString& rName, OUString& rTypeName ) } uno::Any SwXTextFieldMasters::getByName(const OUString& rName) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!GetDoc()) @@ -2787,7 +2759,6 @@ bool SwXTextFieldMasters::getInstanceName( } uno::Sequence< OUString > SwXTextFieldMasters::getElementNames() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!GetDoc()) @@ -2811,7 +2782,7 @@ uno::Sequence< OUString > SwXTextFieldMasters::getElementNames() return comphelper::containerToSequence(aFieldNames); } -sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) { SolarMutexGuard aGuard; if(!GetDoc()) @@ -2828,13 +2799,13 @@ sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( uno::Runti return bRet; } -uno::Type SwXTextFieldMasters::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SwXTextFieldMasters::getElementType() { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SwXTextFieldMasters::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextFieldMasters::hasElements() { SolarMutexGuard aGuard; if(!IsValid()) @@ -2853,17 +2824,17 @@ public: Impl() : m_RefreshListeners(m_Mutex) { } }; -OUString SwXTextFieldTypes::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTextFieldTypes::getImplementationName() { return OUString("SwXTextFieldTypes"); } -sal_Bool SwXTextFieldTypes::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextFieldTypes::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames() { uno::Sequence<OUString> aRet { "com.sun.star.text.TextFields" }; return aRet; @@ -2887,7 +2858,6 @@ void SwXTextFieldTypes::Invalidate() } uno::Reference< container::XEnumeration > SwXTextFieldTypes::createEnumeration() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -2895,12 +2865,12 @@ uno::Reference< container::XEnumeration > SwXTextFieldTypes::createEnumeration( return new SwXFieldEnumeration(*GetDoc()); } -uno::Type SwXTextFieldTypes::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SwXTextFieldTypes::getElementType() { return cppu::UnoType<text::XDependentTextField>::get(); } -sal_Bool SwXTextFieldTypes::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextFieldTypes::hasElements() { SolarMutexGuard aGuard; if(!IsValid()) @@ -2908,7 +2878,7 @@ sal_Bool SwXTextFieldTypes::hasElements() throw( uno::RuntimeException, std::exc return true; // they always exist } -void SAL_CALL SwXTextFieldTypes::refresh() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXTextFieldTypes::refresh() { { SolarMutexGuard aGuard; @@ -2926,7 +2896,6 @@ void SAL_CALL SwXTextFieldTypes::refresh() throw (uno::RuntimeException, std::ex void SAL_CALL SwXTextFieldTypes::addRefreshListener( const uno::Reference<util::XRefreshListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_RefreshListeners.addInterface(xListener); @@ -2934,7 +2903,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextFieldTypes::removeRefreshListener( const uno::Reference<util::XRefreshListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_RefreshListeners.removeInterface(xListener); @@ -2962,19 +2930,18 @@ protected: }; OUString SAL_CALL -SwXFieldEnumeration::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXFieldEnumeration::getImplementationName() { return OUString("SwXFieldEnumeration"); } sal_Bool SAL_CALL SwXFieldEnumeration::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXFieldEnumeration::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXFieldEnumeration::getSupportedServiceNames() { uno::Sequence<OUString> aRet { "com.sun.star.text.FieldEnumeration" }; return aRet; @@ -3020,7 +2987,6 @@ SwXFieldEnumeration::~SwXFieldEnumeration() } sal_Bool SAL_CALL SwXFieldEnumeration::hasMoreElements() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3028,8 +2994,6 @@ throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL SwXFieldEnumeration::nextElement() -throw (container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index 3f1a5b3950d0..39a0d616d5e9 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -79,7 +79,6 @@ SwXFlatParagraph::~SwXFlatParagraph() // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXFlatParagraph::getPropertySetInfo() -throw (uno::RuntimeException, std::exception) { static comphelper::PropertyMapEntry s_Entries[] = { { OUString("FieldPositions"), -1, ::cppu::UnoType<uno::Sequence<sal_Int32>>::get(), beans::PropertyAttribute::READONLY, 0 }, @@ -91,9 +90,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXFlatParagraph::setPropertyValue(const OUString&, const uno::Any&) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { throw lang::IllegalArgumentException("no values can be set", static_cast< ::cppu::OWeakObject*>(this), 0); @@ -101,8 +97,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXFlatParagraph::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -121,8 +115,6 @@ void SAL_CALL SwXFlatParagraph::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SAL_WARN("sw.uno", "SwXFlatParagraph::addPropertyChangeListener(): not implemented"); @@ -132,8 +124,6 @@ void SAL_CALL SwXFlatParagraph::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SAL_WARN("sw.uno", "SwXFlatParagraph::removePropertyChangeListener(): not implemented"); @@ -143,8 +133,6 @@ void SAL_CALL SwXFlatParagraph::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SAL_WARN("sw.uno", "SwXFlatParagraph::addVetoableChangeListener(): not implemented"); @@ -154,40 +142,38 @@ void SAL_CALL SwXFlatParagraph::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SAL_WARN("sw.uno", "SwXFlatParagraph::removeVetoableChangeListener(): not implemented"); } -css::uno::Reference< css::container::XStringKeyMap > SAL_CALL SwXFlatParagraph::getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) +css::uno::Reference< css::container::XStringKeyMap > SAL_CALL SwXFlatParagraph::getMarkupInfoContainer() { return SwXTextMarkup::getMarkupInfoContainer(); } void SAL_CALL SwXFlatParagraph::commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const uno::Reference< text::XTextRange> & xRange, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (uno::RuntimeException, std::exception) + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) { SolarMutexGuard aGuard; SwXTextMarkup::commitTextRangeMarkup( nType, aIdentifier, xRange, xMarkupInfoContainer ); } -void SAL_CALL SwXFlatParagraph::commitStringMarkup(::sal_Int32 nType, const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwXFlatParagraph::commitStringMarkup(::sal_Int32 nType, const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) { SolarMutexGuard aGuard; SwXTextMarkup::commitStringMarkup( nType, rIdentifier, nStart, nLength, rxMarkupInfoContainer ); } // text::XFlatParagraph: -OUString SAL_CALL SwXFlatParagraph::getText() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwXFlatParagraph::getText() { return maExpandText; } // text::XFlatParagraph: -void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, sal_Bool bVal ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, sal_Bool bVal ) { SolarMutexGuard aGuard; @@ -210,7 +196,7 @@ void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, sal_Bool bVal ) t } // text::XFlatParagraph: -sal_Bool SAL_CALL SwXFlatParagraph::isChecked( ::sal_Int32 nType ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXFlatParagraph::isChecked( ::sal_Int32 nType ) { SolarMutexGuard aGuard; if (GetTextNode()) @@ -227,7 +213,7 @@ sal_Bool SAL_CALL SwXFlatParagraph::isChecked( ::sal_Int32 nType ) throw (uno::R } // text::XFlatParagraph: -sal_Bool SAL_CALL SwXFlatParagraph::isModified() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXFlatParagraph::isModified() { SolarMutexGuard aGuard; return nullptr == GetTextNode(); @@ -235,7 +221,6 @@ sal_Bool SAL_CALL SwXFlatParagraph::isModified() throw (uno::RuntimeException, s // text::XFlatParagraph: lang::Locale SAL_CALL SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) - throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; if (!GetTextNode()) @@ -247,7 +232,6 @@ lang::Locale SAL_CALL SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sa // text::XFlatParagraph: lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) - throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -259,7 +243,7 @@ lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPo } // text::XFlatParagraph: -void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) +void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) { SolarMutexGuard aGuard; @@ -289,7 +273,7 @@ void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, c } // text::XFlatParagraph: -void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) +void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) { SolarMutexGuard aGuard; @@ -314,7 +298,7 @@ void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 n } // text::XFlatParagraph: -css::uno::Sequence< ::sal_Int32 > SAL_CALL SwXFlatParagraph::getLanguagePortions() throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< ::sal_Int32 > SAL_CALL SwXFlatParagraph::getLanguagePortions() { return css::uno::Sequence< ::sal_Int32>(); } @@ -333,7 +317,6 @@ SwXFlatParagraph::getUnoTunnelId() sal_Int64 SAL_CALL SwXFlatParagraph::getSomething( const uno::Sequence< sal_Int8 >& rId) - throw (uno::RuntimeException, std::exception) { return sw::UnoTunnelImpl(rId, this); } @@ -370,13 +353,11 @@ void SwXFlatParagraphIterator::Modify( const SfxPoolItem* pOld, const SfxPoolIte } uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getFirstPara() - throw( uno::RuntimeException, std::exception ) { return getNextPara(); // TODO } uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -478,13 +459,11 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara() } uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getLastPara() - throw( uno::RuntimeException, std::exception ) { return getNextPara(); } uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(const uno::Reference< text::XFlatParagraph > & xPara) - throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { SolarMutexGuard aGuard; @@ -530,7 +509,6 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(co } uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaBefore(const uno::Reference< text::XFlatParagraph > & xPara ) - throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { SolarMutexGuard aGuard; diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index dbc5180899a4..317b8073d083 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1160,7 +1160,6 @@ const ::uno::Sequence< sal_Int8 > & SwXFrame::getUnoTunnelId() } sal_Int64 SAL_CALL SwXFrame::getSomething( const ::uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -1172,17 +1171,17 @@ sal_Int64 SAL_CALL SwXFrame::getSomething( const ::uno::Sequence< sal_Int8 >& rI } -OUString SwXFrame::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXFrame::getImplementationName() { return OUString("SwXFrame"); } -sal_Bool SwXFrame::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXFrame::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXFrame::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXFrame::getSupportedServiceNames() { uno::Sequence< OUString > aRet(3); aRet[0] = "com.sun.star.text.BaseFrame"; @@ -1292,7 +1291,7 @@ SwXFrame::CreateXFrame(SwDoc & rDoc, SwFrameFormat *const pFrameFormat) return xFrame; } -OUString SwXFrame::getName() throw( uno::RuntimeException, std::exception ) +OUString SwXFrame::getName() { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -1303,7 +1302,7 @@ OUString SwXFrame::getName() throw( uno::RuntimeException, std::exception ) return m_sName; } -void SwXFrame::setName(const OUString& rName) throw( uno::RuntimeException, std::exception ) +void SwXFrame::setName(const OUString& rName) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -1321,7 +1320,7 @@ void SwXFrame::setName(const OUString& rName) throw( uno::RuntimeException, std: throw uno::RuntimeException(); } -uno::Reference< beans::XPropertySetInfo > SwXFrame::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXFrame::getPropertySetInfo() { uno::Reference< beans::XPropertySetInfo > xRef; static uno::Reference< beans::XPropertySetInfo > xFrameRef; @@ -1403,7 +1402,6 @@ static SwFrameFormat *lcl_GetFrameFormat( const ::uno::Any& rValue, SwDoc *pDoc } void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& _rValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -1997,7 +1995,6 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& } uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aAny; @@ -2356,34 +2353,29 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) void SwXFrame::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXFrame::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXFrame::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXFrame::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } beans::PropertyState SwXFrame::getPropertyState( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence< OUString > aPropertyNames { rPropertyName }; @@ -2393,7 +2385,6 @@ beans::PropertyState SwXFrame::getPropertyState( const OUString& rPropertyName ) uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates( const uno::Sequence< OUString >& aPropertyNames ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence< beans::PropertyState > aStates(aPropertyNames.getLength()); @@ -2479,7 +2470,6 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates( } void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -2573,7 +2563,6 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) } uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -2603,7 +2592,6 @@ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName ) void SAL_CALL SwXFrame::addEventListener( const uno::Reference<lang::XEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -2611,7 +2599,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXFrame::removeEventListener( const uno::Reference<lang::XEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); @@ -2636,7 +2623,7 @@ void SwXFrame::Modify(const SfxPoolItem* pOld, const SfxPoolItem *pNew) m_pImpl->m_EventListeners.disposeAndClear(ev); } -void SwXFrame::dispose() throw( uno::RuntimeException, std::exception ) +void SwXFrame::dispose() { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -2665,7 +2652,7 @@ void SwXFrame::dispose() throw( uno::RuntimeException, std::exception ) } -uno::Reference< text::XTextRange > SwXFrame::getAnchor() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXFrame::getAnchor() { SolarMutexGuard aGuard; uno::Reference< text::XTextRange > aRef; @@ -2696,7 +2683,6 @@ void SwXFrame::ResetDescriptor() } void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRange) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!IsDescriptor()) @@ -3063,7 +3049,6 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan } void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SwFrameFormat* pFormat; if(IsDescriptor()) @@ -3087,7 +3072,7 @@ void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) } } -awt::Point SwXFrame::getPosition() throw( uno::RuntimeException, std::exception ) +awt::Point SwXFrame::getPosition() { SolarMutexGuard aGuard; uno::RuntimeException aRuntime; @@ -3095,7 +3080,7 @@ awt::Point SwXFrame::getPosition() throw( uno::RuntimeException, std::exception throw aRuntime; } -void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeException, std::exception ) +void SwXFrame::setPosition(const awt::Point& /*aPosition*/) { SolarMutexGuard aGuard; uno::RuntimeException aRuntime; @@ -3103,7 +3088,7 @@ void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeE throw aRuntime; } -awt::Size SwXFrame::getSize() throw( uno::RuntimeException, std::exception ) +awt::Size SwXFrame::getSize() { const ::uno::Any aVal = getPropertyValue("Size"); awt::Size const * pRet = o3tl::doAccess<awt::Size>(aVal); @@ -3111,13 +3096,12 @@ awt::Size SwXFrame::getSize() throw( uno::RuntimeException, std::exception ) } void SwXFrame::setSize(const awt::Size& aSize) - throw( beans::PropertyVetoException, uno::RuntimeException, std::exception ) { const ::uno::Any aVal(&aSize, ::cppu::UnoType<awt::Size>::get()); setPropertyValue("Size", aVal); } -OUString SwXFrame::getShapeType() throw( uno::RuntimeException, std::exception ) +OUString SwXFrame::getShapeType() { return OUString("FrameShape"); } @@ -3156,7 +3140,6 @@ void SAL_CALL SwXTextFrame::release( )throw() } ::uno::Any SAL_CALL SwXTextFrame::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { ::uno::Any aRet = SwXFrame::queryInterface(aType); if(aRet.getValueType() == cppu::UnoType<void>::get()) @@ -3166,7 +3149,7 @@ void SAL_CALL SwXTextFrame::release( )throw() return aRet; } -uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes( ) { uno::Sequence< uno::Type > aTextFrameTypes = SwXTextFrameBaseClass::getTypes(); uno::Sequence< uno::Type > aFrameTypes = SwXFrame::getTypes(); @@ -3191,12 +3174,12 @@ uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes( ) throw(uno::Runtim return aTextFrameTypes; } -uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } -uno::Reference< text::XText > SwXTextFrame::getText() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XText > SwXTextFrame::getText() { return this; } @@ -3217,12 +3200,12 @@ const SwStartNode *SwXTextFrame::GetStartNode() const } uno::Reference< text::XTextCursor > -SwXTextFrame::CreateCursor() throw (uno::RuntimeException) +SwXTextFrame::CreateCursor() { return createTextCursor(); } -uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor() { SolarMutexGuard aGuard; uno::Reference< text::XTextCursor > aRef; @@ -3265,7 +3248,7 @@ uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor() throw( uno return aRef; } -uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursorByRange(const uno::Reference< text::XTextRange > & aTextPosition) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursorByRange(const uno::Reference< text::XTextRange > & aTextPosition) { SolarMutexGuard aGuard; uno::Reference< text::XTextCursor > aRef; @@ -3286,7 +3269,7 @@ uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursorByRange(const return aRef; } -uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration() throw( uno::RuntimeException, std::exception ) +uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration() { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -3298,55 +3281,54 @@ uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration() thr return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_FRAME); } -uno::Type SwXTextFrame::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SwXTextFrame::getElementType() { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SwXTextFrame::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextFrame::hasElements() { return true; } void SwXTextFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SwXFrame::attach(xTextRange); } -uno::Reference< text::XTextRange > SwXTextFrame::getAnchor() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXTextFrame::getAnchor() { SolarMutexGuard aGuard; return SwXFrame::getAnchor(); } -void SwXTextFrame::dispose() throw( uno::RuntimeException, std::exception ) +void SwXTextFrame::dispose() { SolarMutexGuard aGuard; SwXFrame::dispose(); } -void SwXTextFrame::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException, std::exception ) +void SwXTextFrame::addEventListener(const uno::Reference< lang::XEventListener > & aListener) { SwXFrame::addEventListener(aListener); } -void SwXTextFrame::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException, std::exception ) +void SwXTextFrame::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) { SwXFrame::removeEventListener(aListener); } -OUString SwXTextFrame::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTextFrame::getImplementationName() { return OUString("SwXTextFrame"); } -sal_Bool SwXTextFrame::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextFrame::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames() { uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames(); aRet.realloc(aRet.getLength() + 2); @@ -3367,13 +3349,11 @@ void SAL_CALL SwXTextFrame::operator delete( void * p) throw() } uno::Reference<container::XNameReplace > SAL_CALL SwXTextFrame::getEvents() - throw(uno::RuntimeException, std::exception) { return new SwFrameEventDescriptor( *this ); } sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { sal_Int64 nRet = SwXFrame::getSomething( rId ); if( !nRet ) @@ -3383,7 +3363,6 @@ sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >& } ::uno::Any SwXTextFrame::getPropertyValue(const OUString& rPropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; ::uno::Any aRet; @@ -3421,18 +3400,17 @@ SwXTextGraphicObject::CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat *cons return CreateXFrame<text::XTextContent, SwXTextGraphicObject>(rDoc, pFrameFormat); } -OUString SwXTextGraphicObject::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTextGraphicObject::getImplementationName() { return OUString("SwXTextGraphicObject"); } -sal_Bool SwXTextGraphicObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextGraphicObject::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames(); aRet.realloc(aRet.getLength() + 1); @@ -3453,7 +3431,6 @@ void SAL_CALL SwXTextGraphicObject::operator delete( void * p) throw() uno::Reference<container::XNameReplace> SAL_CALL SwXTextGraphicObject::getEvents() - throw(uno::RuntimeException, std::exception) { return new SwFrameEventDescriptor( *this ); } @@ -3481,14 +3458,13 @@ SwXTextEmbeddedObject::CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat *co return CreateXFrame<text::XTextContent, SwXTextEmbeddedObject>(rDoc, pFrameFormat); } -uno::Reference< lang::XComponent > SwXTextEmbeddedObject::getEmbeddedObject() throw( uno::RuntimeException, std::exception ) +uno::Reference< lang::XComponent > SwXTextEmbeddedObject::getEmbeddedObject() { uno::Reference<embed::XEmbeddedObject> xObj(getExtendedControlOverEmbeddedObject()); return xObj.is() ? uno::Reference<lang::XComponent>(xObj->getComponent(), uno::UNO_QUERY) : nullptr; } uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExtendedControlOverEmbeddedObject() - throw( uno::RuntimeException, std::exception ) { uno::Reference< embed::XEmbeddedObject > xResult; SwFrameFormat* pFormat = GetFrameFormat(); @@ -3522,7 +3498,7 @@ uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExte return xResult; } -sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect() throw (uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect() { SwFrameFormat* pFormat = GetFrameFormat(); if(pFormat) @@ -3539,7 +3515,7 @@ sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect() throw (uno::RuntimeExcepti return embed::Aspects::MSOLE_CONTENT; // return the default value } -void SAL_CALL SwXTextEmbeddedObject::setAspect( sal_Int64 nAspect ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXTextEmbeddedObject::setAspect( sal_Int64 nAspect ) { SwFrameFormat* pFormat = GetFrameFormat(); if(pFormat) @@ -3554,7 +3530,7 @@ void SAL_CALL SwXTextEmbeddedObject::setAspect( sal_Int64 nAspect ) throw (uno:: } } -uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplacementGraphic() throw (uno::RuntimeException, std::exception) +uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplacementGraphic() { SwFrameFormat* pFormat = GetFrameFormat(); if(pFormat) @@ -3573,18 +3549,17 @@ uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplaceme return uno::Reference< graphic::XGraphic >(); } -OUString SwXTextEmbeddedObject::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTextEmbeddedObject::getImplementationName() { return OUString("SwXTextEmbeddedObject"); } -sal_Bool SwXTextEmbeddedObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextEmbeddedObject::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames(); aRet.realloc(aRet.getLength() + 1); @@ -3605,7 +3580,6 @@ void SAL_CALL SwXTextEmbeddedObject::operator delete( void * p) throw() uno::Reference<container::XNameReplace> SAL_CALL SwXTextEmbeddedObject::getEvents() - throw(uno::RuntimeException, std::exception) { return new SwFrameEventDescriptor( *this ); } @@ -3621,7 +3595,6 @@ SwXOLEListener::~SwXOLEListener() {} void SwXOLEListener::modified( const lang::EventObject& /*rEvent*/ ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -3653,7 +3626,6 @@ void SwXOLEListener::modified( const lang::EventObject& /*rEvent*/ ) } void SwXOLEListener::disposing( const lang::EventObject& rEvent ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 5b3ecbddbe4e..eb6e30b76db3 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -174,14 +174,13 @@ const uno::Sequence< sal_Int8 > & SwXFootnote::getUnoTunnelId() sal_Int64 SAL_CALL SwXFootnote::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { const sal_Int64 nRet( ::sw::UnoTunnelImpl<SwXFootnote>(rId, this) ); return (nRet) ? nRet : SwXText::getSomething(rId); } OUString SAL_CALL -SwXFootnote::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXFootnote::getImplementationName() { return OUString("SwXFootnote"); } @@ -199,13 +198,12 @@ static const size_t g_nServicesEndnote( SAL_N_ELEMENTS(g_ServicesFootnote) ); static const size_t g_nServicesFootnote( g_nServicesEndnote - 1 ); // NB: omit! sal_Bool SAL_CALL SwXFootnote::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXFootnote::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXFootnote::getSupportedServiceNames() { SolarMutexGuard g; return ::sw::GetSupportedServiceNamesImpl( @@ -214,7 +212,7 @@ SwXFootnote::getSupportedServiceNames() throw (uno::RuntimeException, std::excep } uno::Sequence< uno::Type > SAL_CALL -SwXFootnote::getTypes() throw (uno::RuntimeException, std::exception) +SwXFootnote::getTypes() { const uno::Sequence< uno::Type > aTypes = SwXFootnote_Base::getTypes(); const uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes(); @@ -222,14 +220,13 @@ SwXFootnote::getTypes() throw (uno::RuntimeException, std::exception) } uno::Sequence< sal_Int8 > SAL_CALL -SwXFootnote::getImplementationId() throw (uno::RuntimeException, std::exception) +SwXFootnote::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } uno::Any SAL_CALL SwXFootnote::queryInterface(const uno::Type& rType) -throw (uno::RuntimeException, std::exception) { const uno::Any ret = SwXFootnote_Base::queryInterface(rType); return (ret.getValueType() == cppu::UnoType<void>::get()) @@ -237,7 +234,7 @@ throw (uno::RuntimeException, std::exception) : ret; } -OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwXFootnote::getLabel() { SolarMutexGuard aGuard; @@ -259,7 +256,7 @@ OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException, std::exc } void SAL_CALL -SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException, std::exception) +SwXFootnote::setLabel(const OUString& aLabel) { SolarMutexGuard aGuard; OUString newLabel(aLabel); @@ -290,7 +287,6 @@ SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException, std: void SAL_CALL SwXFootnote::attach(const uno::Reference< text::XTextRange > & xTextRange) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -357,7 +353,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXFootnote::getAnchor() throw (uno::RuntimeException, std::exception) +SwXFootnote::getAnchor() { SolarMutexGuard aGuard; @@ -373,7 +369,7 @@ SwXFootnote::getAnchor() throw (uno::RuntimeException, std::exception) return xRet; } -void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXFootnote::dispose() { SolarMutexGuard aGuard; @@ -390,7 +386,6 @@ void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException, std::exceptio void SAL_CALL SwXFootnote::addEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -399,7 +394,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXFootnote::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); @@ -420,13 +414,13 @@ const SwStartNode *SwXFootnote::GetStartNode() const } uno::Reference< text::XTextCursor > -SwXFootnote::CreateCursor() throw (uno::RuntimeException) +SwXFootnote::CreateCursor() { return createTextCursor(); } uno::Reference< text::XTextCursor > SAL_CALL -SwXFootnote::createTextCursor() throw (uno::RuntimeException, std::exception) +SwXFootnote::createTextCursor() { SolarMutexGuard aGuard; @@ -446,7 +440,6 @@ SwXFootnote::createTextCursor() throw (uno::RuntimeException, std::exception) uno::Reference< text::XTextCursor > SAL_CALL SwXFootnote::createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -475,7 +468,7 @@ throw (uno::RuntimeException, std::exception) } uno::Reference< container::XEnumeration > SAL_CALL -SwXFootnote::createEnumeration() throw (uno::RuntimeException, std::exception) +SwXFootnote::createEnumeration() { SolarMutexGuard aGuard; @@ -488,19 +481,18 @@ SwXFootnote::createEnumeration() throw (uno::RuntimeException, std::exception) return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_FOOTNOTE); } -uno::Type SAL_CALL SwXFootnote::getElementType() throw (uno::RuntimeException, std::exception) +uno::Type SAL_CALL SwXFootnote::getElementType() { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SAL_CALL SwXFootnote::hasElements() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXFootnote::hasElements() { return true; } uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXFootnote::getPropertySetInfo() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; static uno::Reference< beans::XPropertySetInfo > xRet = @@ -511,9 +503,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXFootnote::setPropertyValue(const OUString&, const uno::Any&) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { //no values to be set throw lang::IllegalArgumentException(); @@ -521,8 +510,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXFootnote::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -562,8 +549,6 @@ void SAL_CALL SwXFootnote::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXFootnote::addPropertyChangeListener(): not implemented"); } @@ -572,8 +557,6 @@ void SAL_CALL SwXFootnote::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXFootnote::removePropertyChangeListener(): not implemented"); } @@ -582,8 +565,6 @@ void SAL_CALL SwXFootnote::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXFootnote::addVetoableChangeListener(): not implemented"); } @@ -592,8 +573,6 @@ void SAL_CALL SwXFootnote::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXFootnote::removeVetoableChangeListener(): not implemented"); } diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index a25780a4e67d..c06361dfed3b 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -67,7 +67,7 @@ using namespace ::com::sun::star; /// @throws lang::IllegalArgumentException static OUString -lcl_AnyToString(uno::Any const& rVal) throw (lang::IllegalArgumentException) +lcl_AnyToString(uno::Any const& rVal) { OUString sRet; if(!(rVal >>= sRet)) @@ -79,7 +79,7 @@ lcl_AnyToString(uno::Any const& rVal) throw (lang::IllegalArgumentException) /// @throws lang::IllegalArgumentException static sal_Int16 -lcl_AnyToInt16(uno::Any const& rVal) throw (lang::IllegalArgumentException) +lcl_AnyToInt16(uno::Any const& rVal) { sal_Int16 nRet = 0; if(!(rVal >>= nRet)) @@ -91,7 +91,7 @@ lcl_AnyToInt16(uno::Any const& rVal) throw (lang::IllegalArgumentException) /// @throws lang::IllegalArgumentException static bool -lcl_AnyToBool(uno::Any const& rVal) throw (lang::IllegalArgumentException) +lcl_AnyToBool(uno::Any const& rVal) { bool bRet = false; if(!(rVal >>= bRet)) @@ -105,7 +105,6 @@ lcl_AnyToBool(uno::Any const& rVal) throw (lang::IllegalArgumentException) template<typename T> void lcl_AnyToBitMask(uno::Any const& rValue, T & rBitMask, const T nBit) -throw (lang::IllegalArgumentException) { rBitMask = lcl_AnyToBool(rValue) ? (rBitMask | nBit) @@ -203,29 +202,23 @@ public: explicit StyleAccess_Impl(SwXDocumentIndex& rParentIdx); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService(const OUString& rServiceName) - throw (uno::RuntimeException, std::exception) override; + supportsService(const OUString& rServiceName) override; virtual uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; // XIndexReplace virtual void SAL_CALL - replaceByIndex(sal_Int32 Index, const uno::Any& rElement) - throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + replaceByIndex(sal_Int32 Index, const uno::Any& rElement) override; }; @@ -249,29 +242,23 @@ public: explicit TokenAccess_Impl(SwXDocumentIndex& rParentIdx); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService(const OUString& rServiceName) - throw (uno::RuntimeException, std::exception) override; + supportsService(const OUString& rServiceName) override; virtual uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; // XIndexReplace virtual void SAL_CALL - replaceByIndex(sal_Int32 Index, const uno::Any& rElement) - throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + replaceByIndex(sal_Int32 Index, const uno::Any& rElement) override; }; @@ -459,26 +446,24 @@ const uno::Sequence< sal_Int8 > & SwXDocumentIndex::getUnoTunnelId() sal_Int64 SAL_CALL SwXDocumentIndex::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXDocumentIndex>(rId, this); } OUString SAL_CALL -SwXDocumentIndex::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXDocumentIndex::getImplementationName() { return OUString("SwXDocumentIndex"); } sal_Bool SAL_CALL SwXDocumentIndex::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXDocumentIndex::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXDocumentIndex::getSupportedServiceNames() { SolarMutexGuard g; @@ -513,7 +498,6 @@ SwXDocumentIndex::getSupportedServiceNames() throw (uno::RuntimeException, std:: } OUString SAL_CALL SwXDocumentIndex::getServiceName() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -538,13 +522,13 @@ throw (uno::RuntimeException, std::exception) return SwXServiceProvider::GetProviderName(nObjectType); } -void SAL_CALL SwXDocumentIndex::update() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXDocumentIndex::update() { return refresh(); // update is from deprecated XDocumentIndex } uno::Reference< beans::XPropertySetInfo > SAL_CALL -SwXDocumentIndex::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +SwXDocumentIndex::getPropertySetInfo() { SolarMutexGuard g; @@ -556,9 +540,6 @@ SwXDocumentIndex::getPropertySetInfo() throw (uno::RuntimeException, std::except void SAL_CALL SwXDocumentIndex::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -891,8 +872,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1224,8 +1203,6 @@ void SAL_CALL SwXDocumentIndex::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXDocumentIndex::addPropertyChangeListener(): not implemented"); } @@ -1234,8 +1211,6 @@ void SAL_CALL SwXDocumentIndex::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXDocumentIndex::removePropertyChangeListener(): not implemented"); } @@ -1244,8 +1219,6 @@ void SAL_CALL SwXDocumentIndex::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXDocumentIndex::addVetoableChangeListener(): not implemented"); } @@ -1254,8 +1227,6 @@ void SAL_CALL SwXDocumentIndex::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXDocumentIndex::removeVetoableChangeListener(): not implemented"); } @@ -1281,7 +1252,7 @@ void lcl_CalcLayout(SwDoc *pDoc) } // XRefreshable -void SAL_CALL SwXDocumentIndex::refresh() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXDocumentIndex::refresh() { { SolarMutexGuard g; @@ -1316,7 +1287,6 @@ void SAL_CALL SwXDocumentIndex::refresh() throw (uno::RuntimeException, std::exc void SAL_CALL SwXDocumentIndex::addRefreshListener( const uno::Reference<util::XRefreshListener>& xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_Listeners.addInterface( @@ -1325,7 +1295,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXDocumentIndex::removeRefreshListener( const uno::Reference<util::XRefreshListener>& xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_Listeners.removeInterface( @@ -1334,7 +1303,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXDocumentIndex::attach(const uno::Reference< text::XTextRange > & xTextRange) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1395,7 +1363,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXDocumentIndex::getAnchor() throw (uno::RuntimeException, std::exception) +SwXDocumentIndex::getAnchor() { SolarMutexGuard aGuard; @@ -1420,7 +1388,7 @@ SwXDocumentIndex::getAnchor() throw (uno::RuntimeException, std::exception) return xRet; } -void SAL_CALL SwXDocumentIndex::dispose() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXDocumentIndex::dispose() { SolarMutexGuard aGuard; @@ -1436,7 +1404,6 @@ void SAL_CALL SwXDocumentIndex::dispose() throw (uno::RuntimeException, std::exc void SAL_CALL SwXDocumentIndex::addEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_Listeners.addInterface( @@ -1446,14 +1413,13 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXDocumentIndex::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_Listeners.removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener); } -OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwXDocumentIndex::getName() { SolarMutexGuard g; @@ -1475,7 +1441,7 @@ OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException, std: } void SAL_CALL -SwXDocumentIndex::setName(const OUString& rName) throw (uno::RuntimeException, std::exception) +SwXDocumentIndex::setName(const OUString& rName) { SolarMutexGuard g; @@ -1716,25 +1682,23 @@ const uno::Sequence< sal_Int8 > & SwXDocumentIndexMark::getUnoTunnelId() sal_Int64 SAL_CALL SwXDocumentIndexMark::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXDocumentIndexMark>(rId, this); } OUString SAL_CALL -SwXDocumentIndexMark::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexMark::getImplementationName() { return OUString("SwXDocumentIndexMark"); } sal_Bool SAL_CALL SwXDocumentIndexMark::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXDocumentIndexMark::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexMark::getSupportedServiceNames() { SolarMutexGuard g; @@ -1763,7 +1727,7 @@ SwXDocumentIndexMark::getSupportedServiceNames() throw (uno::RuntimeException, s } OUString SAL_CALL -SwXDocumentIndexMark::getMarkEntry() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexMark::getMarkEntry() { SolarMutexGuard aGuard; @@ -1786,7 +1750,6 @@ SwXDocumentIndexMark::getMarkEntry() throw (uno::RuntimeException, std::exceptio void SAL_CALL SwXDocumentIndexMark::setMarkEntry(const OUString& rIndexEntry) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1821,7 +1784,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXDocumentIndexMark::attach( const uno::Reference< text::XTextRange > & xTextRange) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2034,7 +1996,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( } uno::Reference< text::XTextRange > SAL_CALL -SwXDocumentIndexMark::getAnchor() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexMark::getAnchor() { SolarMutexGuard aGuard; @@ -2068,7 +2030,7 @@ SwXDocumentIndexMark::getAnchor() throw (uno::RuntimeException, std::exception) } void SAL_CALL -SwXDocumentIndexMark::dispose() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexMark::dispose() { SolarMutexGuard aGuard; @@ -2082,7 +2044,6 @@ SwXDocumentIndexMark::dispose() throw (uno::RuntimeException, std::exception) void SAL_CALL SwXDocumentIndexMark::addEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -2091,14 +2052,13 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXDocumentIndexMark::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); } uno::Reference< beans::XPropertySetInfo > SAL_CALL -SwXDocumentIndexMark::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexMark::getPropertySetInfo() { SolarMutexGuard g; @@ -2129,9 +2089,6 @@ SwXDocumentIndexMark::getPropertySetInfo() throw (uno::RuntimeException, std::ex void SAL_CALL SwXDocumentIndexMark::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2277,8 +2234,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXDocumentIndexMark::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2394,8 +2349,6 @@ void SAL_CALL SwXDocumentIndexMark::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXDocumentIndexMark::addPropertyChangeListener(): not implemented"); } @@ -2404,8 +2357,6 @@ void SAL_CALL SwXDocumentIndexMark::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXDocumentIndexMark::removePropertyChangeListener(): not implemented"); } @@ -2414,8 +2365,6 @@ void SAL_CALL SwXDocumentIndexMark::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXDocumentIndexMark::addVetoableChangeListener(): not implemented"); } @@ -2424,8 +2373,6 @@ void SAL_CALL SwXDocumentIndexMark::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXDocumentIndexMark::removeVetoableChangeListener(): not implemented"); } @@ -2440,7 +2387,7 @@ SwXDocumentIndexes::~SwXDocumentIndexes() } OUString SAL_CALL -SwXDocumentIndexes::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexes::getImplementationName() { return OUString("SwXDocumentIndexes"); } @@ -2451,20 +2398,19 @@ static char const*const g_ServicesDocumentIndexes[] = }; sal_Bool SAL_CALL SwXDocumentIndexes::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXDocumentIndexes::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexes::getSupportedServiceNames() { return ::sw::GetSupportedServiceNamesImpl( SAL_N_ELEMENTS(g_ServicesDocumentIndexes), g_ServicesDocumentIndexes); } sal_Int32 SAL_CALL -SwXDocumentIndexes::getCount() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexes::getCount() { SolarMutexGuard aGuard; @@ -2487,8 +2433,6 @@ SwXDocumentIndexes::getCount() throw (uno::RuntimeException, std::exception) uno::Any SAL_CALL SwXDocumentIndexes::getByIndex(sal_Int32 nIndex) -throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2519,8 +2463,6 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::Any SAL_CALL SwXDocumentIndexes::getByName(const OUString& rName) -throw (container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2548,7 +2490,7 @@ throw (container::NoSuchElementException, lang::WrappedTargetException, } uno::Sequence< OUString > SAL_CALL -SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexes::getElementNames() { SolarMutexGuard aGuard; @@ -2584,7 +2526,6 @@ SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException, std::excepti sal_Bool SAL_CALL SwXDocumentIndexes::hasByName(const OUString& rName) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2609,13 +2550,13 @@ throw (uno::RuntimeException, std::exception) } uno::Type SAL_CALL -SwXDocumentIndexes::getElementType() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexes::getElementType() { return cppu::UnoType<text::XDocumentIndex>::get(); } sal_Bool SAL_CALL -SwXDocumentIndexes::hasElements() throw (uno::RuntimeException, std::exception) +SwXDocumentIndexes::hasElements() { return 0 != getCount(); } @@ -2632,7 +2573,6 @@ SwXDocumentIndex::StyleAccess_Impl::~StyleAccess_Impl() OUString SAL_CALL SwXDocumentIndex::StyleAccess_Impl::getImplementationName() -throw (uno::RuntimeException, std::exception) { return OUString("SwXDocumentIndex::StyleAccess_Impl"); } @@ -2644,14 +2584,12 @@ static char const*const g_ServicesIndexStyleAccess[] = sal_Bool SAL_CALL SwXDocumentIndex::StyleAccess_Impl::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SwXDocumentIndex::StyleAccess_Impl::getSupportedServiceNames() -throw (uno::RuntimeException, std::exception) { return ::sw::GetSupportedServiceNamesImpl( SAL_N_ELEMENTS(g_ServicesIndexStyleAccess), @@ -2661,8 +2599,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXDocumentIndex::StyleAccess_Impl::replaceByIndex( sal_Int32 nIndex, const uno::Any& rElement) -throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2697,15 +2633,13 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, } sal_Int32 SAL_CALL -SwXDocumentIndex::StyleAccess_Impl::getCount() throw (uno::RuntimeException, std::exception) +SwXDocumentIndex::StyleAccess_Impl::getCount() { return MAXLEVEL; } uno::Any SAL_CALL SwXDocumentIndex::StyleAccess_Impl::getByIndex(sal_Int32 nIndex) -throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2738,13 +2672,12 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::Type SAL_CALL SwXDocumentIndex::StyleAccess_Impl::getElementType() -throw (uno::RuntimeException, std::exception) { return cppu::UnoType<uno::Sequence<OUString>>::get(); } sal_Bool SAL_CALL -SwXDocumentIndex::StyleAccess_Impl::hasElements() throw (uno::RuntimeException, std::exception) +SwXDocumentIndex::StyleAccess_Impl::hasElements() { return true; } @@ -2761,7 +2694,6 @@ SwXDocumentIndex::TokenAccess_Impl::~TokenAccess_Impl() OUString SAL_CALL SwXDocumentIndex::TokenAccess_Impl::getImplementationName() -throw (uno::RuntimeException, std::exception) { return OUString("SwXDocumentIndex::TokenAccess_Impl"); } @@ -2773,14 +2705,12 @@ static char const*const g_ServicesIndexTokenAccess[] = sal_Bool SAL_CALL SwXDocumentIndex::TokenAccess_Impl::supportsService( const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SwXDocumentIndex::TokenAccess_Impl::getSupportedServiceNames() -throw (uno::RuntimeException, std::exception) { return ::sw::GetSupportedServiceNamesImpl( SAL_N_ELEMENTS(g_ServicesIndexTokenAccess), @@ -2809,8 +2739,6 @@ static const struct TokenType_ g_TokenTypes[] = void SAL_CALL SwXDocumentIndex::TokenAccess_Impl::replaceByIndex( sal_Int32 nIndex, const uno::Any& rElement) -throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2989,7 +2917,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, } sal_Int32 SAL_CALL -SwXDocumentIndex::TokenAccess_Impl::getCount() throw (uno::RuntimeException, std::exception) +SwXDocumentIndex::TokenAccess_Impl::getCount() { SolarMutexGuard aGuard; @@ -2999,8 +2927,6 @@ SwXDocumentIndex::TokenAccess_Impl::getCount() throw (uno::RuntimeException, std uno::Any SAL_CALL SwXDocumentIndex::TokenAccess_Impl::getByIndex(sal_Int32 nIndex) -throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3250,14 +3176,12 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::Type SAL_CALL SwXDocumentIndex::TokenAccess_Impl::getElementType() -throw (uno::RuntimeException, std::exception) { return cppu::UnoType<uno::Sequence< beans::PropertyValues >>::get(); } sal_Bool SAL_CALL SwXDocumentIndex::TokenAccess_Impl::hasElements() -throw (uno::RuntimeException, std::exception) { return true; } diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index d11c866405c4..8d0a03eb20b8 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -210,7 +210,6 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) /// @throws uno::RuntimeException static void lcl_setCharStyle(SwDoc *const pDoc, const uno::Any & rValue, SfxItemSet & rSet) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SwDocShell *const pDocSh = pDoc->GetDocShell(); if(pDocSh) @@ -238,7 +237,6 @@ lcl_setCharStyle(SwDoc *const pDoc, const uno::Any & rValue, SfxItemSet & rSet) static void lcl_setAutoStyle(IStyleAccess & rStyleAccess, const uno::Any & rValue, SfxItemSet & rSet, const bool bPara) -throw (lang::IllegalArgumentException) { OUString uStyle; if (!(rValue >>= uStyle)) @@ -264,7 +262,6 @@ throw (lang::IllegalArgumentException) void SwUnoCursorHelper::SetTextFormatColl(const uno::Any & rAny, SwPaM & rPaM) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SwDoc *const pDoc = rPaM.GetDoc(); SwDocShell *const pDocSh = pDoc->GetDocShell(); @@ -477,8 +474,6 @@ bool SwUnoCursorHelper::SetCursorPropertyValue( SfxItemPropertySimpleEntry const& rEntry, const uno::Any& rValue, SwPaM & rPam, SfxItemSet & rItemSet) -throw (lang::IllegalArgumentException, uno::RuntimeException, - uno::DeploymentException, std::exception) { if (!(rEntry.nFlags & beans::PropertyAttribute::MAYBEVOID) && (rValue.getValueType() == cppu::UnoType<void>::get())) @@ -837,7 +832,7 @@ bool SwXTextCursor::IsAtEndOfMeta() const return false; } -OUString SwXTextCursor::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString SwXTextCursor::getImplementationName() { return OUString("SwXTextCursor"); } @@ -857,13 +852,12 @@ static char const*const g_ServicesTextCursor[] = static const size_t g_nServicesTextCursor(SAL_N_ELEMENTS(g_ServicesTextCursor)); sal_Bool SAL_CALL SwXTextCursor::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXTextCursor::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXTextCursor::getSupportedServiceNames() { return ::sw::GetSupportedServiceNamesImpl( g_nServicesTextCursor, g_ServicesTextCursor); @@ -881,13 +875,12 @@ const uno::Sequence< sal_Int8 > & SwXTextCursor::getUnoTunnelId() sal_Int64 SAL_CALL SwXTextCursor::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { const sal_Int64 nRet( ::sw::UnoTunnelImpl<SwXTextCursor>(rId, this) ); return (nRet) ? nRet : OTextCursorHelper::getSomething(rId); } -void SAL_CALL SwXTextCursor::collapseToStart() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXTextCursor::collapseToStart() { SolarMutexGuard aGuard; @@ -903,7 +896,7 @@ void SAL_CALL SwXTextCursor::collapseToStart() throw (uno::RuntimeException, std } } -void SAL_CALL SwXTextCursor::collapseToEnd() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXTextCursor::collapseToEnd() { SolarMutexGuard aGuard; @@ -919,7 +912,7 @@ void SAL_CALL SwXTextCursor::collapseToEnd() throw (uno::RuntimeException, std:: } } -sal_Bool SAL_CALL SwXTextCursor::isCollapsed() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextCursor::isCollapsed() { SolarMutexGuard aGuard; @@ -934,7 +927,6 @@ sal_Bool SAL_CALL SwXTextCursor::isCollapsed() throw (uno::RuntimeException, std sal_Bool SAL_CALL SwXTextCursor::goLeft(sal_Int16 nCount, sal_Bool Expand) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -953,7 +945,6 @@ throw (uno::RuntimeException, std::exception) sal_Bool SAL_CALL SwXTextCursor::goRight(sal_Int16 nCount, sal_Bool Expand) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -971,7 +962,7 @@ throw (uno::RuntimeException, std::exception) } void SAL_CALL -SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException, std::exception) +SwXTextCursor::gotoStart(sal_Bool Expand) { SolarMutexGuard aGuard; @@ -1027,7 +1018,7 @@ SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException, std::exc } void SAL_CALL -SwXTextCursor::gotoEnd(sal_Bool Expand) throw (uno::RuntimeException, std::exception) +SwXTextCursor::gotoEnd(sal_Bool Expand) { SolarMutexGuard aGuard; @@ -1056,7 +1047,6 @@ SwXTextCursor::gotoEnd(sal_Bool Expand) throw (uno::RuntimeException, std::excep void SAL_CALL SwXTextCursor::gotoRange( const uno::Reference< text::XTextRange > & xRange, sal_Bool bExpand) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1199,7 +1189,7 @@ throw (uno::RuntimeException, std::exception) } } -sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() { SolarMutexGuard aGuard; @@ -1210,7 +1200,7 @@ sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() throw (uno::RuntimeException, s return bRet; } -sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() { SolarMutexGuard aGuard; @@ -1222,7 +1212,7 @@ sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() throw (uno::RuntimeException, std } sal_Bool SAL_CALL -SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std::exception) +SwXTextCursor::gotoNextWord(sal_Bool Expand) { SolarMutexGuard aGuard; @@ -1269,7 +1259,7 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std:: } sal_Bool SAL_CALL -SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException, std::exception) +SwXTextCursor::gotoPreviousWord(sal_Bool Expand) { SolarMutexGuard aGuard; @@ -1309,7 +1299,7 @@ SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException, s } sal_Bool SAL_CALL -SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw (uno::RuntimeException, std::exception) +SwXTextCursor::gotoEndOfWord(sal_Bool Expand) { SolarMutexGuard aGuard; @@ -1345,7 +1335,7 @@ SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw (uno::RuntimeException, std: } sal_Bool SAL_CALL -SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw (uno::RuntimeException, std::exception) +SwXTextCursor::gotoStartOfWord(sal_Bool Expand) { SolarMutexGuard aGuard; @@ -1381,7 +1371,7 @@ SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw (uno::RuntimeException, st } sal_Bool SAL_CALL -SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException, std::exception) +SwXTextCursor::isStartOfSentence() { SolarMutexGuard aGuard; @@ -1404,7 +1394,7 @@ SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException, std::exception) } sal_Bool SAL_CALL -SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException, std::exception) +SwXTextCursor::isEndOfSentence() { SolarMutexGuard aGuard; @@ -1428,7 +1418,7 @@ SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException, std::exception) } sal_Bool SAL_CALL -SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException, std::exception) +SwXTextCursor::gotoNextSentence(sal_Bool Expand) { SolarMutexGuard aGuard; @@ -1464,7 +1454,6 @@ SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException, s sal_Bool SAL_CALL SwXTextCursor::gotoPreviousSentence(sal_Bool Expand) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1493,7 +1482,6 @@ throw (uno::RuntimeException, std::exception) sal_Bool SAL_CALL SwXTextCursor::gotoStartOfSentence(sal_Bool Expand) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1516,7 +1504,7 @@ throw (uno::RuntimeException, std::exception) } sal_Bool SAL_CALL -SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException, std::exception) +SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) { SolarMutexGuard aGuard; @@ -1540,7 +1528,7 @@ SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException, } sal_Bool SAL_CALL -SwXTextCursor::isStartOfParagraph() throw (uno::RuntimeException, std::exception) +SwXTextCursor::isStartOfParagraph() { SolarMutexGuard aGuard; @@ -1551,7 +1539,7 @@ SwXTextCursor::isStartOfParagraph() throw (uno::RuntimeException, std::exception } sal_Bool SAL_CALL -SwXTextCursor::isEndOfParagraph() throw (uno::RuntimeException, std::exception) +SwXTextCursor::isEndOfParagraph() { SolarMutexGuard aGuard; @@ -1563,7 +1551,6 @@ SwXTextCursor::isEndOfParagraph() throw (uno::RuntimeException, std::exception) sal_Bool SAL_CALL SwXTextCursor::gotoStartOfParagraph(sal_Bool Expand) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1588,7 +1575,7 @@ throw (uno::RuntimeException, std::exception) } sal_Bool SAL_CALL -SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException, std::exception) +SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) { SolarMutexGuard aGuard; @@ -1613,7 +1600,7 @@ SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException, } sal_Bool SAL_CALL -SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException, std::exception) +SwXTextCursor::gotoNextParagraph(sal_Bool Expand) { SolarMutexGuard aGuard; @@ -1630,7 +1617,6 @@ SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException, sal_Bool SAL_CALL SwXTextCursor::gotoPreviousParagraph(sal_Bool Expand) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1646,7 +1632,7 @@ throw (uno::RuntimeException, std::exception) } uno::Reference< text::XText > SAL_CALL -SwXTextCursor::getText() throw (uno::RuntimeException, std::exception) +SwXTextCursor::getText() { SolarMutexGuard g; @@ -1654,7 +1640,7 @@ SwXTextCursor::getText() throw (uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXTextCursor::getStart() throw (uno::RuntimeException, std::exception) +SwXTextCursor::getStart() { SolarMutexGuard aGuard; @@ -1680,7 +1666,7 @@ SwXTextCursor::getStart() throw (uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXTextCursor::getEnd() throw (uno::RuntimeException, std::exception) +SwXTextCursor::getEnd() { SolarMutexGuard aGuard; @@ -1705,7 +1691,7 @@ SwXTextCursor::getEnd() throw (uno::RuntimeException, std::exception) return xRet; } -OUString SAL_CALL SwXTextCursor::getString() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwXTextCursor::getString() { SolarMutexGuard aGuard; @@ -1717,7 +1703,7 @@ OUString SAL_CALL SwXTextCursor::getString() throw (uno::RuntimeException, std:: } void SAL_CALL -SwXTextCursor::setString(const OUString& aString) throw (uno::RuntimeException, std::exception) +SwXTextCursor::setString(const OUString& aString) { SolarMutexGuard aGuard; @@ -1733,8 +1719,6 @@ SwXTextCursor::setString(const OUString& aString) throw (uno::RuntimeException, uno::Any SwUnoCursorHelper::GetPropertyValue( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { uno::Any aAny; SfxItemPropertySimpleEntry const*const pEntry = @@ -1771,9 +1755,6 @@ void SwUnoCursorHelper::SetPropertyValue( const OUString& rPropertyName, const uno::Any& rValue, const SetAttrMode nAttrMode) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) { uno::Sequence< beans::PropertyValue > aValues(1); aValues[0].Name = rPropertyName; @@ -1797,9 +1778,6 @@ void SwUnoCursorHelper::SetPropertyValues( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const uno::Sequence< beans::PropertyValue > &rPropertyValues, const SetAttrMode nAttrMode, const bool bTableMode) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if (!rPropertyValues.getLength()) return; @@ -1877,7 +1855,6 @@ SwUnoCursorHelper::GetPropertyStates( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const uno::Sequence< OUString >& rPropertyNames, const SwGetPropertyStatesCaller eCaller) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { const OUString* pNames = rPropertyNames.getConstArray(); uno::Sequence< beans::PropertyState > aRet(rPropertyNames.getLength()); @@ -1986,7 +1963,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) beans::PropertyState SwUnoCursorHelper::GetPropertyState( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const OUString& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException) { uno::Sequence< OUString > aStrings { rPropertyName }; uno::Sequence< beans::PropertyState > aSeq = @@ -2020,7 +1996,6 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc, void SwUnoCursorHelper::SetPropertyToDefault( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const OUString& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SwDoc & rDoc = *rPaM.GetDoc(); SfxItemPropertySimpleEntry const*const pEntry = @@ -2061,8 +2036,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Any SwUnoCursorHelper::GetPropertyDefault( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) { SfxItemPropertySimpleEntry const*const pEntry = rPropSet.getPropertyMap().getByName(rPropertyName); @@ -2084,7 +2057,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, } uno::Reference< beans::XPropertySetInfo > SAL_CALL -SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +SwXTextCursor::getPropertySetInfo() { SolarMutexGuard g; @@ -2111,9 +2084,6 @@ SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException, std::exception void SAL_CALL SwXTextCursor::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2146,8 +2116,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXTextCursor::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2176,8 +2144,6 @@ void SAL_CALL SwXTextCursor::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextCursor::addPropertyChangeListener(): not implemented"); } @@ -2186,8 +2152,6 @@ void SAL_CALL SwXTextCursor::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextCursor::removePropertyChangeListener(): not implemented"); } @@ -2196,8 +2160,6 @@ void SAL_CALL SwXTextCursor::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextCursor::addVetoableChangeListener(): not implemented"); } @@ -2206,15 +2168,12 @@ void SAL_CALL SwXTextCursor::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextCursor::removeVetoableChangeListener(): not implemented"); } beans::PropertyState SAL_CALL SwXTextCursor::getPropertyState(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2228,7 +2187,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Sequence< beans::PropertyState > SAL_CALL SwXTextCursor::getPropertyStates( const uno::Sequence< OUString >& rPropertyNames) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2240,7 +2198,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) void SAL_CALL SwXTextCursor::setPropertyToDefault(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { // forward: need no solar mutex here uno::Sequence < OUString > aSequence ( &rPropertyName, 1 ); @@ -2249,8 +2206,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Any SAL_CALL SwXTextCursor::getPropertyDefault(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { // forward: need no solar mutex here const uno::Sequence < OUString > aSequence ( &rPropertyName, 1 ); @@ -2260,9 +2215,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextCursor::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) - throw ( - css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( aValues.getLength() != aPropertyNames.getLength() ) { @@ -2303,7 +2255,6 @@ void SAL_CALL SwXTextCursor::setPropertyValues( uno::Sequence< uno::Any > SAL_CALL SwXTextCursor::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) - throw (css::uno::RuntimeException, std::exception) { // a banal implementation for now uno::Sequence< uno::Any > aValues( aPropertyNames.getLength() ); @@ -2315,13 +2266,11 @@ SwXTextCursor::getPropertyValues( const uno::Sequence< OUString >& aPropertyName void SAL_CALL SwXTextCursor::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ ) - throw (css::uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextCursor::addPropertiesChangeListener(): not implemented"); } void SAL_CALL SwXTextCursor::removePropertiesChangeListener( const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ ) - throw (css::uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextCursor::removePropertiesChangeListener(): not implemented"); } @@ -2329,7 +2278,6 @@ void SAL_CALL SwXTextCursor::removePropertiesChangeListener( void SAL_CALL SwXTextCursor::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ ) - throw (css::uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextCursor::firePropertiesChangeEvent(): not implemented"); } @@ -2369,7 +2317,6 @@ lcl_EnumerateIds(sal_uInt16 const* pIdRange, std::set<sal_uInt16> &rWhichIds) void SAL_CALL SwXTextCursor::setAllPropertiesToDefault() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2393,7 +2340,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextCursor::setPropertiesToDefault( const uno::Sequence< OUString >& rPropertyNames) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2459,8 +2405,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Sequence< uno::Any > SAL_CALL SwXTextCursor::getPropertyDefaults( const uno::Sequence< OUString >& rPropertyNames) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2500,7 +2444,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, } void SAL_CALL SwXTextCursor::invalidateMarkings(::sal_Int32 nType) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2541,7 +2484,6 @@ void SAL_CALL SwXTextCursor::makeRedline( const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2552,8 +2494,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) void SAL_CALL SwXTextCursor::insertDocumentFromURL(const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rOptions) -throw (lang::IllegalArgumentException, io::IOException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2634,7 +2574,7 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable) } uno::Sequence< beans::PropertyValue > SAL_CALL -SwXTextCursor::createSortDescriptor() throw (uno::RuntimeException, std::exception) +SwXTextCursor::createSortDescriptor() { SolarMutexGuard aGuard; @@ -2895,7 +2835,6 @@ bool SwUnoCursorHelper::ConvertSortProperties( void SAL_CALL SwXTextCursor::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2939,7 +2878,6 @@ SwXTextCursor::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor) uno::Reference< container::XEnumeration > SAL_CALL SwXTextCursor::createContentEnumeration(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; if (rServiceName != "com.sun.star.text.TextContent") @@ -2949,7 +2887,7 @@ throw (uno::RuntimeException, std::exception) } uno::Reference< container::XEnumeration > SAL_CALL -SwXTextCursor::createEnumeration() throw (uno::RuntimeException, std::exception) +SwXTextCursor::createEnumeration() { SolarMutexGuard g; @@ -2985,18 +2923,18 @@ SwXTextCursor::createEnumeration() throw (uno::RuntimeException, std::exception) } uno::Type SAL_CALL -SwXTextCursor::getElementType() throw (uno::RuntimeException, std::exception) +SwXTextCursor::getElementType() { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SAL_CALL SwXTextCursor::hasElements() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextCursor::hasElements() { return true; } uno::Sequence< OUString > SAL_CALL -SwXTextCursor::getAvailableServiceNames() throw (uno::RuntimeException, std::exception) +SwXTextCursor::getAvailableServiceNames() { uno::Sequence<OUString> aRet { "com.sun.star.text.TextContent" }; return aRet; @@ -3006,7 +2944,6 @@ IMPLEMENT_FORWARD_REFCOUNT( SwXTextCursor,SwXTextCursor_Base ) uno::Any SAL_CALL SwXTextCursor::queryInterface(const uno::Type& rType) -throw (uno::RuntimeException, std::exception) { return (rType == cppu::UnoType<lang::XUnoTunnel>::get()) ? OTextCursorHelper::queryInterface(rType) diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index a0100495b039..8dd372fcf576 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -495,24 +495,23 @@ struct SwXParagraphEnumerationImpl final : public SwXParagraphEnumeration } // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("SwXParagraphEnumeration"); } - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) override { return cppu::supportsService(this, rServiceName); }; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return {"com.sun.star.text.ParagraphEnumeration"}; }; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual css::uno::Any SAL_CALL nextElement() override; SwUnoCursor& GetCursor() { return *m_pCursor; } /// @throws container::NoSuchElementException /// @throws lang::WrappedTargetException /// @throws uno::RuntimeException - uno::Reference< text::XTextContent > NextElement_Impl() - throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + uno::Reference< text::XTextContent > NextElement_Impl(); }; SwXParagraphEnumeration* SwXParagraphEnumeration::Create( @@ -526,7 +525,7 @@ SwXParagraphEnumeration* SwXParagraphEnumeration::Create( } sal_Bool SAL_CALL -SwXParagraphEnumerationImpl::hasMoreElements() throw (uno::RuntimeException, std::exception) +SwXParagraphEnumerationImpl::hasMoreElements() { SolarMutexGuard aGuard; return m_bFirstParagraph || m_xNextPara.is(); @@ -567,7 +566,7 @@ lcl_CursorIsInSection( } uno::Reference< text::XTextContent > -SwXParagraphEnumerationImpl::NextElement_Impl() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) +SwXParagraphEnumerationImpl::NextElement_Impl() { SwUnoCursor& rUnoCursor = GetCursor(); @@ -660,7 +659,7 @@ SwXParagraphEnumerationImpl::NextElement_Impl() throw (container::NoSuchElementE return xRef; } -uno::Any SAL_CALL SwXParagraphEnumerationImpl::nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwXParagraphEnumerationImpl::nextElement() { SolarMutexGuard aGuard; if (m_bFirstParagraph) @@ -803,7 +802,6 @@ void SwXTextRange::SetPositions(const SwPaM& rPam) void SwXTextRange::DeleteAndInsert( const OUString& rText, const bool bForceExpandHints) -throw (uno::RuntimeException) { if (RANGE_IS_TABLE == m_pImpl->m_eRangePosition) { @@ -848,13 +846,12 @@ const uno::Sequence< sal_Int8 > & SwXTextRange::getUnoTunnelId() // XUnoTunnel sal_Int64 SAL_CALL SwXTextRange::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXTextRange>(rId, this); } OUString SAL_CALL -SwXTextRange::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXTextRange::getImplementationName() { return OUString("SwXTextRange"); } @@ -873,20 +870,19 @@ static char const*const g_ServicesTextRange[] = static const size_t g_nServicesTextRange(SAL_N_ELEMENTS(g_ServicesTextRange)); sal_Bool SAL_CALL SwXTextRange::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXTextRange::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXTextRange::getSupportedServiceNames() { return ::sw::GetSupportedServiceNamesImpl( g_nServicesTextRange, g_ServicesTextRange); } uno::Reference< text::XText > SAL_CALL -SwXTextRange::getText() throw (uno::RuntimeException, std::exception) +SwXTextRange::getText() { SolarMutexGuard aGuard; @@ -909,7 +905,7 @@ SwXTextRange::getText() throw (uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXTextRange::getStart() throw (uno::RuntimeException, std::exception) +SwXTextRange::getStart() { SolarMutexGuard aGuard; @@ -937,7 +933,7 @@ SwXTextRange::getStart() throw (uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXTextRange::getEnd() throw (uno::RuntimeException, std::exception) +SwXTextRange::getEnd() { SolarMutexGuard aGuard; @@ -964,7 +960,7 @@ SwXTextRange::getEnd() throw (uno::RuntimeException, std::exception) return xRet; } -OUString SAL_CALL SwXTextRange::getString() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwXTextRange::getString() { SolarMutexGuard aGuard; @@ -980,7 +976,6 @@ OUString SAL_CALL SwXTextRange::getString() throw (uno::RuntimeException, std::e } void SAL_CALL SwXTextRange::setString(const OUString& rString) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1238,7 +1233,6 @@ CreateParentXText(SwDoc & rDoc, const SwPosition& rPos) uno::Reference< container::XEnumeration > SAL_CALL SwXTextRange::createContentEnumeration(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1262,7 +1256,7 @@ throw (uno::RuntimeException, std::exception) } uno::Reference< container::XEnumeration > SAL_CALL -SwXTextRange::createEnumeration() throw (uno::RuntimeException, std::exception) +SwXTextRange::createEnumeration() { SolarMutexGuard g; @@ -1286,25 +1280,25 @@ SwXTextRange::createEnumeration() throw (uno::RuntimeException, std::exception) return SwXParagraphEnumeration::Create(m_pImpl->m_xParentText, pNewCursor, eSetType); } -uno::Type SAL_CALL SwXTextRange::getElementType() throw (uno::RuntimeException, std::exception) +uno::Type SAL_CALL SwXTextRange::getElementType() { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SAL_CALL SwXTextRange::hasElements() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextRange::hasElements() { return true; } uno::Sequence< OUString > SAL_CALL -SwXTextRange::getAvailableServiceNames() throw (uno::RuntimeException, std::exception) +SwXTextRange::getAvailableServiceNames() { uno::Sequence<OUString> aRet { "com.sun.star.text.TextContent" }; return aRet; } uno::Reference< beans::XPropertySetInfo > SAL_CALL -SwXTextRange::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +SwXTextRange::getPropertySetInfo() { SolarMutexGuard aGuard; @@ -1316,9 +1310,6 @@ SwXTextRange::getPropertySetInfo() throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextRange::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1334,8 +1325,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXTextRange::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1353,8 +1342,6 @@ void SAL_CALL SwXTextRange::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextRange::addPropertyChangeListener(): not implemented"); } @@ -1363,8 +1350,6 @@ void SAL_CALL SwXTextRange::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextRange::removePropertyChangeListener(): not implemented"); } @@ -1373,8 +1358,6 @@ void SAL_CALL SwXTextRange::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextRange::addVetoableChangeListener(): not implemented"); } @@ -1383,15 +1366,12 @@ void SAL_CALL SwXTextRange::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextRange::removeVetoableChangeListener(): not implemented"); } beans::PropertyState SAL_CALL SwXTextRange::getPropertyState(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1407,7 +1387,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Sequence< beans::PropertyState > SAL_CALL SwXTextRange::getPropertyStates(const uno::Sequence< OUString >& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1422,7 +1401,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) } void SAL_CALL SwXTextRange::setPropertyToDefault(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1438,8 +1416,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Any SAL_CALL SwXTextRange::getPropertyDefault(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1457,7 +1433,6 @@ void SAL_CALL SwXTextRange::makeRedline( const OUString& rRedlineType, const uno::Sequence< beans::PropertyValue >& rRedlineProperties ) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1474,24 +1449,24 @@ struct SwXTextRangesImpl final : public SwXTextRanges { // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("SwXTextRanges"); }; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) override { return cppu::supportsService(this, rServiceName); }; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return { "com.sun.star.text.TextRanges" }; }; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType() override { return cppu::UnoType<text::XTextRange>::get(); }; - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() override { return getCount() > 0; }; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; explicit SwXTextRangesImpl(SwPaM *const pPaM) { @@ -1545,7 +1520,6 @@ const uno::Sequence< sal_Int8 > & SwXTextRanges::getUnoTunnelId() sal_Int64 SAL_CALL SwXTextRangesImpl::getSomething(const uno::Sequence< sal_Int8 >& rId) - throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXTextRanges>(rId, this); } @@ -1557,13 +1531,12 @@ SwXTextRangesImpl::getSomething(const uno::Sequence< sal_Int8 >& rId) */ sal_Int32 SAL_CALL SwXTextRangesImpl::getCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return static_cast<sal_Int32>(m_Ranges.size()); } -uno::Any SAL_CALL SwXTextRangesImpl::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwXTextRangesImpl::getByIndex(sal_Int32 nIndex) { SolarMutexGuard aGuard; if ((nIndex < 0) || (static_cast<size_t>(nIndex) >= m_Ranges.size())) @@ -1598,16 +1571,16 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString) struct SwXParaFrameEnumerationImpl final : public SwXParaFrameEnumeration { // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("SwXParaFrameEnumeration"); }; - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override { return cppu::supportsService(this, rServiceName); }; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return {"com.sun.star.util.ContentEnumeration"}; }; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual css::uno::Any SAL_CALL nextElement() override; SwXParaFrameEnumerationImpl(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat); virtual void SAL_CALL release() throw () override @@ -1743,7 +1716,7 @@ bool SwXParaFrameEnumerationImpl::CreateNextObject() } sal_Bool SAL_CALL -SwXParaFrameEnumerationImpl::hasMoreElements() throw (uno::RuntimeException, std::exception) +SwXParaFrameEnumerationImpl::hasMoreElements() { SolarMutexGuard aGuard; PurgeFrameClients(); @@ -1751,8 +1724,6 @@ SwXParaFrameEnumerationImpl::hasMoreElements() throw (uno::RuntimeException, std } uno::Any SAL_CALL SwXParaFrameEnumerationImpl::nextElement() -throw (container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; PurgeFrameClients(); diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 1dc1a8fa84a5..c0dc4ae01677 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -100,8 +100,7 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState( const SwTextNode& rTextNode, const SwAttrSet** ppSet, const SfxItemPropertySimpleEntry& rEntry, - bool &rAttrSetFetched ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception); + bool &rAttrSetFetched ); class SwXParagraph::Impl : public SwClient @@ -156,34 +155,27 @@ public: /// @throws uno::RuntimeException void SetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames, - const uno::Sequence< uno::Any >& rValues) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException); + const uno::Sequence< uno::Any >& rValues); /// @throws beans::UnknownPropertyException /// @throws lang::WrappedTargetException /// @throws uno::RuntimeException uno::Sequence< uno::Any > GetPropertyValues_Impl( - const uno::Sequence< OUString >& rPropertyNames) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception); + const uno::Sequence< OUString >& rPropertyNames); //UUUU /// @throws uno::RuntimeException void GetSinglePropertyValue_Impl( const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet, - uno::Any& rAny ) const - throw(uno::RuntimeException); + uno::Any& rAny ) const; /// @throws uno::RuntimeException uno::Sequence< beans::GetDirectPropertyTolerantResult > GetPropertyValuesTolerant_Impl( const uno::Sequence< OUString >& rPropertyNames, - bool bDirectValuesOnly) - throw (uno::RuntimeException, std::exception); + bool bDirectValuesOnly); protected: // SwClient virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; @@ -302,13 +294,12 @@ const uno::Sequence< sal_Int8 > & SwXParagraph::getUnoTunnelId() sal_Int64 SAL_CALL SwXParagraph::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXParagraph>(rId, this); } OUString SAL_CALL -SwXParagraph::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXParagraph::getImplementationName() { return OUString("SwXParagraph"); } @@ -329,13 +320,12 @@ static const size_t g_nServicesParagraph(SAL_N_ELEMENTS(g_ServicesParagraph)); sal_Bool SAL_CALL SwXParagraph::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXParagraph::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXParagraph::getSupportedServiceNames() { return ::sw::GetSupportedServiceNamesImpl( g_nServicesParagraph, g_ServicesParagraph); @@ -362,7 +352,6 @@ SwXParagraph::attachToText(SwXText & rParent, SwTextNode & rTextNode) uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXParagraph::getPropertySetInfo() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -374,9 +363,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXParagraph::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Sequence<OUString> aPropertyNames { rPropertyName }; @@ -387,8 +373,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SwXParagraph::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Sequence<OUString> aPropertyNames { rPropertyName }; @@ -400,9 +384,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SwXParagraph::Impl::SetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) { SwTextNode & rTextNode(GetTextNodeOrThrow()); @@ -439,8 +420,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, void SAL_CALL SwXParagraph::setPropertyValues( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) -throw (beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -464,7 +443,6 @@ void SwXParagraph::Impl::GetSinglePropertyValue_Impl( const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet, uno::Any& rAny ) const -throw(uno::RuntimeException) { bool bDone(false); @@ -553,8 +531,6 @@ throw(uno::RuntimeException) uno::Sequence< uno::Any > SwXParagraph::Impl::GetPropertyValues_Impl( const uno::Sequence< OUString > & rPropertyNames ) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SwTextNode & rTextNode(GetTextNodeOrThrow()); @@ -593,7 +569,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::Sequence< uno::Any > SAL_CALL SwXParagraph::getPropertyValues(const uno::Sequence< OUString >& rPropertyNames) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence< uno::Any > aValues; @@ -620,14 +595,12 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXParagraph::addPropertiesChangeListener( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) -throw (uno::RuntimeException, std::exception) { OSL_FAIL("SwXParagraph::addPropertiesChangeListener(): not implemented"); } void SAL_CALL SwXParagraph::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) -throw (uno::RuntimeException, std::exception) { OSL_FAIL("SwXParagraph::removePropertiesChangeListener(): not implemented"); } @@ -635,7 +608,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXParagraph::firePropertiesChangeEvent( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("SwXParagraph::firePropertiesChangeEvent(): not implemented"); } @@ -646,7 +618,6 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXParagraph::setPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -738,7 +709,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SwXParagraph::getPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames ) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -761,7 +731,6 @@ throw (uno::RuntimeException, std::exception) uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXParagraph::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames ) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -772,7 +741,6 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SwXParagraph::Impl::GetPropertyValuesTolerant_Impl( const uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly ) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -919,8 +887,6 @@ void SAL_CALL SwXParagraph::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXParagraph::addPropertyChangeListener(): not implemented"); } @@ -929,8 +895,6 @@ void SAL_CALL SwXParagraph::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXParagraph::removePropertyChangeListener(): not implemented"); } @@ -939,8 +903,6 @@ void SAL_CALL SwXParagraph::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXParagraph::addVetoableChangeListener(): not implemented"); } @@ -949,8 +911,6 @@ void SAL_CALL SwXParagraph::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXParagraph::removeVetoableChangeListener(): not implemented"); } @@ -960,7 +920,6 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState( const SwAttrSet** ppSet, const SfxItemPropertySimpleEntry& rEntry, bool &rAttrSetFetched) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState eRet(beans::PropertyState_DEFAULT_VALUE); @@ -1063,7 +1022,6 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState( beans::PropertyState SAL_CALL SwXParagraph::getPropertyState(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1087,7 +1045,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Sequence< beans::PropertyState > SAL_CALL SwXParagraph::getPropertyStates( const uno::Sequence< OUString >& PropertyNames) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1128,7 +1085,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) void SAL_CALL SwXParagraph::setPropertyToDefault(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1217,8 +1173,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Any SAL_CALL SwXParagraph::getPropertyDefault(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1254,7 +1208,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXParagraph::attach(const uno::Reference< text::XTextRange > & /*xTextRange*/) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // SwXParagraph will only created in order to be inserted by @@ -1264,7 +1217,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXParagraph::getAnchor() throw (uno::RuntimeException, std::exception) +SwXParagraph::getAnchor() { SolarMutexGuard aGuard; @@ -1279,7 +1232,7 @@ SwXParagraph::getAnchor() throw (uno::RuntimeException, std::exception) return xRet; } -void SAL_CALL SwXParagraph::dispose() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXParagraph::dispose() { SolarMutexGuard aGuard; @@ -1295,7 +1248,6 @@ void SAL_CALL SwXParagraph::dispose() throw (uno::RuntimeException, std::excepti void SAL_CALL SwXParagraph::addEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -1303,14 +1255,13 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXParagraph::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); } uno::Reference< container::XEnumeration > SAL_CALL -SwXParagraph::createEnumeration() throw (uno::RuntimeException, std::exception) +SwXParagraph::createEnumeration() { SolarMutexGuard aGuard; @@ -1324,19 +1275,19 @@ SwXParagraph::createEnumeration() throw (uno::RuntimeException, std::exception) return xRef; } -uno::Type SAL_CALL SwXParagraph::getElementType() throw (uno::RuntimeException, std::exception) +uno::Type SAL_CALL SwXParagraph::getElementType() { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SAL_CALL SwXParagraph::hasElements() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXParagraph::hasElements() { SolarMutexGuard aGuard; return GetTextNode() != nullptr; } uno::Reference< text::XText > SAL_CALL -SwXParagraph::getText() throw (uno::RuntimeException, std::exception) +SwXParagraph::getText() { SolarMutexGuard g; @@ -1344,7 +1295,7 @@ SwXParagraph::getText() throw (uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXParagraph::getStart() throw (uno::RuntimeException, std::exception) +SwXParagraph::getStart() { SolarMutexGuard aGuard; @@ -1361,7 +1312,7 @@ SwXParagraph::getStart() throw (uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXParagraph::getEnd() throw (uno::RuntimeException, std::exception) +SwXParagraph::getEnd() { SolarMutexGuard aGuard; @@ -1377,7 +1328,7 @@ SwXParagraph::getEnd() throw (uno::RuntimeException, std::exception) return xRet; } -OUString SAL_CALL SwXParagraph::getString() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwXParagraph::getString() { SolarMutexGuard aGuard; OUString aRet; @@ -1401,7 +1352,6 @@ OUString SAL_CALL SwXParagraph::getString() throw (uno::RuntimeException, std::e } void SAL_CALL SwXParagraph::setString(const OUString& aString) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1432,7 +1382,6 @@ throw (uno::RuntimeException, std::exception) uno::Reference< container::XEnumeration > SAL_CALL SwXParagraph::createContentEnumeration(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1451,7 +1400,7 @@ throw (uno::RuntimeException, std::exception) } uno::Sequence< OUString > SAL_CALL -SwXParagraph::getAvailableServiceNames() throw (uno::RuntimeException, std::exception) +SwXParagraph::getAvailableServiceNames() { uno::Sequence<OUString> aRet { "com.sun.star.text.TextContent" }; return aRet; diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 5823d6e8a945..98ed94f2d72d 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -135,13 +135,11 @@ SwXTextPortion::~SwXTextPortion() } uno::Reference< text::XText > SwXTextPortion::getText() -throw( uno::RuntimeException, std::exception ) { return m_xParentText; } uno::Reference< text::XTextRange > SwXTextPortion::getStart() -throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; @@ -154,7 +152,6 @@ throw( uno::RuntimeException, std::exception ) } uno::Reference< text::XTextRange > SwXTextPortion::getEnd() -throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; @@ -167,7 +164,6 @@ throw( uno::RuntimeException, std::exception ) } OUString SwXTextPortion::getString() -throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; OUString aText; @@ -184,7 +180,7 @@ throw( uno::RuntimeException, std::exception ) return aText; } -void SwXTextPortion::setString(const OUString& aString) throw( uno::RuntimeException, std::exception ) +void SwXTextPortion::setString(const OUString& aString) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -193,7 +189,6 @@ void SwXTextPortion::setString(const OUString& aString) throw( uno::RuntimeExcep } uno::Reference< beans::XPropertySetInfo > SwXTextPortion::getPropertySetInfo() -throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; //! PropertySetInfo for text portion extensions @@ -211,8 +206,6 @@ throw( uno::RuntimeException, std::exception ) void SwXTextPortion::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -382,7 +375,6 @@ void SwXTextPortion::GetPropertyValue( uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { sal_Int32 nLength = rPropertyNames.getLength(); const OUString *pPropertyNames = rPropertyNames.getConstArray(); @@ -412,7 +404,6 @@ uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl( uno::Any SwXTextPortion::getPropertyValue( const OUString& rPropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Sequence< OUString > aPropertyNames { rPropertyName }; @@ -422,8 +413,6 @@ uno::Any SwXTextPortion::getPropertyValue( void SAL_CALL SwXTextPortion::SetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException) { SwUnoCursor& rUnoCursor = GetCursor(); @@ -450,8 +439,6 @@ void SAL_CALL SwXTextPortion::SetPropertyValues_Impl( void SwXTextPortion::setPropertyValues( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) - throw(beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -472,7 +459,6 @@ void SwXTextPortion::setPropertyValues( uno::Sequence< uno::Any > SwXTextPortion::getPropertyValues( const uno::Sequence< OUString >& rPropertyNames ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence< uno::Any > aValues; @@ -498,7 +484,6 @@ uno::Sequence< uno::Any > SwXTextPortion::getPropertyValues( uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -566,7 +551,6 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SwXTextPortion::getPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -585,7 +569,6 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SwXTextPortion::getPr uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return GetPropertyValuesTolerant_Impl( rPropertyNames, true ); @@ -594,7 +577,6 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion: uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion::GetPropertyValuesTolerant_Impl( const uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -695,45 +677,40 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion: void SwXTextPortion::addPropertiesChangeListener( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) - throw(uno::RuntimeException, std::exception) {} void SwXTextPortion::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) - throw(uno::RuntimeException, std::exception) {} void SwXTextPortion::firePropertiesChangeEvent( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) - throw(uno::RuntimeException, std::exception) {} void SwXTextPortion::addPropertyChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } -void SwXTextPortion::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextPortion::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } -void SwXTextPortion::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextPortion::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } -void SwXTextPortion::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextPortion::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) { OSL_FAIL("not implemented"); } beans::PropertyState SwXTextPortion::getPropertyState(const OUString& rPropertyName) - throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; beans::PropertyState eRet = beans::PropertyState_DEFAULT_VALUE; @@ -754,7 +731,6 @@ beans::PropertyState SwXTextPortion::getPropertyState(const OUString& rPropertyN uno::Sequence< beans::PropertyState > SwXTextPortion::getPropertyStates( const uno::Sequence< OUString >& rPropertyNames) - throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -777,7 +753,6 @@ uno::Sequence< beans::PropertyState > SwXTextPortion::getPropertyStates( } void SwXTextPortion::setPropertyToDefault(const OUString& rPropertyName) - throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -787,7 +762,6 @@ void SwXTextPortion::setPropertyToDefault(const OUString& rPropertyName) } uno::Any SwXTextPortion::getPropertyDefault(const OUString& rPropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -799,7 +773,6 @@ uno::Any SwXTextPortion::getPropertyDefault(const OUString& rPropertyName) } uno::Reference< container::XEnumeration > SwXTextPortion::createContentEnumeration(const OUString& /*aServiceName*/) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -818,7 +791,6 @@ const uno::Sequence< sal_Int8 > & SwXTextPortion::getUnoTunnelId() } sal_Int64 SwXTextPortion::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -830,7 +802,6 @@ sal_Int64 SwXTextPortion::getSomething( const uno::Sequence< sal_Int8 >& rId ) } uno::Sequence< OUString > SwXTextPortion::getAvailableServiceNames() -throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Sequence<OUString> aRet { "com.sun.star.text.TextContent" }; @@ -838,18 +809,16 @@ throw( uno::RuntimeException, std::exception ) } OUString SwXTextPortion::getImplementationName() -throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextPortion"); } -sal_Bool SwXTextPortion::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextPortion::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SwXTextPortion::getSupportedServiceNames() -throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(7); OUString* pArray = aRet.getArray(); diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index dad7aae424dc..c86f98263060 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -321,7 +321,6 @@ const uno::Sequence< sal_Int8 > & SwXTextPortionEnumeration::getUnoTunnelId() sal_Int64 SAL_CALL SwXTextPortionEnumeration::getSomething( const uno::Sequence< sal_Int8 >& rId ) -throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -333,20 +332,17 @@ throw(uno::RuntimeException, std::exception) } OUString SwXTextPortionEnumeration::getImplementationName() -throw( RuntimeException, std::exception ) { return OUString("SwXTextPortionEnumeration"); } sal_Bool SwXTextPortionEnumeration::supportsService(const OUString& rServiceName) -throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SwXTextPortionEnumeration::getSupportedServiceNames() -throw( RuntimeException, std::exception ) { Sequence<OUString> aRet { "com.sun.star.text.TextPortionEnumeration" }; return aRet; @@ -386,7 +382,6 @@ SwXTextPortionEnumeration::~SwXTextPortionEnumeration() } sal_Bool SwXTextPortionEnumeration::hasMoreElements() -throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -394,8 +389,6 @@ throw( uno::RuntimeException, std::exception ) } uno::Any SwXTextPortionEnumeration::nextElement() -throw( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index b64a315b0685..3c688fdc64b7 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -60,7 +60,6 @@ const SwStartNode* SwXRedlineText::GetStartNode() const } uno::Any SwXRedlineText::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { uno::Any aRet; @@ -83,7 +82,6 @@ uno::Any SwXRedlineText::queryInterface( const uno::Type& rType ) } uno::Sequence<uno::Type> SwXRedlineText::getTypes() - throw(uno::RuntimeException, std::exception) { // SwXText::getTypes() uno::Sequence<uno::Type> aTypes = SwXText::getTypes(); @@ -97,13 +95,11 @@ uno::Sequence<uno::Type> SwXRedlineText::getTypes() } uno::Sequence<sal_Int8> SwXRedlineText::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -147,7 +143,6 @@ uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor() uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursorByRange( const uno::Reference<text::XTextRange> & aTextRange) - throw( uno::RuntimeException, std::exception ) { uno::Reference<text::XTextCursor> xCursor = createTextCursor(); xCursor->gotoRange(aTextRange->getStart(), false); @@ -156,7 +151,6 @@ uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursorByRange( } uno::Reference<container::XEnumeration> SwXRedlineText::createEnumeration() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwPaM aPam(aNodeIndex); @@ -165,12 +159,12 @@ uno::Reference<container::XEnumeration> SwXRedlineText::createEnumeration() return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_REDLINE); } -uno::Type SwXRedlineText::getElementType( ) throw(uno::RuntimeException, std::exception) +uno::Type SwXRedlineText::getElementType( ) { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SwXRedlineText::hasElements( ) throw(uno::RuntimeException, std::exception) +sal_Bool SwXRedlineText::hasElements( ) { return true; // we always have a content index } @@ -227,7 +221,6 @@ static uno::Sequence<beans::PropertyValue> lcl_GetSuccessorProperties(const SwRa } uno::Any SwXRedlinePortion::getPropertyValue( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Validate(); @@ -258,7 +251,7 @@ uno::Any SwXRedlinePortion::getPropertyValue( const OUString& rPropertyName ) return aRet; } -void SwXRedlinePortion::Validate() throw( uno::RuntimeException ) +void SwXRedlinePortion::Validate() { SwUnoCursor& rUnoCursor = GetCursor(); //search for the redline @@ -271,12 +264,12 @@ void SwXRedlinePortion::Validate() throw( uno::RuntimeException ) throw uno::RuntimeException(); } -uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } -uno::Any SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, const SwRangeRedline& rRedline ) throw(std::exception) +uno::Any SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, const SwRangeRedline& rRedline ) { uno::Any aRet; if(rPropertyName == UNO_NAME_REDLINE_AUTHOR) @@ -315,7 +308,7 @@ uno::Any SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, co } uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties( - const SwRangeRedline& rRedline, bool bIsStart ) throw (std::exception) + const SwRangeRedline& rRedline, bool bIsStart ) { uno::Sequence< beans::PropertyValue > aRet(12); const SwRedlineData* pNext = rRedline.GetRedlineData().Next(); @@ -378,7 +371,7 @@ SwXRedline::~SwXRedline() { } -uno::Reference< beans::XPropertySetInfo > SwXRedline::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > SwXRedline::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xRef = aSwMapProvider.GetPropertySet(PROPERTY_MAP_REDLINE)->getPropertySetInfo(); @@ -386,8 +379,6 @@ uno::Reference< beans::XPropertySetInfo > SwXRedline::getPropertySetInfo( ) thr } void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!pDoc) @@ -427,7 +418,6 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any } uno::Any SwXRedline::getPropertyValue( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!pDoc) @@ -499,25 +489,21 @@ uno::Any SwXRedline::getPropertyValue( const OUString& rPropertyName ) void SwXRedline::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SwXRedline::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SwXRedline::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SwXRedline::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } @@ -531,7 +517,7 @@ void SwXRedline::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) } } -uno::Reference< container::XEnumeration > SwXRedline::createEnumeration() throw( uno::RuntimeException, std::exception ) +uno::Reference< container::XEnumeration > SwXRedline::createEnumeration() { SolarMutexGuard aGuard; uno::Reference< container::XEnumeration > xRet; @@ -547,19 +533,19 @@ uno::Reference< container::XEnumeration > SwXRedline::createEnumeration() throw return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_REDLINE); } -uno::Type SwXRedline::getElementType( ) throw(uno::RuntimeException, std::exception) +uno::Type SwXRedline::getElementType( ) { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SwXRedline::hasElements( ) throw(uno::RuntimeException, std::exception) +sal_Bool SwXRedline::hasElements( ) { if(!pDoc) throw uno::RuntimeException(); return nullptr != pRedline->GetContentIdx(); } -uno::Reference< text::XTextCursor > SwXRedline::createTextCursor() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextCursor > SwXRedline::createTextCursor() { SolarMutexGuard aGuard; if(!pDoc) @@ -597,13 +583,11 @@ uno::Reference< text::XTextCursor > SwXRedline::createTextCursor() throw( uno:: uno::Reference< text::XTextCursor > SwXRedline::createTextCursorByRange( const uno::Reference< text::XTextRange > & /*aTextPosition*/) - throw( uno::RuntimeException, std::exception ) { throw uno::RuntimeException(); } uno::Any SwXRedline::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { uno::Any aRet = SwXText::queryInterface(rType); if(!aRet.hasValue()) @@ -614,7 +598,6 @@ uno::Any SwXRedline::queryInterface( const uno::Type& rType ) } uno::Sequence<uno::Type> SwXRedline::getTypes() - throw(uno::RuntimeException, std::exception) { uno::Sequence<uno::Type> aTypes = SwXText::getTypes(); uno::Sequence<uno::Type> aBaseTypes = SwXRedlineBaseClass::getTypes(); @@ -628,7 +611,6 @@ uno::Sequence<uno::Type> SwXRedline::getTypes() } uno::Sequence<sal_Int8> SwXRedline::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 452386f2a209..9c49a5bc73e4 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -45,7 +45,7 @@ SwXRedlines::~SwXRedlines() { } -sal_Int32 SwXRedlines::getCount( ) throw(uno::RuntimeException, std::exception) +sal_Int32 SwXRedlines::getCount( ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -55,7 +55,6 @@ sal_Int32 SwXRedlines::getCount( ) throw(uno::RuntimeException, std::exception) } uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -73,7 +72,6 @@ uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex) } uno::Reference< container::XEnumeration > SwXRedlines::createEnumeration() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -81,12 +79,12 @@ uno::Reference< container::XEnumeration > SwXRedlines::createEnumeration() return uno::Reference< container::XEnumeration >(new SwXRedlineEnumeration(*GetDoc())); } -uno::Type SwXRedlines::getElementType( ) throw(uno::RuntimeException, std::exception) +uno::Type SwXRedlines::getElementType( ) { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SwXRedlines::hasElements( ) throw(uno::RuntimeException, std::exception) +sal_Bool SwXRedlines::hasElements( ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -95,19 +93,17 @@ sal_Bool SwXRedlines::hasElements( ) throw(uno::RuntimeException, std::exceptio return rRedTable.size() > 0; } -OUString SwXRedlines::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXRedlines::getImplementationName() { return OUString("SwXRedlines"); } sal_Bool SwXRedlines::supportsService(const OUString& ServiceName) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SwXRedlines::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); return uno::Sequence< OUString >(); @@ -140,7 +136,7 @@ SwXRedlineEnumeration::~SwXRedlineEnumeration() { } -sal_Bool SwXRedlineEnumeration::hasMoreElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXRedlineEnumeration::hasMoreElements() { if(!pDoc) throw uno::RuntimeException(); @@ -148,7 +144,6 @@ sal_Bool SwXRedlineEnumeration::hasMoreElements() throw( uno::RuntimeException, } uno::Any SwXRedlineEnumeration::nextElement() - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if(!pDoc) throw uno::RuntimeException(); @@ -161,17 +156,17 @@ uno::Any SwXRedlineEnumeration::nextElement() return aRet; } -OUString SwXRedlineEnumeration::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXRedlineEnumeration::getImplementationName() { return OUString("SwXRedlineEnumeration"); } -sal_Bool SwXRedlineEnumeration::supportsService(const OUString& ServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXRedlineEnumeration::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SwXRedlineEnumeration::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXRedlineEnumeration::getSupportedServiceNames() { return uno::Sequence< OUString >(); } diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index d6d65727a625..8e86f09fcb01 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -167,13 +167,11 @@ const uno::Sequence< sal_Int8 > & SwXReferenceMark::getUnoTunnelId() sal_Int64 SAL_CALL SwXReferenceMark::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXReferenceMark>(rId, this); } OUString SAL_CALL SwXReferenceMark::getImplementationName() -throw (uno::RuntimeException, std::exception) { return OUString("SwXReferenceMark"); } @@ -188,14 +186,12 @@ static const size_t g_nServicesReferenceMark(SAL_N_ELEMENTS(g_ServicesReferenceM sal_Bool SAL_CALL SwXReferenceMark::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SwXReferenceMark::getSupportedServiceNames() -throw (uno::RuntimeException, std::exception) { return ::sw::GetSupportedServiceNamesImpl( g_nServicesReferenceMark, g_ServicesReferenceMark); @@ -283,7 +279,6 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam, void SAL_CALL SwXReferenceMark::attach(const uno::Reference< text::XTextRange > & xTextRange) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -316,7 +311,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXReferenceMark::getAnchor() throw (uno::RuntimeException, std::exception) +SwXReferenceMark::getAnchor() { SolarMutexGuard aGuard; @@ -346,7 +341,7 @@ SwXReferenceMark::getAnchor() throw (uno::RuntimeException, std::exception) return nullptr; } -void SAL_CALL SwXReferenceMark::dispose() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXReferenceMark::dispose() { SolarMutexGuard aGuard; if (m_pImpl->IsValid()) @@ -380,7 +375,6 @@ void SAL_CALL SwXReferenceMark::dispose() throw (uno::RuntimeException, std::exc void SAL_CALL SwXReferenceMark::addEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -388,14 +382,12 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXReferenceMark::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); } OUString SAL_CALL SwXReferenceMark::getName() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!m_pImpl->IsValid() || @@ -407,7 +399,6 @@ throw (uno::RuntimeException, std::exception) } void SAL_CALL SwXReferenceMark::setName(const OUString& rName) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (m_pImpl->m_bIsDescriptor) @@ -455,7 +446,7 @@ throw (uno::RuntimeException, std::exception) } uno::Reference< beans::XPropertySetInfo > SAL_CALL -SwXReferenceMark::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +SwXReferenceMark::getPropertySetInfo() { SolarMutexGuard g; @@ -467,17 +458,12 @@ SwXReferenceMark::getPropertySetInfo() throw (uno::RuntimeException, std::except void SAL_CALL SwXReferenceMark::setPropertyValue( const OUString& /*rPropertyName*/, const uno::Any& /*rValue*/ ) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { throw lang::IllegalArgumentException(); } uno::Any SAL_CALL SwXReferenceMark::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { // does not seem to need SolarMutex uno::Any aRet; @@ -491,8 +477,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXReferenceMark::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXReferenceMark::addPropertyChangeListener(): not implemented"); } @@ -500,8 +484,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXReferenceMark::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXReferenceMark::removePropertyChangeListener(): not implemented"); } @@ -509,8 +491,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXReferenceMark::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXReferenceMark::addVetoableChangeListener(): not implemented"); } @@ -518,8 +498,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXReferenceMark::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXReferenceMark::removeVetoableChangeListener(): not implemented"); } @@ -532,13 +510,12 @@ private: virtual void PrepareForAttach(uno::Reference< text::XTextRange > & xRange, const SwPaM & rPam) override; - virtual bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb) - throw (lang::IllegalArgumentException, uno::RuntimeException) override; + virtual bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb) override; protected: virtual const SwStartNode *GetStartNode() const override; virtual uno::Reference< text::XTextCursor > - CreateCursor() throw (uno::RuntimeException) override; + CreateCursor() override; public: SwXMetaText(SwDoc & rDoc, SwXMeta & rMeta); @@ -552,15 +529,14 @@ public: // XTypeProvider virtual uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (uno::RuntimeException, std::exception) override; + getImplementationId() override; // XText virtual uno::Reference< text::XTextCursor > SAL_CALL - createTextCursor() throw (uno::RuntimeException, std::exception) override; + createTextCursor() override; virtual uno::Reference< text::XTextCursor > SAL_CALL createTextCursorByRange( - const uno::Reference< text::XTextRange > & xTextPosition) - throw (uno::RuntimeException, std::exception) override; + const uno::Reference< text::XTextRange > & xTextPosition) override; }; @@ -587,13 +563,11 @@ void SwXMetaText::PrepareForAttach( uno::Reference<text::XTextRange> & xRange, } bool SwXMetaText::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb) - throw (lang::IllegalArgumentException, uno::RuntimeException) { return m_rMeta.CheckForOwnMemberMeta(rPam, bAbsorb); } uno::Reference< text::XTextCursor > SwXMetaText::CreateCursor() -throw (uno::RuntimeException) { uno::Reference< text::XTextCursor > xRet; if (IsValid()) @@ -614,14 +588,14 @@ throw (uno::RuntimeException) } uno::Sequence<sal_Int8> SAL_CALL -SwXMetaText::getImplementationId() throw (uno::RuntimeException, std::exception) +SwXMetaText::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XText uno::Reference< text::XTextCursor > SAL_CALL -SwXMetaText::createTextCursor() throw (uno::RuntimeException, std::exception) +SwXMetaText::createTextCursor() { return CreateCursor(); } @@ -629,7 +603,6 @@ SwXMetaText::createTextCursor() throw (uno::RuntimeException, std::exception) uno::Reference< text::XTextCursor > SAL_CALL SwXMetaText::createTextCursorByRange( const uno::Reference<text::XTextRange> & xTextPosition) - throw (uno::RuntimeException, std::exception) { const uno::Reference<text::XTextCursor> xCursor( CreateCursor() ); xCursor->gotoRange(xTextPosition, false); @@ -820,7 +793,6 @@ bool SwXMeta::SetContentRange( } bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb) - throw (lang::IllegalArgumentException, uno::RuntimeException) { SwTextNode * pTextNode; sal_Int32 nMetaStart; @@ -894,14 +866,13 @@ const uno::Sequence< sal_Int8 > & SwXMeta::getUnoTunnelId() // XUnoTunnel sal_Int64 SAL_CALL SwXMeta::getSomething( const uno::Sequence< sal_Int8 > & i_rId ) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXMeta>(i_rId, this); } // XServiceInfo OUString SAL_CALL -SwXMeta::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXMeta::getImplementationName() { return OUString("SwXMeta"); } @@ -916,13 +887,12 @@ static const size_t g_nServicesMeta(SAL_N_ELEMENTS(g_ServicesMeta)); sal_Bool SAL_CALL SwXMeta::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXMeta::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXMeta::getSupportedServiceNames() { return ::sw::GetSupportedServiceNamesImpl(g_nServicesMeta, g_ServicesMeta); } @@ -931,7 +901,6 @@ SwXMeta::getSupportedServiceNames() throw (uno::RuntimeException, std::exception void SAL_CALL SwXMeta::addEventListener( uno::Reference< lang::XEventListener> const & xListener ) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -940,14 +909,13 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXMeta::removeEventListener( uno::Reference< lang::XEventListener> const & xListener ) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); } void SAL_CALL -SwXMeta::dispose() throw (uno::RuntimeException, std::exception) +SwXMeta::dispose() { SolarMutexGuard g; @@ -982,7 +950,6 @@ SwXMeta::dispose() throw (uno::RuntimeException, std::exception) void SAL_CALL SwXMeta::AttachImpl(const uno::Reference< text::XTextRange > & i_xTextRange, const sal_uInt16 i_nWhich) -throw (lang::IllegalArgumentException, uno::RuntimeException) { SolarMutexGuard g; @@ -1069,13 +1036,12 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) // XTextContent void SAL_CALL SwXMeta::attach(const uno::Reference< text::XTextRange > & i_xTextRange) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return SwXMeta::AttachImpl(i_xTextRange, RES_TXTATR_META); } uno::Reference< text::XTextRange > SAL_CALL -SwXMeta::getAnchor() throw (uno::RuntimeException, std::exception) +SwXMeta::getAnchor() { SolarMutexGuard g; @@ -1109,35 +1075,35 @@ SwXMeta::getAnchor() throw (uno::RuntimeException, std::exception) // XTextRange uno::Reference< text::XText > SAL_CALL -SwXMeta::getText() throw (uno::RuntimeException, std::exception) +SwXMeta::getText() { SolarMutexGuard g; return this; } uno::Reference< text::XTextRange > SAL_CALL -SwXMeta::getStart() throw (uno::RuntimeException, std::exception) +SwXMeta::getStart() { SolarMutexGuard g; return m_pImpl->m_xText->getStart(); } uno::Reference< text::XTextRange > SAL_CALL -SwXMeta::getEnd() throw (uno::RuntimeException, std::exception) +SwXMeta::getEnd() { SolarMutexGuard g; return m_pImpl->m_xText->getEnd(); } OUString SAL_CALL -SwXMeta::getString() throw (uno::RuntimeException, std::exception) +SwXMeta::getString() { SolarMutexGuard g; return m_pImpl->m_xText->getString(); } void SAL_CALL -SwXMeta::setString(const OUString& rString) throw (uno::RuntimeException, std::exception) +SwXMeta::setString(const OUString& rString) { SolarMutexGuard g; return m_pImpl->m_xText->setString(rString); @@ -1145,7 +1111,7 @@ SwXMeta::setString(const OUString& rString) throw (uno::RuntimeException, std::e // XSimpleText uno::Reference< text::XTextCursor > SAL_CALL -SwXMeta::createTextCursor() throw (uno::RuntimeException, std::exception) +SwXMeta::createTextCursor() { SolarMutexGuard g; return m_pImpl->m_xText->createTextCursor(); @@ -1154,7 +1120,6 @@ SwXMeta::createTextCursor() throw (uno::RuntimeException, std::exception) uno::Reference< text::XTextCursor > SAL_CALL SwXMeta::createTextCursorByRange( const uno::Reference<text::XTextRange> & xTextPosition) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; return m_pImpl->m_xText->createTextCursorByRange(xTextPosition); @@ -1163,7 +1128,6 @@ SwXMeta::createTextCursorByRange( void SAL_CALL SwXMeta::insertString(const uno::Reference<text::XTextRange> & xRange, const OUString& rString, sal_Bool bAbsorb) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; return m_pImpl->m_xText->insertString(xRange, rString, bAbsorb); @@ -1172,7 +1136,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXMeta::insertControlCharacter(const uno::Reference<text::XTextRange> & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard g; return m_pImpl->m_xText->insertControlCharacter(xRange, nControlCharacter, @@ -1183,7 +1146,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) void SAL_CALL SwXMeta::insertTextContent( const uno::Reference<text::XTextRange> & xRange, const uno::Reference<text::XTextContent> & xContent, sal_Bool bAbsorb) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard g; return m_pImpl->m_xText->insertTextContent(xRange, xContent, bAbsorb); @@ -1192,7 +1154,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) void SAL_CALL SwXMeta::removeTextContent( const uno::Reference< text::XTextContent > & xContent) - throw (container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard g; return m_pImpl->m_xText->removeTextContent(xContent); @@ -1200,7 +1161,7 @@ SwXMeta::removeTextContent( // XChild uno::Reference< uno::XInterface > SAL_CALL -SwXMeta::getParent() throw (uno::RuntimeException, std::exception) +SwXMeta::getParent() { SolarMutexGuard g; SwTextNode * pTextNode; @@ -1220,20 +1181,19 @@ SwXMeta::getParent() throw (uno::RuntimeException, std::exception) void SAL_CALL SwXMeta::setParent(uno::Reference< uno::XInterface > const& /*xParent*/) - throw (uno::RuntimeException, lang::NoSupportException, std::exception) { throw lang::NoSupportException("setting parent not supported", *this); } // XElementAccess uno::Type SAL_CALL -SwXMeta::getElementType() throw (uno::RuntimeException, std::exception) +SwXMeta::getElementType() { return cppu::UnoType<text::XTextRange>::get(); } sal_Bool SAL_CALL -SwXMeta::hasElements() throw (uno::RuntimeException, std::exception) +SwXMeta::hasElements() { SolarMutexGuard g; @@ -1242,7 +1202,7 @@ SwXMeta::hasElements() throw (uno::RuntimeException, std::exception) // XEnumerationAccess uno::Reference< container::XEnumeration > SAL_CALL -SwXMeta::createEnumeration() throw (uno::RuntimeException, std::exception) +SwXMeta::createEnumeration() { SolarMutexGuard g; @@ -1324,7 +1284,7 @@ SwXMetaField::~SwXMetaField() // XServiceInfo OUString SAL_CALL -SwXMetaField::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXMetaField::getImplementationName() { return OUString("SwXMetaField"); } @@ -1340,13 +1300,12 @@ static const size_t g_nServicesMetaField(SAL_N_ELEMENTS(g_ServicesMetaField)); sal_Bool SAL_CALL SwXMetaField::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXMetaField::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXMetaField::getSupportedServiceNames() { return ::sw::GetSupportedServiceNamesImpl( g_nServicesMetaField, g_ServicesMetaField); @@ -1356,7 +1315,6 @@ SwXMetaField::getSupportedServiceNames() throw (uno::RuntimeException, std::exce void SAL_CALL SwXMetaField::addEventListener( uno::Reference< lang::XEventListener> const & xListener ) -throw (uno::RuntimeException, std::exception) { return SwXMeta::addEventListener(xListener); } @@ -1364,13 +1322,12 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXMetaField::removeEventListener( uno::Reference< lang::XEventListener> const & xListener ) -throw (uno::RuntimeException, std::exception) { return SwXMeta::removeEventListener(xListener); } void SAL_CALL -SwXMetaField::dispose() throw (uno::RuntimeException, std::exception) +SwXMetaField::dispose() { return SwXMeta::dispose(); } @@ -1378,20 +1335,19 @@ SwXMetaField::dispose() throw (uno::RuntimeException, std::exception) // XTextContent void SAL_CALL SwXMetaField::attach(const uno::Reference< text::XTextRange > & i_xTextRange) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return SwXMeta::AttachImpl(i_xTextRange, RES_TXTATR_METAFIELD); } uno::Reference< text::XTextRange > SAL_CALL -SwXMetaField::getAnchor() throw (uno::RuntimeException, std::exception) +SwXMetaField::getAnchor() { return SwXMeta::getAnchor(); } // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL -SwXMetaField::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +SwXMetaField::getPropertySetInfo() { SolarMutexGuard g; @@ -1404,9 +1360,6 @@ SwXMetaField::getPropertySetInfo() throw (uno::RuntimeException, std::exception) void SAL_CALL SwXMetaField::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1439,8 +1392,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXMetaField::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1471,8 +1422,6 @@ void SAL_CALL SwXMetaField::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXMetaField::addPropertyChangeListener(): not implemented"); } @@ -1481,8 +1430,6 @@ void SAL_CALL SwXMetaField::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXMetaField::removePropertyChangeListener(): not implemented"); } @@ -1491,8 +1438,6 @@ void SAL_CALL SwXMetaField::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXMetaField::addVetoableChangeListener(): not implemented"); } @@ -1501,8 +1446,6 @@ void SAL_CALL SwXMetaField::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXMetaField::removeVetoableChangeListener(): not implemented"); } @@ -1579,7 +1522,6 @@ getPrefixAndSuffix( // XTextField OUString SAL_CALL SwXMetaField::getPresentation(sal_Bool bShowCommand) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 96c0d35530f5..2ede1776ea6d 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -147,18 +147,13 @@ public: /// @throws uno::RuntimeException void SAL_CALL SetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames, - const uno::Sequence< uno::Any >& aValues) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception); + const uno::Sequence< uno::Any >& aValues); /// @throws beans::UnknownPropertyException /// @throws lang::WrappedTargetException, /// @throws uno::RuntimeException uno::Sequence< uno::Any > SAL_CALL GetPropertyValues_Impl( - const uno::Sequence< OUString >& rPropertyNames) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception); + const uno::Sequence< OUString >& rPropertyNames); protected: // SwClient virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; @@ -234,13 +229,12 @@ const uno::Sequence< sal_Int8 > & SwXTextSection::getUnoTunnelId() sal_Int64 SAL_CALL SwXTextSection::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXTextSection>(rId, this); } uno::Reference< text::XTextSection > SAL_CALL -SwXTextSection::getParentSection() throw (uno::RuntimeException, std::exception) +SwXTextSection::getParentSection() { SolarMutexGuard aGuard; @@ -253,7 +247,7 @@ SwXTextSection::getParentSection() throw (uno::RuntimeException, std::exception) } uno::Sequence< uno::Reference< text::XTextSection > > SAL_CALL -SwXTextSection::getChildSections() throw (uno::RuntimeException, std::exception) +SwXTextSection::getChildSections() { SolarMutexGuard aGuard; @@ -273,7 +267,6 @@ SwXTextSection::getChildSections() throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextSection::attach(const uno::Reference< text::XTextRange > & xTextRange) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -440,7 +433,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXTextSection::getAnchor() throw (uno::RuntimeException, std::exception) +SwXTextSection::getAnchor() { SolarMutexGuard aGuard; @@ -466,7 +459,7 @@ SwXTextSection::getAnchor() throw (uno::RuntimeException, std::exception) return xRet; } -void SAL_CALL SwXTextSection::dispose() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXTextSection::dispose() { SolarMutexGuard aGuard; @@ -479,7 +472,6 @@ void SAL_CALL SwXTextSection::dispose() throw (uno::RuntimeException, std::excep void SAL_CALL SwXTextSection::addEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -487,14 +479,13 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextSection::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); } uno::Reference< beans::XPropertySetInfo > SAL_CALL -SwXTextSection::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +SwXTextSection::getPropertySetInfo() { SolarMutexGuard g; @@ -557,9 +548,6 @@ lcl_UpdateSection(SwSectionFormat *const pFormat, void SwXTextSection::Impl::SetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if(rPropertyNames.getLength() != rValues.getLength()) { @@ -919,8 +907,6 @@ void SAL_CALL SwXTextSection::setPropertyValues( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues) -throw (beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -941,9 +927,6 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException, void SwXTextSection::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -956,8 +939,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Sequence< uno::Any > SwXTextSection::Impl::GetPropertyValues_Impl( const uno::Sequence< OUString > & rPropertyNames ) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SwSectionFormat *const pFormat = GetSectionFormat(); if (!pFormat && !m_bIsDescriptor) @@ -1263,7 +1244,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::Sequence< uno::Any > SAL_CALL SwXTextSection::getPropertyValues( const uno::Sequence< OUString >& rPropertyNames) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence< uno::Any > aValues; @@ -1289,8 +1269,6 @@ throw (uno::RuntimeException, std::exception) uno::Any SAL_CALL SwXTextSection::getPropertyValue(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1301,14 +1279,12 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, void SAL_CALL SwXTextSection::addPropertiesChangeListener( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) -throw (uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextSection::addPropertiesChangeListener(): not implemented"); } void SAL_CALL SwXTextSection::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) -throw (uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextSection::removePropertiesChangeListener(): not implemented"); } @@ -1316,7 +1292,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextSection::firePropertiesChangeEvent( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextSection::firePropertiesChangeEvent(): not implemented"); } @@ -1325,8 +1300,6 @@ void SAL_CALL SwXTextSection::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextSection::addPropertyChangeListener(): not implemented"); } @@ -1335,8 +1308,6 @@ void SAL_CALL SwXTextSection::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextSection::removePropertyChangeListener(): not implemented"); } @@ -1345,8 +1316,6 @@ void SAL_CALL SwXTextSection::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextSection::addVetoableChangeListener(): not implemented"); } @@ -1355,15 +1324,12 @@ void SAL_CALL SwXTextSection::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXTextSection::removeVetoableChangeListener(): not implemented"); } beans::PropertyState SAL_CALL SwXTextSection::getPropertyState(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1374,7 +1340,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Sequence< beans::PropertyState > SAL_CALL SwXTextSection::getPropertyStates( const uno::Sequence< OUString >& rPropertyNames) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1456,7 +1421,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) void SAL_CALL SwXTextSection::setPropertyToDefault(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1599,8 +1563,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Any SAL_CALL SwXTextSection::getPropertyDefault(const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1653,7 +1615,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, return aRet; } -OUString SAL_CALL SwXTextSection::getName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwXTextSection::getName() { SolarMutexGuard aGuard; @@ -1675,7 +1637,6 @@ OUString SAL_CALL SwXTextSection::getName() throw (uno::RuntimeException, std::e } void SAL_CALL SwXTextSection::setName(const OUString& rName) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1723,7 +1684,7 @@ throw (uno::RuntimeException, std::exception) } OUString SAL_CALL -SwXTextSection::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXTextSection::getImplementationName() { return OUString("SwXTextSection"); } @@ -1736,13 +1697,12 @@ static char const*const g_ServicesTextSection[] = }; sal_Bool SAL_CALL SwXTextSection::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXTextSection::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXTextSection::getSupportedServiceNames() { return ::sw::GetSupportedServiceNamesImpl( SAL_N_ELEMENTS(g_ServicesTextSection), diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 716ab9da1d10..80719286fe7f 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -258,17 +258,17 @@ const unsigned short aUnoToSvxAdjust[] = USHRT_MAX }; -OUString SwXFootnoteProperties::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXFootnoteProperties::getImplementationName() { return OUString("SwXFootnoteProperties"); } -sal_Bool SwXFootnoteProperties::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXFootnoteProperties::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXFootnoteProperties::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXFootnoteProperties::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.FootnoteSettings" }; return aRet; @@ -286,14 +286,12 @@ SwXFootnoteProperties::~SwXFootnoteProperties() } uno::Reference< beans::XPropertySetInfo > SwXFootnoteProperties::getPropertySetInfo() - throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); return aRef; } void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(pDoc) @@ -415,7 +413,6 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons } uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -534,43 +531,39 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) void SwXFootnoteProperties::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXFootnoteProperties::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXFootnoteProperties::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXFootnoteProperties::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } -OUString SwXEndnoteProperties::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXEndnoteProperties::getImplementationName() { return OUString("SwXEndnoteProperties"); } -sal_Bool SwXEndnoteProperties::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXEndnoteProperties::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXEndnoteProperties::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXEndnoteProperties::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.FootnoteSettings" }; return aRet; @@ -586,15 +579,13 @@ SwXEndnoteProperties::~SwXEndnoteProperties() { } -uno::Reference< beans::XPropertySetInfo > SwXEndnoteProperties::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXEndnoteProperties::getPropertySetInfo() { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); return aRef; } void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(pDoc) @@ -671,7 +662,6 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const } uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -759,42 +749,39 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) } void SwXEndnoteProperties::addPropertyChangeListener( - const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { OSL_FAIL("not implemented"); } void SwXEndnoteProperties::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXEndnoteProperties::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXEndnoteProperties::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } -OUString SwXLineNumberingProperties::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXLineNumberingProperties::getImplementationName() { return OUString("SwXLineNumberingProperties"); } -sal_Bool SwXLineNumberingProperties::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXLineNumberingProperties::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXLineNumberingProperties::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXLineNumberingProperties::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.LineNumberingProperties" }; return aRet; @@ -810,7 +797,7 @@ SwXLineNumberingProperties::~SwXLineNumberingProperties() { } -uno::Reference< beans::XPropertySetInfo > SwXLineNumberingProperties::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXLineNumberingProperties::getPropertySetInfo() { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); return aRef; @@ -818,8 +805,6 @@ uno::Reference< beans::XPropertySetInfo > SwXLineNumberingProperties::getProper void SwXLineNumberingProperties::setPropertyValue( const OUString& rPropertyName, const Any& aValue) - throw( UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(pDoc) @@ -937,7 +922,6 @@ void SwXLineNumberingProperties::setPropertyValue( } Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; Any aRet; @@ -1028,23 +1012,22 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) return aRet; } -void SwXLineNumberingProperties::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXLineNumberingProperties::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/) { OSL_FAIL("not implemented"); } -void SwXLineNumberingProperties::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXLineNumberingProperties::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/) { OSL_FAIL("not implemented"); } -void SwXLineNumberingProperties::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXLineNumberingProperties::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/) { OSL_FAIL("not implemented"); } void SwXLineNumberingProperties::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } @@ -1078,7 +1061,7 @@ const uno::Sequence< sal_Int8 > & SwXNumberingRules::getUnoTunnelId() } // return implementation specific data -sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw(uno::RuntimeException, std::exception) +sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -1089,17 +1072,17 @@ sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId return 0; } -OUString SwXNumberingRules::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXNumberingRules::getImplementationName() { return OUString("SwXNumberingRules"); } -sal_Bool SwXNumberingRules::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXNumberingRules::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXNumberingRules::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXNumberingRules::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.NumberingRules" }; return aRet; @@ -1176,8 +1159,6 @@ SwXNumberingRules::~SwXNumberingRules() } void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElement) - throw( lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(nIndex < 0 || MAXLEVEL <= nIndex) @@ -1245,14 +1226,12 @@ void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElemen throw uno::RuntimeException(); } -sal_Int32 SwXNumberingRules::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXNumberingRules::getCount() { return MAXLEVEL; } uno::Any SwXNumberingRules::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(nIndex < 0 || MAXLEVEL <= nIndex) @@ -1281,12 +1260,11 @@ uno::Any SwXNumberingRules::getByIndex(sal_Int32 nIndex) } uno::Type SwXNumberingRules::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } -sal_Bool SwXNumberingRules::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXNumberingRules::hasElements() { return true; } @@ -1526,7 +1504,6 @@ static PropertyValue const* lcl_FindProperty( void SwXNumberingRules::SetNumberingRuleByIndex( SwNumRule& rNumRule, const uno::Sequence<beans::PropertyValue>& rProperties, sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; OSL_ENSURE( 0 <= nIndex && nIndex < MAXLEVEL, "index out of range" ); @@ -2094,15 +2071,12 @@ void SwXNumberingRules::SetPropertiesToNumFormat( } uno::Reference< XPropertySetInfo > SwXNumberingRules::getPropertySetInfo() - throw(RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); return aRef; } void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw(UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; SwNumRule* pDocRule = nullptr; @@ -2172,7 +2146,6 @@ void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const A } Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { Any aRet; const SwNumRule* pRule = pNumRule; @@ -2214,29 +2187,25 @@ Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName ) void SwXNumberingRules::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SwXNumberingRules::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SwXNumberingRules::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SwXNumberingRules::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } -OUString SwXNumberingRules::getName() throw( RuntimeException, std::exception ) +OUString SwXNumberingRules::getName() { if(pNumRule) { @@ -2255,7 +2224,7 @@ OUString SwXNumberingRules::getName() throw( RuntimeException, std::exception ) return m_sCreatedNumRuleName; } -void SwXNumberingRules::setName(const OUString& /*rName*/) throw( RuntimeException, std::exception ) +void SwXNumberingRules::setName(const OUString& /*rName*/) { RuntimeException aExcept; aExcept.Message = "readonly"; @@ -2274,17 +2243,17 @@ void SwXNumberingRules::Impl::Modify( const SfxPoolItem* pOld, const SfxPoolItem } } -OUString SwXChapterNumbering::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXChapterNumbering::getImplementationName() { return OUString("SwXChapterNumbering"); } -sal_Bool SwXChapterNumbering::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXChapterNumbering::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXChapterNumbering::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXChapterNumbering::getSupportedServiceNames() { Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -2302,17 +2271,17 @@ SwXChapterNumbering::~SwXChapterNumbering() { } -OUString SwXTextColumns::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXTextColumns::getImplementationName() { return OUString("SwXTextColumns"); } -sal_Bool SwXTextColumns::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXTextColumns::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextColumns::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextColumns::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.TextColumns" }; return aRet; @@ -2384,19 +2353,19 @@ SwXTextColumns::~SwXTextColumns() { } -sal_Int32 SwXTextColumns::getReferenceValue() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXTextColumns::getReferenceValue() { SolarMutexGuard aGuard; return nReference; } -sal_Int16 SwXTextColumns::getColumnCount() throw( uno::RuntimeException, std::exception ) +sal_Int16 SwXTextColumns::getColumnCount() { SolarMutexGuard aGuard; return static_cast< sal_Int16>( aTextColumns.getLength() ); } -void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw( uno::RuntimeException, std::exception ) +void SwXTextColumns::setColumnCount(sal_Int16 nColumns) { SolarMutexGuard aGuard; if(nColumns <= 0) @@ -2417,14 +2386,13 @@ void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw( uno::RuntimeExcep pCols[nColumns - 1].Width += nDiff; } -uno::Sequence< TextColumn > SwXTextColumns::getColumns() throw( uno::RuntimeException, std::exception ) +uno::Sequence< TextColumn > SwXTextColumns::getColumns() { SolarMutexGuard aGuard; return aTextColumns; } void SwXTextColumns::setColumns(const uno::Sequence< TextColumn >& rColumns) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; sal_Int32 nReferenceTemp = 0; @@ -2438,15 +2406,13 @@ void SwXTextColumns::setColumns(const uno::Sequence< TextColumn >& rColumns) aTextColumns = rColumns; } -uno::Reference< XPropertySetInfo > SwXTextColumns::getPropertySetInfo( ) throw(RuntimeException, std::exception) +uno::Reference< XPropertySetInfo > SwXTextColumns::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropSet->getPropertySetInfo(); return aRef; } void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any& aValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, - WrappedTargetException, RuntimeException, std::exception) { const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pEntry) @@ -2521,7 +2487,6 @@ void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any& } Any SwXTextColumns::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pEntry) @@ -2560,25 +2525,21 @@ Any SwXTextColumns::getPropertyValue( const OUString& rPropertyName ) void SwXTextColumns::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SwXTextColumns::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SwXTextColumns::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SwXTextColumns::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } @@ -2593,7 +2554,6 @@ const uno::Sequence< sal_Int8 > & SwXTextColumns::getUnoTunnelId() } sal_Int64 SAL_CALL SwXTextColumns::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index 5f5c9cc6f30c..7f94288aefa5 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -54,8 +54,7 @@ public: /// @throws beans::UnknownPropertyException /// @throws lang::IllegalArgumentException /// @throws uno::RuntimeException - void SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs) - throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException ); + void SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs); const uno::Sequence< beans::PropertyValue > GetProperties() const; void FillItemSet(SfxItemSet& rSet, bool bIsValueSearch) const; @@ -80,7 +79,6 @@ SwSearchProperties_Impl::~SwSearchProperties_Impl() } void SwSearchProperties_Impl::SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs) - throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException ) { const beans::PropertyValue* pProps = aSearchAttribs.getConstArray(); @@ -518,7 +516,6 @@ const uno::Sequence< sal_Int8 > & SwXTextSearch::getUnoTunnelId() } sal_Int64 SAL_CALL SwXTextSearch::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -529,40 +526,37 @@ sal_Int64 SAL_CALL SwXTextSearch::getSomething( const uno::Sequence< sal_Int8 >& return 0; } -OUString SwXTextSearch::getSearchString() throw( uno::RuntimeException, std::exception ) +OUString SwXTextSearch::getSearchString() { SolarMutexGuard aGuard; return m_sSearchText; } void SwXTextSearch::setSearchString(const OUString& rString) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_sSearchText = rString; } -OUString SwXTextSearch::getReplaceString() throw( uno::RuntimeException, std::exception ) +OUString SwXTextSearch::getReplaceString() { SolarMutexGuard aGuard; return m_sReplaceText; } -void SwXTextSearch::setReplaceString(const OUString& rReplaceString) throw( uno::RuntimeException, std::exception ) +void SwXTextSearch::setReplaceString(const OUString& rReplaceString) { SolarMutexGuard aGuard; m_sReplaceText = rReplaceString; } -uno::Reference< beans::XPropertySetInfo > SwXTextSearch::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXTextSearch::getPropertySetInfo() { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropSet->getPropertySetInfo(); return aRef; } void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); @@ -593,7 +587,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); } -uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) { SolarMutexGuard aGuard; uno::Any aRet; @@ -630,57 +624,54 @@ SET_UINT16: return aRet; } -void SwXTextSearch::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextSearch::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { OSL_FAIL("not implemented"); } -void SwXTextSearch::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException, std::exception ) +void SwXTextSearch::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { OSL_FAIL("not implemented"); } -void SwXTextSearch::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException, std::exception ) +void SwXTextSearch::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) { OSL_FAIL("not implemented"); } -void SwXTextSearch::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException, std::exception ) +void SwXTextSearch::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) { OSL_FAIL("not implemented"); } -sal_Bool SwXTextSearch::getValueSearch() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextSearch::getValueSearch() { SolarMutexGuard aGuard; return m_bIsValueSearch; } -void SwXTextSearch::setValueSearch(sal_Bool ValueSearch_) throw( uno::RuntimeException, std::exception ) +void SwXTextSearch::setValueSearch(sal_Bool ValueSearch_) { SolarMutexGuard aGuard; m_bIsValueSearch = ValueSearch_; } -uno::Sequence< beans::PropertyValue > SwXTextSearch::getSearchAttributes() throw( uno::RuntimeException, std::exception ) +uno::Sequence< beans::PropertyValue > SwXTextSearch::getSearchAttributes() { return m_pSearchProperties->GetProperties(); } void SwXTextSearch::setSearchAttributes(const uno::Sequence< beans::PropertyValue >& rSearchAttribs) - throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { m_pSearchProperties->SetProperties(rSearchAttribs); } uno::Sequence< beans::PropertyValue > SwXTextSearch::getReplaceAttributes() - throw( uno::RuntimeException, std::exception ) { return m_pReplaceProperties->GetProperties(); } void SwXTextSearch::setReplaceAttributes(const uno::Sequence< beans::PropertyValue >& rReplaceAttribs) - throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { m_pReplaceProperties->SetProperties(rReplaceAttribs); } @@ -705,17 +696,17 @@ bool SwXTextSearch::HasReplaceAttributes() const return m_pReplaceProperties->HasAttributes(); } -OUString SwXTextSearch::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTextSearch::getImplementationName() { return OUString("SwXTextSearch"); } -sal_Bool SwXTextSearch::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextSearch::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextSearch::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextSearch::getSupportedServiceNames() { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 9e8c758266f9..f43a03b6dfde 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -198,17 +198,17 @@ namespace sw } //XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( uno::RuntimeException, std::exception ) override + virtual sal_Int32 SAL_CALL getCount() override { SolarMutexGuard aGuard; return GetCountOrName(nullptr); }; - virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; + virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual uno::Type SAL_CALL SAL_CALL getElementType( ) throw(uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL SAL_CALL getElementType( ) override { return cppu::UnoType<style::XStyle>::get(); }; - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) override { if(!m_pBasePool) throw uno::RuntimeException(); @@ -216,28 +216,28 @@ namespace sw } //XNameAccess - virtual uno::Any SAL_CALL getByName(const OUString& Name) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw( uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( uno::RuntimeException, std::exception ) override; + virtual uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XNameContainer - virtual void SAL_CALL insertByName(const OUString& Name, const uno::Any& Element) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL replaceByName(const OUString& Name, const uno::Any& Element) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeByName(const OUString& Name) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL insertByName(const OUString& Name, const uno::Any& Element) override; + virtual void SAL_CALL replaceByName(const OUString& Name, const uno::Any& Element) override; + virtual void SAL_CALL removeByName(const OUString& Name) override; //XPropertySet - virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override { return {}; }; - virtual void SAL_CALL setPropertyValue( const OUString&, const uno::Any&) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual void SAL_CALL setPropertyValue( const OUString&, const uno::Any&) override { SAL_WARN("sw.uno", "###unexpected!"); }; - virtual uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) override { SAL_WARN("sw.uno", "###unexpected!"); }; - virtual void SAL_CALL removePropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) override { SAL_WARN("sw.uno", "###unexpected!"); }; - virtual void SAL_CALL addVetoableChangeListener(const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual void SAL_CALL addVetoableChangeListener(const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) override { SAL_WARN("sw.uno", "###unexpected!"); }; - virtual void SAL_CALL removeVetoableChangeListener(const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeVetoableChangeListener(const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) override { SAL_WARN("sw.uno", "###unexpected!"); }; //SfxListener @@ -252,11 +252,11 @@ namespace sw } //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( uno::RuntimeException, std::exception ) override + virtual OUString SAL_CALL getImplementationName() override { return {"XStyleFamily"}; }; - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override { return cppu::supportsService(this, rServiceName); }; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) override + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return { "com.sun.star.style.StyleFamily" }; } }; @@ -309,58 +309,58 @@ public: static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XNamed - virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& Name_) override; //XStyle - virtual sal_Bool SAL_CALL isUserDefined() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL isInUse() throw( css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getParentStyle() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isUserDefined() override; + virtual sal_Bool SAL_CALL isInUse() override; + virtual OUString SAL_CALL getParentStyle() override; + virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override { OSL_FAIL("not implemented"); }; - virtual void SAL_CALL removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override { OSL_FAIL("not implemented"); }; - virtual void SAL_CALL addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override { OSL_FAIL("not implemented"); }; - virtual void SAL_CALL removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override { OSL_FAIL("not implemented"); }; //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - 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 >&, const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) 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 >&, const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) override {}; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) override {}; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >&, const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >&, const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) 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 - 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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override + virtual OUString SAL_CALL getImplementationName() override { return {"SwXStyle"}; }; - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw( css::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override { return cppu::supportsService(this, rServiceName); }; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -384,7 +384,7 @@ public: /// @throws lang::IllegalArgumentException /// @throws lang::WrappedTargetException /// @throws uno::RuntimeException - void SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase) throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + void SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase); void PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rVal, SwStyleBase_Impl& rBaseImpl); }; @@ -403,9 +403,9 @@ public: virtual void SAL_CALL acquire( ) throw() override {SwXStyle::acquire();} virtual void SAL_CALL release( ) throw() override {SwXStyle::release();} - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; //ICoreStyle virtual void SetItem(enum RES_FRMATR eAtr, const SfxPoolItem& rItem) override; @@ -425,25 +425,25 @@ public: SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, const OUString& rStyleName); explicit SwXPageStyle(SwDocShell* pDocSh); - 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 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 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; }; using sw::XStyleFamily; -OUString SwXStyleFamilies::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXStyleFamilies::getImplementationName() { return {"SwXStyleFamilies"}; } -sal_Bool SwXStyleFamilies::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXStyleFamilies::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXStyleFamilies::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXStyleFamilies::getSupportedServiceNames() { return { "com.sun.star.style.StyleFamilies" }; } SwXStyleFamilies::SwXStyleFamilies(SwDocShell& rDocShell) : @@ -455,10 +455,6 @@ SwXStyleFamilies::~SwXStyleFamilies() { } uno::Any SAL_CALL SwXStyleFamilies::getByName(const OUString& Name) - throw( - container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -471,7 +467,7 @@ uno::Any SAL_CALL SwXStyleFamilies::getByName(const OUString& Name) return getByIndex(pEntry-pEntries->begin()); } -uno::Sequence< OUString > SwXStyleFamilies::getElementNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXStyleFamilies::getElementNames() { auto pEntries(lcl_GetStyleFamilyEntries()); uno::Sequence<OUString> aNames(pEntries->size()); @@ -480,7 +476,7 @@ uno::Sequence< OUString > SwXStyleFamilies::getElementNames() throw( uno::Runtim return aNames; } -sal_Bool SwXStyleFamilies::hasByName(const OUString& Name) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXStyleFamilies::hasByName(const OUString& Name) { auto pEntries(lcl_GetStyleFamilyEntries()); const auto pEntry = std::find_if(pEntries->begin(), pEntries->end(), @@ -488,13 +484,12 @@ sal_Bool SwXStyleFamilies::hasByName(const OUString& Name) throw( uno::RuntimeEx return pEntry != pEntries->end(); } -sal_Int32 SwXStyleFamilies::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXStyleFamilies::getCount() { return lcl_GetStyleFamilyEntries()->size(); } uno::Any SwXStyleFamilies::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { auto pEntries(lcl_GetStyleFamilyEntries()); SolarMutexGuard aGuard; @@ -511,18 +506,15 @@ uno::Any SwXStyleFamilies::getByIndex(sal_Int32 nIndex) } uno::Type SwXStyleFamilies::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<container::XNameContainer>::get(); } -sal_Bool SwXStyleFamilies::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXStyleFamilies::hasElements() { return true; } void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL, const uno::Sequence< beans::PropertyValue >& aOptions) - throw (io::IOException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; if(!IsValid() || rURL.isEmpty()) @@ -555,7 +547,6 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL, } uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Sequence< beans::PropertyValue > aSeq(5); @@ -824,7 +815,6 @@ static sal_uInt16 lcl_TranslateIndexRange(const sal_uInt16 nIndex) } uno::Any XStyleFamily::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(nIndex < 0) @@ -844,7 +834,6 @@ uno::Any XStyleFamily::getByIndex(sal_Int32 nIndex) } uno::Any XStyleFamily::getByName(const OUString& rName) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; OUString sStyleName; @@ -861,7 +850,7 @@ uno::Any XStyleFamily::getByName(const OUString& rName) return uno::makeAny(xStyle); } -uno::Sequence<OUString> XStyleFamily::getElementNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> XStyleFamily::getElementNames() { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -877,7 +866,7 @@ uno::Sequence<OUString> XStyleFamily::getElementNames() throw( uno::RuntimeExcep return comphelper::containerToSequence(vRet); } -sal_Bool XStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception ) +sal_Bool XStyleFamily::hasByName(const OUString& rName) { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -891,7 +880,6 @@ sal_Bool XStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeExcep void XStyleFamily::insertByName(const OUString& rName, const uno::Any& rElement) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -963,7 +951,6 @@ void XStyleFamily::insertByName(const OUString& rName, const uno::Any& rElement) } void XStyleFamily::replaceByName(const OUString& rName, const uno::Any& rElement) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -1027,7 +1014,7 @@ void XStyleFamily::replaceByName(const OUString& rName, const uno::Any& rElement } } -void XStyleFamily::removeByName(const OUString& rName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void XStyleFamily::removeByName(const OUString& rName) { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -1052,7 +1039,7 @@ void XStyleFamily::removeByName(const OUString& rName) throw( container::NoSuchE m_pBasePool->Remove(pBase); } -uno::Any SAL_CALL XStyleFamily::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL XStyleFamily::getPropertyValue( const OUString& sPropertyName ) { if(sPropertyName != "DisplayName") throw beans::UnknownPropertyException( "unknown property: " + sPropertyName, static_cast<OWeakObject *>(this) ); @@ -1183,7 +1170,6 @@ const uno::Sequence<sal_Int8>& SwXStyle::getUnoTunnelId() } sal_Int64 SAL_CALL SwXStyle::getSomething(const uno::Sequence<sal_Int8>& rId) - throw(uno::RuntimeException, std::exception) { if(rId.getLength() != 16) return 0; @@ -1195,7 +1181,7 @@ sal_Int64 SAL_CALL SwXStyle::getSomething(const uno::Sequence<sal_Int8>& rId) } -uno::Sequence< OUString > SwXStyle::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXStyle::getSupportedServiceNames() { long nCount = 1; if(SfxStyleFamily::Para == m_rEntry.m_eFamily) @@ -1336,7 +1322,7 @@ void SwXStyle::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) } } -OUString SwXStyle::getName() throw( uno::RuntimeException, std::exception ) +OUString SwXStyle::getName() { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -1351,7 +1337,7 @@ OUString SwXStyle::getName() throw( uno::RuntimeException, std::exception ) return aString; } -void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException, std::exception ) +void SwXStyle::setName(const OUString& rName) { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -1370,7 +1356,7 @@ void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException, std: m_sStyleName = rName; } -sal_Bool SwXStyle::isUserDefined() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXStyle::isUserDefined() { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -1381,7 +1367,7 @@ sal_Bool SwXStyle::isUserDefined() throw( uno::RuntimeException, std::exception return pBase && pBase->IsUserDefined(); } -sal_Bool SwXStyle::isInUse() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXStyle::isInUse() { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -1391,7 +1377,7 @@ sal_Bool SwXStyle::isInUse() throw( uno::RuntimeException, std::exception ) return pBase && pBase->IsUsed(); } -OUString SwXStyle::getParentStyle() throw( uno::RuntimeException, std::exception ) +OUString SwXStyle::getParentStyle() { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -1409,7 +1395,7 @@ OUString SwXStyle::getParentStyle() throw( uno::RuntimeException, std::exception return aString; } -void SwXStyle::setParentStyle(const OUString& rParentStyle) throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) +void SwXStyle::setParentStyle(const OUString& rParentStyle) { SolarMutexGuard aGuard; OUString sParentStyle; @@ -1442,7 +1428,7 @@ void SwXStyle::setParentStyle(const OUString& rParentStyle) throw( container::No } } -uno::Reference<beans::XPropertySetInfo> SwXStyle::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference<beans::XPropertySetInfo> SwXStyle::getPropertySetInfo() { if(m_bIsConditional) { @@ -1955,7 +1941,7 @@ void SwXStyle::SetPropertyValue<RES_PARATR_NUMRULE>(const SfxItemPropertySimpleE } } -void SwXStyle::SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase) throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SwXStyle::SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase) { using propertytype_t = decltype(rEntry.nWID); using coresetter_t = std::function<void(SwXStyle&, const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any&, SwStyleBase_Impl&)>; @@ -2045,7 +2031,6 @@ void SwXStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rPropertyNa } void SwXStyle::setPropertyValues(const uno::Sequence<OUString>& rPropertyNames, const uno::Sequence<uno::Any>& rValues) - throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // workaround for bad designed API @@ -2384,7 +2369,6 @@ uno::Any SwXStyle::GetPropertyValue_Impl(const SfxItemPropertySet* pPropSet, SwS } uno::Any SwXStyle::getPropertyValue(const OUString& rPropertyName) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!m_pDoc) @@ -2398,7 +2382,6 @@ uno::Any SwXStyle::getPropertyValue(const OUString& rPropertyName) } uno::Sequence<uno::Any> SwXStyle::getPropertyValues(const uno::Sequence<OUString>& rPropertyNames) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!m_pDoc) @@ -2427,7 +2410,6 @@ uno::Sequence<uno::Any> SwXStyle::getPropertyValues(const uno::Sequence<OUString } void SwXStyle::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const uno::Sequence<OUString> aProperties(&rPropertyName, 1); @@ -2436,7 +2418,6 @@ void SwXStyle::setPropertyValue(const OUString& rPropertyName, const uno::Any& r } beans::PropertyState SwXStyle::getPropertyState(const OUString& rPropertyName) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<OUString> aNames{rPropertyName}; @@ -2459,7 +2440,6 @@ const SfxItemSet* lcl_GetItemsetForProperty(const SfxItemSet& rSet, SfxStyleFami return &pSetItem->GetItemSet(); } uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Sequence<OUString>& rPropertyNames) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<beans::PropertyState> aRet(rPropertyNames.getLength()); @@ -2557,7 +2537,6 @@ uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Seque } void SwXStyle::setPropertyToDefault(const OUString& rPropertyName) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { const uno::Sequence<OUString> aSequence(&rPropertyName, 1); setPropertiesToDefault(aSequence); @@ -2585,7 +2564,6 @@ SwFormat* lcl_GetFormatForStyle(SwDoc* pDoc, const rtl::Reference<SwDocStyleShee } void SAL_CALL SwXStyle::setPropertiesToDefault(const uno::Sequence<OUString>& aPropertyNames) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const rtl::Reference<SwDocStyleSheet> xStyle(new SwDocStyleSheet(*static_cast<SwDocStyleSheet*>(GetStyleSheetBase()))); @@ -2632,7 +2610,6 @@ void SAL_CALL SwXStyle::setPropertiesToDefault(const uno::Sequence<OUString>& aP } void SAL_CALL SwXStyle::setAllPropertiesToDefault() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!m_pBasePool) @@ -2714,7 +2691,6 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault() } uno::Sequence<uno::Any> SAL_CALL SwXStyle::getPropertyDefaults(const uno::Sequence<OUString>& aPropertyNames) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Int32 nCount = aPropertyNames.getLength(); @@ -2755,7 +2731,6 @@ uno::Sequence<uno::Any> SAL_CALL SwXStyle::getPropertyDefaults(const uno::Sequen } uno::Any SwXStyle::getPropertyDefault(const OUString& rPropertyName) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const uno::Sequence<OUString> aSequence(&rPropertyName, 1); return getPropertyDefaults(aSequence)[0]; @@ -3024,7 +2999,6 @@ void SwXPageStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rProper } void SwXPageStyle::setPropertyValues(const uno::Sequence<OUString>& rPropertyNames, const uno::Sequence<uno::Any>& rValues) - throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3250,7 +3224,6 @@ uno::Sequence<uno::Any> SwXPageStyle::GetPropertyValues_Impl(const uno::Sequence } uno::Sequence<uno::Any> SwXPageStyle::getPropertyValues(const uno::Sequence<OUString>& rPropertyNames) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<uno::Any> aValues; @@ -3273,7 +3246,6 @@ uno::Sequence<uno::Any> SwXPageStyle::getPropertyValues(const uno::Sequence<OUSt } uno::Any SwXPageStyle::getPropertyValue(const OUString& rPropertyName) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const uno::Sequence<OUString> aProperties(&rPropertyName, 1); @@ -3281,7 +3253,6 @@ uno::Any SwXPageStyle::getPropertyValue(const OUString& rPropertyName) } void SwXPageStyle::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const uno::Sequence<OUString> aProperties(&rPropertyName, 1); @@ -3315,7 +3286,6 @@ const SfxPoolItem* SwXFrameStyle::GetItem(enum RES_FRMATR eAtr) } uno::Sequence<uno::Type> SwXFrameStyle::getTypes() - throw(uno::RuntimeException, std::exception) { uno::Sequence<uno::Type> aTypes = SwXStyle::getTypes(); sal_Int32 nLen = aTypes.getLength(); @@ -3325,7 +3295,6 @@ uno::Sequence<uno::Type> SwXFrameStyle::getTypes() } uno::Any SwXFrameStyle::queryInterface(const uno::Type& rType) - throw(uno::RuntimeException, std::exception) { if(rType == cppu::UnoType<XEventsSupplier>::get()) return uno::makeAny(uno::Reference<XEventsSupplier>(this)); @@ -3333,7 +3302,6 @@ uno::Any SwXFrameStyle::queryInterface(const uno::Type& rType) } uno::Reference<container::XNameReplace> SwXFrameStyle::getEvents() - throw(uno::RuntimeException, std::exception) { return new SwFrameStyleEventDescriptor(*this); } @@ -3370,14 +3338,12 @@ SwXAutoStyles::~SwXAutoStyles() { } -sal_Int32 SwXAutoStyles::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXAutoStyles::getCount() { return AUTOSTYLE_FAMILY_COUNT; } uno::Any SwXAutoStyles::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Any aRet; @@ -3421,18 +3387,17 @@ uno::Any SwXAutoStyles::getByIndex(sal_Int32 nIndex) return aRet; } -uno::Type SwXAutoStyles::getElementType( ) throw(uno::RuntimeException, std::exception) +uno::Type SwXAutoStyles::getElementType( ) { return cppu::UnoType<style::XAutoStyleFamily>::get(); } -sal_Bool SwXAutoStyles::hasElements( ) throw(uno::RuntimeException, std::exception) +sal_Bool SwXAutoStyles::hasElements( ) { return true; } uno::Any SwXAutoStyles::getByName(const OUString& Name) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { uno::Any aRet; if(Name == "CharacterStyles") @@ -3447,7 +3412,6 @@ uno::Any SwXAutoStyles::getByName(const OUString& Name) } uno::Sequence< OUString > SwXAutoStyles::getElementNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aNames(AUTOSTYLE_FAMILY_COUNT); OUString* pNames = aNames.getArray(); @@ -3458,7 +3422,6 @@ uno::Sequence< OUString > SwXAutoStyles::getElementNames() } sal_Bool SwXAutoStyles::hasByName(const OUString& Name) - throw( uno::RuntimeException, std::exception ) { if( Name == "CharacterStyles" || Name == "RubyStyles" || @@ -3488,7 +3451,6 @@ void SwXAutoStyleFamily::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNe uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle( const uno::Sequence< beans::PropertyValue >& Values ) - throw (uno::RuntimeException, std::exception) { if (!m_pDocShell) { @@ -3719,7 +3681,6 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle( } uno::Reference< container::XEnumeration > SwXAutoStyleFamily::createEnumeration( ) - throw (uno::RuntimeException, std::exception) { if( !m_pDocShell ) throw uno::RuntimeException(); @@ -3727,12 +3688,12 @@ uno::Reference< container::XEnumeration > SwXAutoStyleFamily::createEnumeration( (new SwXAutoStylesEnumerator( m_pDocShell->GetDoc(), m_eFamily )); } -uno::Type SwXAutoStyleFamily::getElementType( ) throw(uno::RuntimeException, std::exception) +uno::Type SwXAutoStyleFamily::getElementType( ) { return cppu::UnoType<style::XAutoStyle>::get(); } -sal_Bool SwXAutoStyleFamily::hasElements( ) throw(uno::RuntimeException, std::exception) +sal_Bool SwXAutoStyleFamily::hasElements( ) { return false; } @@ -3792,7 +3753,6 @@ void SwXAutoStylesEnumerator::Modify( const SfxPoolItem* pOld, const SfxPoolItem } sal_Bool SwXAutoStylesEnumerator::hasMoreElements( ) - throw (uno::RuntimeException, std::exception) { if( !m_pImpl ) throw uno::RuntimeException(); @@ -3800,7 +3760,6 @@ sal_Bool SwXAutoStylesEnumerator::hasMoreElements( ) } uno::Any SwXAutoStylesEnumerator::nextElement( ) - throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( !m_pImpl ) throw uno::RuntimeException(); @@ -3848,7 +3807,6 @@ void SwXAutoStyle::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) } uno::Reference< beans::XPropertySetInfo > SwXAutoStyle::getPropertySetInfo( ) - throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySetInfo > xRet; switch( meFamily ) @@ -3894,18 +3852,10 @@ uno::Reference< beans::XPropertySetInfo > SwXAutoStyle::getPropertySetInfo( ) } void SwXAutoStyle::setPropertyValue( const OUString& /*rPropertyName*/, const uno::Any& /*rValue*/ ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } uno::Any SwXAutoStyle::getPropertyValue( const OUString& rPropertyName ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; const uno::Sequence<OUString> aProperties(&rPropertyName, 1); @@ -3914,47 +3864,32 @@ uno::Any SwXAutoStyle::getPropertyValue( const OUString& rPropertyName ) void SwXAutoStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { } void SwXAutoStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { } void SwXAutoStyle::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { } void SwXAutoStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { } void SwXAutoStyle::setPropertyValues( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Sequence< uno::Any >& /*aValues*/ ) - throw (beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { } uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl( const uno::Sequence< OUString > & rPropertyNames ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { if( !mpSet.get() ) { @@ -4094,7 +4029,6 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl( uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues ( const uno::Sequence< OUString >& rPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence< uno::Any > aValues; @@ -4119,26 +4053,21 @@ uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues ( void SwXAutoStyle::addPropertiesChangeListener( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) - throw (uno::RuntimeException, std::exception) { } void SwXAutoStyle::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) - throw (uno::RuntimeException, std::exception) { } void SwXAutoStyle::firePropertiesChangeEvent( const uno::Sequence< OUString >& /*aPropertyNames*/, const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ ) - throw (uno::RuntimeException, std::exception) { } beans::PropertyState SwXAutoStyle::getPropertyState( const OUString& rPropertyName ) - throw( beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4148,15 +4077,10 @@ beans::PropertyState SwXAutoStyle::getPropertyState( const OUString& rPropertyNa } void SwXAutoStyle::setPropertyToDefault( const OUString& /*PropertyName*/ ) - throw( beans::UnknownPropertyException, - uno::RuntimeException, std::exception ) { } uno::Any SwXAutoStyle::getPropertyDefault( const OUString& rPropertyName ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { const uno::Sequence < OUString > aSequence ( &rPropertyName, 1 ); return getPropertyDefaults ( aSequence ).getConstArray()[0]; @@ -4164,7 +4088,6 @@ uno::Any SwXAutoStyle::getPropertyDefault( const OUString& rPropertyName ) uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates( const uno::Sequence< OUString >& rPropertyNames ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if (!mpSet.get()) { @@ -4248,26 +4171,22 @@ uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates( } void SwXAutoStyle::setAllPropertiesToDefault( ) - throw (uno::RuntimeException, std::exception) { } void SwXAutoStyle::setPropertiesToDefault( const uno::Sequence< OUString >& /*rPropertyNames*/ ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { } uno::Sequence< uno::Any > SwXAutoStyle::getPropertyDefaults( const uno::Sequence< OUString >& /*aPropertyNames*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { uno::Sequence< uno::Any > aRet(0); return aRet; } -uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties() throw (uno::RuntimeException, std::exception) +uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties() { if( !mpSet.get() ) throw uno::RuntimeException(); @@ -4462,7 +4381,7 @@ void SwXTextTableStyle::SetPhysical() } // XStyle -sal_Bool SAL_CALL SwXTextTableStyle::isUserDefined() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextTableStyle::isUserDefined() { SolarMutexGuard aGuard; // only first style is not user defined @@ -4472,7 +4391,7 @@ sal_Bool SAL_CALL SwXTextTableStyle::isUserDefined() throw (uno::RuntimeExceptio return true; } -sal_Bool SAL_CALL SwXTextTableStyle::isInUse() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextTableStyle::isInUse() { SolarMutexGuard aGuard; if (!m_bPhysical) @@ -4500,16 +4419,16 @@ sal_Bool SAL_CALL SwXTextTableStyle::isInUse() throw (uno::RuntimeException, std return false; } -OUString SAL_CALL SwXTextTableStyle::getParentStyle() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwXTextTableStyle::getParentStyle() { return OUString(); } -void SAL_CALL SwXTextTableStyle::setParentStyle(const OUString& /*aParentStyle*/) throw (container::NoSuchElementException, uno::RuntimeException, std::exception) +void SAL_CALL SwXTextTableStyle::setParentStyle(const OUString& /*aParentStyle*/) { } //XNamed -OUString SAL_CALL SwXTextTableStyle::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SwXTextTableStyle::getName() { SolarMutexGuard aGuard; OUString sProgName; @@ -4517,25 +4436,25 @@ OUString SAL_CALL SwXTextTableStyle::getName() throw(uno::RuntimeException, std: return sProgName; } -void SAL_CALL SwXTextTableStyle::setName(const OUString& rName) throw(uno::RuntimeException, std::exception) +void SAL_CALL SwXTextTableStyle::setName(const OUString& rName) { SolarMutexGuard aGuard; m_pTableAutoFormat->SetName(rName); } //XPropertySet -css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL SwXTextTableStyle::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) +css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL SwXTextTableStyle::getPropertySetInfo() { static uno::Reference<beans::XPropertySetInfo> xRef(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TABLE_STYLE)->getPropertySetInfo()); return xRef; } -void SAL_CALL SwXTextTableStyle::setPropertyValue(const OUString& /*rPropertyName*/, const css::uno::Any& /*aValue*/) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextTableStyle::setPropertyValue(const OUString& /*rPropertyName*/, const css::uno::Any& /*aValue*/) { SAL_WARN("sw.uno", "not implemented"); } -css::uno::Any SAL_CALL SwXTextTableStyle::getPropertyValue(const OUString& rPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL SwXTextTableStyle::getPropertyValue(const OUString& rPropertyName) { SolarMutexGuard aGuard; bool bIsRow = false; @@ -4554,28 +4473,28 @@ css::uno::Any SAL_CALL SwXTextTableStyle::getPropertyValue(const OUString& rProp return uno::makeAny(bIsRow ? OUString("row") : OUString("column")); } -void SAL_CALL SwXTextTableStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextTableStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ ) { SAL_WARN("sw.uno", "not implemented"); } -void SAL_CALL SwXTextTableStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextTableStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*aListener*/ ) { SAL_WARN("sw.uno", "not implemented"); } -void SAL_CALL SwXTextTableStyle::addVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextTableStyle::addVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) { SAL_WARN("sw.uno", "not implemented"); } -void SAL_CALL SwXTextTableStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextTableStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) { SAL_WARN("sw.uno", "not implemented"); } //XNameAccess -uno::Any SAL_CALL SwXTextTableStyle::getByName(const OUString& rName) throw(container::NoSuchElementException, lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwXTextTableStyle::getByName(const OUString& rName) { SolarMutexGuard aGuard; const CellStyleNameMap& rMap = GetCellStyleNameMap(); @@ -4586,13 +4505,13 @@ uno::Any SAL_CALL SwXTextTableStyle::getByName(const OUString& rName) throw(cont return css::uno::Any(m_aCellStyles[(*iter).second]); } -css::uno::Sequence<OUString> SAL_CALL SwXTextTableStyle::getElementNames() throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL SwXTextTableStyle::getElementNames() { SolarMutexGuard aGuard; return comphelper::mapKeysToSequence(GetCellStyleNameMap()); } -sal_Bool SAL_CALL SwXTextTableStyle::hasByName(const OUString& rName) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextTableStyle::hasByName(const OUString& rName) { SolarMutexGuard aGuard; const CellStyleNameMap& rMap = GetCellStyleNameMap(); @@ -4601,12 +4520,12 @@ sal_Bool SAL_CALL SwXTextTableStyle::hasByName(const OUString& rName) throw(css: } //XNameContainer -void SAL_CALL SwXTextTableStyle::insertByName(const OUString& /*Name*/, const uno::Any& /*Element*/) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SwXTextTableStyle::insertByName(const OUString& /*Name*/, const uno::Any& /*Element*/) { SAL_WARN("sw.uno", "not implemented"); } -void SAL_CALL SwXTextTableStyle::replaceByName(const OUString& rName, const uno::Any& rElement) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SwXTextTableStyle::replaceByName(const OUString& rName, const uno::Any& rElement) { SolarMutexGuard aGuard; const CellStyleNameMap& rMap = GetCellStyleNameMap(); @@ -4641,34 +4560,34 @@ void SAL_CALL SwXTextTableStyle::replaceByName(const OUString& rName, const uno: m_aCellStyles[nCellStyle] = xStyle; } -void SAL_CALL SwXTextTableStyle::removeByName(const OUString& /*Name*/) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SwXTextTableStyle::removeByName(const OUString& /*Name*/) { SAL_WARN("sw.uno", "not implemented"); } //XElementAccess -uno::Type SAL_CALL SAL_CALL SwXTextTableStyle::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL SAL_CALL SwXTextTableStyle::getElementType() { return cppu::UnoType<style::XStyle>::get(); } -sal_Bool SAL_CALL SAL_CALL SwXTextTableStyle::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SAL_CALL SwXTextTableStyle::hasElements() { return true; } //XServiceInfo -OUString SAL_CALL SwXTextTableStyle::getImplementationName() throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL SwXTextTableStyle::getImplementationName() { return {"SwXTextTableStyle"}; } -sal_Bool SAL_CALL SwXTextTableStyle::supportsService(const OUString& rServiceName) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextTableStyle::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -css::uno::Sequence<OUString> SAL_CALL SwXTextTableStyle::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL SwXTextTableStyle::getSupportedServiceNames() { return {"com.sun.star.style.Style"}; } @@ -4799,7 +4718,7 @@ css::uno::Reference<css::style::XStyle> SwXTextCellStyle::CreateXTextCellStyle(S } // XStyle -sal_Bool SAL_CALL SwXTextCellStyle::isUserDefined() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextCellStyle::isUserDefined() { SolarMutexGuard aGuard; // if this cell belong to first table style then its default style @@ -4809,7 +4728,7 @@ sal_Bool SAL_CALL SwXTextCellStyle::isUserDefined() throw (css::uno::RuntimeExce return true; } -sal_Bool SAL_CALL SwXTextCellStyle::isInUse() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextCellStyle::isInUse() { SolarMutexGuard aGuard; uno::Reference<style::XStyleFamiliesSupplier> xFamiliesSupplier(m_pDocShell->GetModel(), uno::UNO_QUERY); @@ -4833,13 +4752,13 @@ sal_Bool SAL_CALL SwXTextCellStyle::isInUse() throw (css::uno::RuntimeException, return xStyle->isInUse(); } -OUString SAL_CALL SwXTextCellStyle::getParentStyle() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL SwXTextCellStyle::getParentStyle() { // Do not return name of the parent (which is a table style) because the parent should be a cell style. return OUString(); } -void SAL_CALL SwXTextCellStyle::setParentStyle(const OUString& /*sParentStyle*/) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextCellStyle::setParentStyle(const OUString& /*sParentStyle*/) { SolarMutexGuard aGuard; // Changing parent to one which is unaware of it will lead to a something unexcpected. getName() rely on a parent. @@ -4847,7 +4766,7 @@ void SAL_CALL SwXTextCellStyle::setParentStyle(const OUString& /*sParentStyle*/) } //XNamed -OUString SAL_CALL SwXTextCellStyle::getName() throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL SwXTextCellStyle::getName() { SolarMutexGuard aGuard; OUString sName; @@ -4872,7 +4791,7 @@ OUString SAL_CALL SwXTextCellStyle::getName() throw(css::uno::RuntimeException, return sName; } -void SAL_CALL SwXTextCellStyle::setName(const OUString& sName) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextCellStyle::setName(const OUString& sName) { SolarMutexGuard aGuard; // if style is physical then we can not rename it. @@ -4883,13 +4802,13 @@ void SAL_CALL SwXTextCellStyle::setName(const OUString& sName) throw(css::uno::R } //XPropertySet -css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL SwXTextCellStyle::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) +css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL SwXTextCellStyle::getPropertySetInfo() { static uno::Reference<beans::XPropertySetInfo> xRef(aSwMapProvider.GetPropertySet(PROPERTY_MAP_CELL_STYLE)->getPropertySetInfo()); return xRef; } -void SAL_CALL SwXTextCellStyle::setPropertyValue(const OUString& rPropertyName, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextCellStyle::setPropertyValue(const OUString& rPropertyName, const css::uno::Any& aValue) { SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry *const pEntry = aSwMapProvider.GetPropertySet(PROPERTY_MAP_CELL_STYLE)->getPropertyMap().getByName(rPropertyName); @@ -5078,7 +4997,7 @@ void SAL_CALL SwXTextCellStyle::setPropertyValue(const OUString& rPropertyName, throw css::beans::UnknownPropertyException(); } -css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyValue(const OUString& rPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyValue(const OUString& rPropertyName) { SolarMutexGuard aGuard; uno::Any aRet; @@ -5242,28 +5161,28 @@ css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyValue(const OUString& rPrope throw css::beans::UnknownPropertyException(); } -void SAL_CALL SwXTextCellStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextCellStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ ) { SAL_WARN("sw.uno", "not implemented"); } -void SAL_CALL SwXTextCellStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextCellStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*aListener*/ ) { SAL_WARN("sw.uno", "not implemented"); } -void SAL_CALL SwXTextCellStyle::addVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextCellStyle::addVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) { SAL_WARN("sw.uno", "not implemented"); } -void SAL_CALL SwXTextCellStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextCellStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) { SAL_WARN("sw.uno", "not implemented"); } //XPropertyState -css::beans::PropertyState SAL_CALL SwXTextCellStyle::getPropertyState(const OUString& rPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) +css::beans::PropertyState SAL_CALL SwXTextCellStyle::getPropertyState(const OUString& rPropertyName) { SolarMutexGuard aGuard; uno::Sequence<OUString> aNames { rPropertyName }; @@ -5271,7 +5190,7 @@ css::beans::PropertyState SAL_CALL SwXTextCellStyle::getPropertyState(const OUSt return aStates.getConstArray()[0]; } -css::uno::Sequence<css::beans::PropertyState> SAL_CALL SwXTextCellStyle::getPropertyStates(const css::uno::Sequence<OUString>& aPropertyNames) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) +css::uno::Sequence<css::beans::PropertyState> SAL_CALL SwXTextCellStyle::getPropertyStates(const css::uno::Sequence<OUString>& aPropertyNames) { SolarMutexGuard aGuard; uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength()); @@ -5421,7 +5340,7 @@ css::uno::Sequence<css::beans::PropertyState> SAL_CALL SwXTextCellStyle::getProp return aRet; } -void SAL_CALL SwXTextCellStyle::setPropertyToDefault(const OUString& rPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextCellStyle::setPropertyToDefault(const OUString& rPropertyName) { SolarMutexGuard aGuard; const SwBoxAutoFormat& rDefaultBoxFormat = SwTableAutoFormat::GetDefaultBoxFormat(); @@ -5622,7 +5541,7 @@ void SAL_CALL SwXTextCellStyle::setPropertyToDefault(const OUString& rPropertyNa } } -css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyDefault(const OUString& /*aPropertyName*/) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyDefault(const OUString& /*aPropertyName*/) { SAL_WARN("sw.uno", "not implemented"); uno::Any aRet; @@ -5630,17 +5549,17 @@ css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyDefault(const OUString& /*aP } //XServiceInfo -OUString SAL_CALL SwXTextCellStyle::getImplementationName() throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL SwXTextCellStyle::getImplementationName() { return {"SwXTextCellStyle"}; } -sal_Bool SAL_CALL SwXTextCellStyle::supportsService(const OUString& rServiceName) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextCellStyle::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -css::uno::Sequence<OUString> SAL_CALL SwXTextCellStyle::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL SwXTextCellStyle::getSupportedServiceNames() { return {"com.sun.star.style.Style"}; } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 2d9132ef3c67..a710722a085d 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -212,8 +212,6 @@ static bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSv static void lcl_SetSpecialProperty(SwFrameFormat* pFormat, const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { // special treatment for "non-items" switch(pEntry->nWID) @@ -793,7 +791,6 @@ const uno::Sequence< sal_Int8 > & SwXCell::getUnoTunnelId() } sal_Int64 SAL_CALL SwXCell::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -805,7 +802,7 @@ sal_Int64 SAL_CALL SwXCell::getSomething( const uno::Sequence< sal_Int8 >& rId ) return SwXText::getSomething(rId); } -uno::Sequence< uno::Type > SAL_CALL SwXCell::getTypes( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > SAL_CALL SwXCell::getTypes( ) { static uno::Sequence< uno::Type > aRetTypes; @@ -819,7 +816,7 @@ uno::Sequence< uno::Type > SAL_CALL SwXCell::getTypes( ) throw(uno::RuntimeExce return aRetTypes; } -uno::Sequence< sal_Int8 > SAL_CALL SwXCell::getImplementationId( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< sal_Int8 > SAL_CALL SwXCell::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -837,7 +834,6 @@ void SAL_CALL SwXCell::release( ) throw() } uno::Any SAL_CALL SwXCell::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { uno::Any aRet = SwXCellBaseClass::queryInterface(aType); if(aRet.getValueType() == cppu::UnoType<void>::get()) @@ -856,7 +852,7 @@ const SwStartNode *SwXCell::GetStartNode() const } uno::Reference< text::XTextCursor > -SwXCell::CreateCursor() throw (uno::RuntimeException) +SwXCell::CreateCursor() { return createTextCursor(); } @@ -883,7 +879,7 @@ bool SwXCell::IsValid() const return nullptr != pBox; } -OUString SwXCell::getFormula() throw( uno::RuntimeException, std::exception ) +OUString SwXCell::getFormula() { SolarMutexGuard aGuard; if(!IsValid()) @@ -895,7 +891,7 @@ OUString SwXCell::getFormula() throw( uno::RuntimeException, std::exception ) } ///@see sw_setValue (TODO: seems to be copy and paste programming here) -void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException, std::exception ) +void SwXCell::setFormula(const OUString& rFormula) { SolarMutexGuard aGuard; if(!IsValid()) @@ -925,7 +921,7 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException, pMyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate ); } -double SwXCell::getValue() throw( uno::RuntimeException, std::exception ) +double SwXCell::getValue() { SolarMutexGuard aGuard; // #i112652# a table cell may contain NaN as a value, do not filter that @@ -937,13 +933,13 @@ double SwXCell::getValue() throw( uno::RuntimeException, std::exception ) return fRet; } -void SwXCell::setValue(double rValue) throw( uno::RuntimeException, std::exception ) +void SwXCell::setValue(double rValue) { SolarMutexGuard aGuard; sw_setValue( *this, rValue ); } -table::CellContentType SwXCell::getType() throw( uno::RuntimeException, std::exception ) +table::CellContentType SwXCell::getType() { SolarMutexGuard aGuard; @@ -961,20 +957,20 @@ table::CellContentType SwXCell::getType() throw( uno::RuntimeException, std::exc return nRes; } -void SwXCell::setString(const OUString& aString) throw( uno::RuntimeException, std::exception ) +void SwXCell::setString(const OUString& aString) { SolarMutexGuard aGuard; sw_setString( *this, aString ); } -sal_Int32 SwXCell::getError() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXCell::getError() { SolarMutexGuard aGuard; OUString sContent = getString(); return sal_Int32(sContent.equals(SwViewShell::GetShellRes()->aCalc_Error)); } -uno::Reference<text::XTextCursor> SwXCell::createTextCursor() throw( uno::RuntimeException, std::exception ) +uno::Reference<text::XTextCursor> SwXCell::createTextCursor() { SolarMutexGuard aGuard; if(!pStartNode && !IsValid()) @@ -989,7 +985,6 @@ uno::Reference<text::XTextCursor> SwXCell::createTextCursor() throw( uno::Runtim } uno::Reference<text::XTextCursor> SwXCell::createTextCursorByRange(const uno::Reference< text::XTextRange > & xTextPosition) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwUnoInternalPaM aPam(*GetDoc()); @@ -1007,14 +1002,13 @@ uno::Reference<text::XTextCursor> SwXCell::createTextCursorByRange(const uno::Re *aPam.GetPoint(), aPam.GetMark())); } -uno::Reference< beans::XPropertySetInfo > SwXCell::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXCell::getPropertySetInfo() { static uno::Reference< beans::XPropertySetInfo > xRef = m_pPropSet->getPropertySetInfo(); return xRef; } void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1067,7 +1061,6 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV } uno::Any SwXCell::getPropertyValue(const OUString& rPropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1112,19 +1105,19 @@ uno::Any SwXCell::getPropertyValue(const OUString& rPropertyName) } } -void SwXCell::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXCell::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -void SwXCell::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXCell::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -void SwXCell::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXCell::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -void SwXCell::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXCell::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -uno::Reference<container::XEnumeration> SwXCell::createEnumeration() throw( uno::RuntimeException, std::exception ) +uno::Reference<container::XEnumeration> SwXCell::createEnumeration() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1139,12 +1132,12 @@ uno::Reference<container::XEnumeration> SwXCell::createEnumeration() throw( uno: return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_TBLTEXT, pSttNd, pTable); } -uno::Type SAL_CALL SwXCell::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL SwXCell::getElementType() { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SwXCell::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXCell::hasElements() { return true; } @@ -1258,22 +1251,22 @@ uno::Any SwXCell::GetAny() const return bIsNum ? uno::makeAny(getValue()) : uno::makeAny(const_cast<SwXCell*>(this)->getString()); } -OUString SwXCell::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXCell::getImplementationName() { return OUString("SwXCell"); } -sal_Bool SwXCell::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXCell::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXCell::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXCell::getSupportedServiceNames() { return {"com.sun.star.text.CellProperties"}; } -OUString SwXTextTableRow::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTextTableRow::getImplementationName() { return OUString("SwXTextTableRow"); } -sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextTableRow::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextTableRow::getSupportedServiceNames() { return {"com.sun.star.text.TextTableRow"}; } @@ -1290,19 +1283,13 @@ SwXTextTableRow::~SwXTextTableRow() GetRegisteredIn()->Remove(this); } -uno::Reference< beans::XPropertySetInfo > SwXTextTableRow::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXTextTableRow::getPropertySetInfo() { static uno::Reference<beans::XPropertySetInfo> xRef = m_pPropSet->getPropertySetInfo(); return xRef; } void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) - throw (beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)); @@ -1381,7 +1368,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno: } } -uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) { SolarMutexGuard aGuard; uno::Any aRet; @@ -1426,16 +1413,16 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw( return aRet; } -void SwXTextTableRow::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTableRow::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -void SwXTextTableRow::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTableRow::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -void SwXTextTableRow::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTableRow::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -void SwXTextTableRow::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTableRow::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; void SwXTextTableRow::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) @@ -1462,10 +1449,10 @@ SwTableLine* SwXTextTableRow::FindLine(SwTable* pTable, SwTableLine* pLine) // SwXTextTableCursor -OUString SwXTextTableCursor::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTextTableCursor::getImplementationName() { return OUString("SwXTextTableCursor"); } -sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } void SwXTextTableCursor::acquire() throw() @@ -1481,7 +1468,6 @@ void SwXTextTableCursor::release() throw() css::uno::Any SAL_CALL SwXTextTableCursor::queryInterface( const css::uno::Type& _rType ) - throw (css::uno::RuntimeException, std::exception) { css::uno::Any aReturn = SwXTextTableCursor_Base::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -1496,7 +1482,7 @@ SwDoc* SwXTextTableCursor::GetDoc() { return GetFrameFormat( const SwUnoCursor& SwXTextTableCursor::GetCursor() const { return *m_pUnoCursor; } SwUnoCursor& SwXTextTableCursor::GetCursor() { return *m_pUnoCursor; } -uno::Sequence<OUString> SwXTextTableCursor::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SwXTextTableCursor::getSupportedServiceNames() { return {"com.sun.star.text.TextTableCursor"}; } SwXTextTableCursor::SwXTextTableCursor(SwFrameFormat* pFormat, SwTableBox* pBox) : @@ -1530,7 +1516,6 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrameFormat& rTableFormat, const SwTabl } OUString SwXTextTableCursor::getRangeName() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1558,7 +1543,6 @@ OUString SwXTextTableCursor::getRangeName() } sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& sCellName, sal_Bool bExpand) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1567,7 +1551,7 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& sCellName, sal_Bool return rTableCursor.GotoTableBox(sCellName); } -sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool bExpand) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1576,7 +1560,7 @@ sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool bExpand) throw( un return rTableCursor.Left(Count); } -sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1585,7 +1569,7 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand) throw( u return rTableCursor.Right(Count); } -sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool bExpand) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1594,7 +1578,7 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool bExpand) throw( uno: return rTableCursor.UpDown(true, Count, nullptr, 0); } -sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool bExpand) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1603,7 +1587,7 @@ sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool bExpand) throw( un return rTableCursor.UpDown(false, Count, nullptr, 0); } -void SwXTextTableCursor::gotoStart(sal_Bool bExpand) throw( uno::RuntimeException, std::exception ) +void SwXTextTableCursor::gotoStart(sal_Bool bExpand) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1612,7 +1596,7 @@ void SwXTextTableCursor::gotoStart(sal_Bool bExpand) throw( uno::RuntimeExceptio rTableCursor.MoveTable(GotoCurrTable, fnTableStart); } -void SwXTextTableCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException, std::exception ) +void SwXTextTableCursor::gotoEnd(sal_Bool bExpand) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1622,7 +1606,6 @@ void SwXTextTableCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException, } sal_Bool SwXTextTableCursor::mergeRange() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1649,7 +1632,6 @@ sal_Bool SwXTextTableCursor::mergeRange() } sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (Count <= 0) @@ -1670,19 +1652,13 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal) return bResult; } -uno::Reference< beans::XPropertySetInfo > SwXTextTableCursor::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXTextTableCursor::getPropertySetInfo() { static uno::Reference< beans::XPropertySetInfo > xRef = m_pPropSet->getPropertySetInfo(); return xRef; } void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) - throw (beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1738,10 +1714,6 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const u } uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; SwUnoCursor& rUnoCursor = GetCursor(); @@ -1789,16 +1761,16 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName) return aResult; } -void SwXTextTableCursor::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTableCursor::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -void SwXTextTableCursor::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTableCursor::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -void SwXTextTableCursor::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTableCursor::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -void SwXTextTableCursor::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTableCursor::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; void SwXTextTableCursor::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) @@ -2026,7 +1998,6 @@ const uno::Sequence< sal_Int8 > & SwXTextTable::getUnoTunnelId() { return theSwXTextTableUnoTunnelId::get().getSeq(); } sal_Int64 SAL_CALL SwXTextTable::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if(rId.getLength() == 16 && 0 == memcmp(getUnoTunnelId().getConstArray(), rId.getConstArray(), 16)) @@ -2072,7 +2043,7 @@ SwFrameFormat* SwXTextTable::GetFrameFormat() return m_pImpl->GetFrameFormat(); } -void SwXTextTable::initialize(sal_Int32 nR, sal_Int32 nC) throw( uno::RuntimeException, std::exception ) +void SwXTextTable::initialize(sal_Int32 nR, sal_Int32 nC) { if (!m_pImpl->IsDescriptor() || nR <= 0 || nC <= 0 || nR >= USHRT_MAX || nC >= USHRT_MAX) throw uno::RuntimeException(); @@ -2081,7 +2052,6 @@ void SwXTextTable::initialize(sal_Int32 nR, sal_Int32 nC) throw( uno::RuntimeExc } uno::Reference<table::XTableRows> SAL_CALL SwXTextTable::getRows() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XTableRows> xResult(m_pImpl->m_xRows); @@ -2095,7 +2065,6 @@ throw (uno::RuntimeException, std::exception) } uno::Reference<table::XTableColumns> SAL_CALL SwXTextTable::getColumns() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XTableColumns> xResult(m_pImpl->m_xColumns); @@ -2108,7 +2077,7 @@ throw (uno::RuntimeException, std::exception) return xResult; } -uno::Reference<table::XCell> SwXTextTable::getCellByName(const OUString& sCellName) throw( uno::RuntimeException, std::exception ) +uno::Reference<table::XCell> SwXTextTable::getCellByName(const OUString& sCellName) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)); @@ -2119,7 +2088,7 @@ uno::Reference<table::XCell> SwXTextTable::getCellByName(const OUString& sCellNa return SwXCell::CreateXCell(pFormat, pBox); } -uno::Sequence<OUString> SwXTextTable::getCellNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SwXTextTable::getCellNames() { SolarMutexGuard aGuard; SwFrameFormat* pFormat(GetFrameFormat()); @@ -2134,7 +2103,6 @@ uno::Sequence<OUString> SwXTextTable::getCellNames() throw( uno::RuntimeExceptio } uno::Reference<text::XTextTableCursor> SwXTextTable::createCursorByCellName(const OUString& sCellName) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)); @@ -2148,7 +2116,6 @@ uno::Reference<text::XTextTableCursor> SwXTextTable::createCursorByCellName(cons void SAL_CALL SwXTextTable::attach(const uno::Reference<text::XTextRange> & xTextRange) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2221,14 +2188,13 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } uno::Reference<text::XTextRange> SwXTextTable::getAnchor() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)); return new SwXTextRange(*pFormat); } -void SwXTextTable::dispose() throw( uno::RuntimeException, std::exception ) +void SwXTextTable::dispose() { SolarMutexGuard aGuard; SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)); @@ -2241,7 +2207,6 @@ void SwXTextTable::dispose() throw( uno::RuntimeException, std::exception ) void SAL_CALL SwXTextTable::addEventListener( const uno::Reference<lang::XEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_Listeners.addInterface( @@ -2250,7 +2215,6 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextTable::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_Listeners.removeInterface( @@ -2258,7 +2222,6 @@ throw (uno::RuntimeException, std::exception) } uno::Reference<table::XCell> SwXTextTable::getCellByPosition(sal_Int32 nColumn, sal_Int32 nRow) - throw( uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception ) { SolarMutexGuard aGuard; SwFrameFormat* pFormat(GetFrameFormat()); @@ -2305,7 +2268,6 @@ uno::Reference<table::XCellRange> GetRangeByName( } // namespace uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByPosition(sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom) - throw(uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; SwFrameFormat* pFormat(GetFrameFormat()); @@ -2332,7 +2294,6 @@ uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByPosition(sal_Int3 } uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByName(const OUString& sRange) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< table::XCellRange > aRef; @@ -2357,7 +2318,6 @@ uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByName(const OUStrin } uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this)); @@ -2368,7 +2328,6 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray() } void SAL_CALL SwXTextTable::setDataArray(const uno::Sequence< uno::Sequence< uno::Any > >& rArray) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this)); @@ -2379,7 +2338,6 @@ void SAL_CALL SwXTextTable::setDataArray(const uno::Sequence< uno::Sequence< uno } uno::Sequence< uno::Sequence< double > > SwXTextTable::getData() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this)); @@ -2392,7 +2350,6 @@ uno::Sequence< uno::Sequence< double > > SwXTextTable::getData() } void SwXTextTable::setData(const uno::Sequence< uno::Sequence< double > >& rData) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this)); @@ -2407,7 +2364,6 @@ void SwXTextTable::setData(const uno::Sequence< uno::Sequence< double > >& rData } uno::Sequence<OUString> SwXTextTable::getRowDescriptions() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this)); @@ -2420,7 +2376,6 @@ uno::Sequence<OUString> SwXTextTable::getRowDescriptions() } void SwXTextTable::setRowDescriptions(const uno::Sequence<OUString>& rRowDesc) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this)); @@ -2433,7 +2388,6 @@ void SwXTextTable::setRowDescriptions(const uno::Sequence<OUString>& rRowDesc) } uno::Sequence<OUString> SwXTextTable::getColumnDescriptions() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this)); @@ -2446,7 +2400,6 @@ uno::Sequence<OUString> SwXTextTable::getColumnDescriptions() } void SwXTextTable::setColumnDescriptions(const uno::Sequence<OUString>& rColumnDesc) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this)); @@ -2460,7 +2413,6 @@ void SwXTextTable::setColumnDescriptions(const uno::Sequence<OUString>& rColumnD void SAL_CALL SwXTextTable::addChartDataChangeEventListener( const uno::Reference<chart::XChartDataChangeEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_Listeners.addInterface( @@ -2469,21 +2421,20 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXTextTable::removeChartDataChangeEventListener( const uno::Reference<chart::XChartDataChangeEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_Listeners.removeInterface( cppu::UnoType<chart::XChartDataChangeEventListener>::get(), xListener); } -sal_Bool SwXTextTable::isNotANumber(double nNumber) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTable::isNotANumber(double nNumber) { // We use DBL_MIN because starcalc does (which uses it because chart // wants it that way!) return ( nNumber == DBL_MIN ); } -double SwXTextTable::getNotANumber() throw( uno::RuntimeException, std::exception ) +double SwXTextTable::getNotANumber() { // We use DBL_MIN because starcalc does (which uses it because chart // wants it that way!) @@ -2491,7 +2442,6 @@ double SwXTextTable::getNotANumber() throw( uno::RuntimeException, std::exceptio } uno::Sequence< beans::PropertyValue > SwXTextTable::createSortDescriptor() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -2499,7 +2449,6 @@ uno::Sequence< beans::PropertyValue > SwXTextTable::createSortDescriptor() } void SwXTextTable::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwSortOptions aSortOpt; @@ -2521,8 +2470,6 @@ void SwXTextTable::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor } void SwXTextTable::autoFormat(const OUString& sAutoFormatName) - throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)); @@ -2545,16 +2492,13 @@ void SwXTextTable::autoFormat(const OUString& sAutoFormatName) } } -uno::Reference< beans::XPropertySetInfo > SwXTextTable::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXTextTable::getPropertySetInfo() { static uno::Reference<beans::XPropertySetInfo> xRef = m_pImpl->m_pPropSet->getPropertySetInfo(); return xRef; } void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -2810,10 +2754,6 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An } uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -3060,19 +3000,19 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) return aRet; } -void SwXTextTable::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTable::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -void SwXTextTable::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTable::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -void SwXTextTable::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTable::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -void SwXTextTable::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXTextTable::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -OUString SwXTextTable::getName() throw( uno::RuntimeException, std::exception ) +OUString SwXTextTable::getName() { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -3085,7 +3025,7 @@ OUString SwXTextTable::getName() throw( uno::RuntimeException, std::exception ) return m_pImpl->m_sTableName; } -void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException, std::exception ) +void SwXTextTable::setName(const OUString& rName) { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); @@ -3193,13 +3133,13 @@ void SwXTextTable::Impl::Modify( } } -OUString SAL_CALL SwXTextTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SwXTextTable::getImplementationName() { return OUString("SwXTextTable"); } -sal_Bool SwXTextTable::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTable::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence<OUString> SwXTextTable::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SwXTextTable::getSupportedServiceNames() { return { "com.sun.star.document.LinkTarget", @@ -3271,7 +3211,6 @@ const uno::Sequence< sal_Int8 > & SwXCellRange::getUnoTunnelId() } sal_Int64 SAL_CALL SwXCellRange::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -3283,13 +3222,13 @@ sal_Int64 SAL_CALL SwXCellRange::getSomething( const uno::Sequence< sal_Int8 >& } -OUString SwXCellRange::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXCellRange::getImplementationName() { return OUString("SwXCellRange"); } -sal_Bool SwXCellRange::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXCellRange::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence<OUString> SwXCellRange::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SwXCellRange::getSupportedServiceNames() { return { "com.sun.star.text.CellRange", @@ -3343,7 +3282,6 @@ std::vector< uno::Reference< table::XCell > > SwXCellRange::GetCells() uno::Reference<table::XCell> SAL_CALL SwXCellRange::getCellByPosition(sal_Int32 nColumn, sal_Int32 nRow) - throw( uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< table::XCell > aRet; @@ -3368,8 +3306,6 @@ SwXCellRange::getCellByPosition(sal_Int32 nColumn, sal_Int32 nRow) uno::Reference<table::XCellRange> SAL_CALL SwXCellRange::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, - std::exception) { SolarMutexGuard aGuard; uno::Reference< table::XCellRange > aRet; @@ -3422,7 +3358,6 @@ SwXCellRange::getCellRangeByPosition( uno::Reference<table::XCellRange> SAL_CALL SwXCellRange::getCellRangeByName(const OUString& rRange) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; sal_Int32 nPos = 0; @@ -3442,7 +3377,7 @@ SwXCellRange::getCellRangeByName(const OUString& rRange) aDesc.nBottom - m_pImpl->m_RangeDescriptor.nTop); } -uno::Reference< beans::XPropertySetInfo > SwXCellRange::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXCellRange::getPropertySetInfo() { static uno::Reference<beans::XPropertySetInfo> xRef = m_pImpl->m_pPropSet->getPropertySetInfo(); return xRef; @@ -3450,12 +3385,6 @@ uno::Reference< beans::XPropertySetInfo > SwXCellRange::getPropertySetInfo() th void SAL_CALL SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) - throw (beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; SwFrameFormat *const pFormat = m_pImpl->GetFrameFormat(); @@ -3577,10 +3506,6 @@ SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV } uno::Any SAL_CALL SwXCellRange::getPropertyValue(const OUString& rPropertyName) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -3663,21 +3588,20 @@ uno::Any SAL_CALL SwXCellRange::getPropertyValue(const OUString& rPropertyName) return aRet; } -void SwXCellRange::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXCellRange::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -void SwXCellRange::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXCellRange::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -void SwXCellRange::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXCellRange::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -void SwXCellRange::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +void SwXCellRange::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } ///@see SwXCellRange::getData uno::Sequence<uno::Sequence<uno::Any>> SAL_CALL SwXCellRange::getDataArray() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const sal_Int32 nRowCount = m_pImpl->GetRowCount(); @@ -3704,7 +3628,7 @@ uno::Sequence<uno::Sequence<uno::Any>> SAL_CALL SwXCellRange::getDataArray() } ///@see SwXCellRange::setData -void SAL_CALL SwXCellRange::setDataArray(const uno::Sequence< uno::Sequence< uno::Any > >& rArray) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwXCellRange::setDataArray(const uno::Sequence< uno::Sequence< uno::Any > >& rArray) { SolarMutexGuard aGuard; const sal_Int32 nRowCount = m_pImpl->GetRowCount(); @@ -3739,7 +3663,7 @@ void SAL_CALL SwXCellRange::setDataArray(const uno::Sequence< uno::Sequence< uno } uno::Sequence<uno::Sequence<double>> SAL_CALL -SwXCellRange::getData() throw (uno::RuntimeException, std::exception) +SwXCellRange::getData() { SolarMutexGuard aGuard; const sal_Int32 nRowCount = m_pImpl->GetRowCount(); @@ -3771,7 +3695,6 @@ SwXCellRange::getData() throw (uno::RuntimeException, std::exception) void SAL_CALL SwXCellRange::setData(const uno::Sequence< uno::Sequence<double> >& rData) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; const sal_Int32 nRowCount = m_pImpl->GetRowCount(); @@ -3841,13 +3764,11 @@ SwXCellRange::Impl::GetLabelDescriptions(SwXCellRange & rThis, bool bRow) } uno::Sequence<OUString> SAL_CALL SwXCellRange::getRowDescriptions() - throw (uno::RuntimeException, std::exception) { return m_pImpl->GetLabelDescriptions(*this, true); } uno::Sequence<OUString> SAL_CALL SwXCellRange::getColumnDescriptions() - throw (uno::RuntimeException, std::exception) { return m_pImpl->GetLabelDescriptions(*this, false); } @@ -3874,21 +3795,18 @@ void SwXCellRange::Impl::SetLabelDescriptions(SwXCellRange & rThis, void SAL_CALL SwXCellRange::setRowDescriptions( const uno::Sequence<OUString>& rRowDesc) - throw(uno::RuntimeException, std::exception) { m_pImpl->SetLabelDescriptions(*this, rRowDesc, true); } void SAL_CALL SwXCellRange::setColumnDescriptions( const uno::Sequence<OUString>& rColumnDesc) - throw(uno::RuntimeException, std::exception) { m_pImpl->SetLabelDescriptions(*this, rColumnDesc, false); } void SAL_CALL SwXCellRange::addChartDataChangeEventListener( const uno::Reference<chart::XChartDataChangeEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_ChartListeners.addInterface(xListener); @@ -3896,27 +3814,24 @@ throw (uno::RuntimeException, std::exception) void SAL_CALL SwXCellRange::removeChartDataChangeEventListener( const uno::Reference<chart::XChartDataChangeEventListener> & xListener) -throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_ChartListeners.removeInterface(xListener); } -sal_Bool SwXCellRange::isNotANumber(double /*fNumber*/) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXCellRange::isNotANumber(double /*fNumber*/) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -double SwXCellRange::getNotANumber() throw( uno::RuntimeException, std::exception ) +double SwXCellRange::getNotANumber() { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -uno::Sequence< beans::PropertyValue > SwXCellRange::createSortDescriptor() throw( uno::RuntimeException, std::exception ) +uno::Sequence< beans::PropertyValue > SwXCellRange::createSortDescriptor() { SolarMutexGuard aGuard; return SwUnoCursorHelper::CreateSortDescriptor(true); } void SAL_CALL SwXCellRange::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor) - throw (uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; SwSortOptions aSortOpt; @@ -3978,13 +3893,13 @@ protected: // SwXTableRows -OUString SwXTableRows::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTableRows::getImplementationName() { return OUString("SwXTableRows"); } -sal_Bool SwXTableRows::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTableRows::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTableRows::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTableRows::getSupportedServiceNames() { return { "com.sun.star.text.TableRows" }; } @@ -4000,7 +3915,7 @@ SwFrameFormat* SwXTableRows::GetFrameFormat() return static_cast<SwFrameFormat*>(m_pImpl->GetRegisteredIn()); } -sal_Int32 SwXTableRows::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXTableRows::getCount() { SolarMutexGuard aGuard; SwFrameFormat* pFrameFormat = GetFrameFormat(); @@ -4012,7 +3927,6 @@ sal_Int32 SwXTableRows::getCount() throw( uno::RuntimeException, std::exception ///@see SwXCell::CreateXCell (TODO: seems to be copy and paste programming here) uno::Any SwXTableRows::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrameFormat* pFrameFormat(lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this))); @@ -4030,12 +3944,12 @@ uno::Any SwXTableRows::getByIndex(sal_Int32 nIndex) return uno::makeAny(xRet); } -uno::Type SAL_CALL SwXTableRows::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL SwXTableRows::getElementType() { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SwXTableRows::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTableRows::hasElements() { SolarMutexGuard aGuard; SwFrameFormat* pFrameFormat = GetFrameFormat(); @@ -4046,7 +3960,6 @@ sal_Bool SwXTableRows::hasElements() throw( uno::RuntimeException, std::exceptio } void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nCount == 0) @@ -4086,7 +3999,6 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) } void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nCount == 0) @@ -4143,13 +4055,13 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; }; -OUString SwXTableColumns::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXTableColumns::getImplementationName() { return OUString("SwXTableColumns"); } -sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTableColumns::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTableColumns::getSupportedServiceNames() { return { "com.sun.star.text.TableColumns"}; } @@ -4165,7 +4077,7 @@ SwFrameFormat* SwXTableColumns::GetFrameFormat() const return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(m_pImpl->GetRegisteredIn())); } -sal_Int32 SwXTableColumns::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXTableColumns::getCount() { SolarMutexGuard aGuard; SwFrameFormat* pFrameFormat(lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this))); @@ -4178,7 +4090,6 @@ sal_Int32 SwXTableColumns::getCount() throw( uno::RuntimeException, std::excepti } uno::Any SwXTableColumns::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(nIndex < 0 || getCount() <= nIndex) @@ -4186,12 +4097,12 @@ uno::Any SwXTableColumns::getByIndex(sal_Int32 nIndex) return uno::makeAny(uno::Reference<uno::XInterface>()); // i#21699 not supported } -uno::Type SAL_CALL SwXTableColumns::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL SwXTableColumns::getElementType() { return cppu::UnoType<uno::XInterface>::get(); } -sal_Bool SwXTableColumns::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTableColumns::hasElements() { SolarMutexGuard aGuard; lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)); @@ -4200,7 +4111,6 @@ sal_Bool SwXTableColumns::hasElements() throw( uno::RuntimeException, std::excep ///@see SwXTableRows::insertByIndex (TODO: seems to be copy and paste programming here) void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nCount == 0) @@ -4240,7 +4150,6 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) ///@see SwXTableRows::removeByIndex (TODO: seems to be copy and paste programming here) void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nCount == 0) diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 2a54d97c6301..fadc9be4a528 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -98,20 +98,17 @@ public: finishOrAppendParagraph( const uno::Sequence< beans::PropertyValue >& rCharacterAndParagraphProperties, - const uno::Reference< text::XTextRange >& xInsertPosition) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception); + const uno::Reference< text::XTextRange >& xInsertPosition); /// @throws lang::IllegalArgumentException /// @throws uno::RuntimeException sal_Int16 ComparePositions( const uno::Reference<text::XTextRange>& xPos1, - const uno::Reference<text::XTextRange>& xPos2) - throw (lang::IllegalArgumentException, uno::RuntimeException); + const uno::Reference<text::XTextRange>& xPos2); /// @throws lang::IllegalArgumentException /// @throws uno::RuntimeException - bool CheckForOwnMember(const SwPaM & rPaM) - throw (lang::IllegalArgumentException, uno::RuntimeException); + bool CheckForOwnMember(const SwPaM & rPaM); void ConvertCell( const uno::Sequence< uno::Reference< text::XTextRange > > & rCell, @@ -163,7 +160,6 @@ SwXText::PrepareForAttach(uno::Reference< text::XTextRange > &, const SwPaM &) } bool SwXText::CheckForOwnMemberMeta(const SwPaM &, const bool) - throw (lang::IllegalArgumentException, uno::RuntimeException) { OSL_ENSURE(CURSOR_META != m_pImpl->m_eType, "should not be called!"); return false; @@ -175,7 +171,7 @@ const SwStartNode *SwXText::GetStartNode() const } uno::Reference< text::XTextCursor > -SwXText::CreateCursor() throw (uno::RuntimeException) +SwXText::CreateCursor() { uno::Reference< text::XTextCursor > xRet; if(IsValid()) @@ -190,7 +186,7 @@ SwXText::CreateCursor() throw (uno::RuntimeException) } uno::Any SAL_CALL -SwXText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException, std::exception) +SwXText::queryInterface(const uno::Type& rType) { uno::Any aRet; if (rType == cppu::UnoType<text::XText>::get()) @@ -261,7 +257,7 @@ SwXText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException, st } uno::Sequence< uno::Type > SAL_CALL -SwXText::getTypes() throw (uno::RuntimeException, std::exception) +SwXText::getTypes() { uno::Sequence< uno::Type > aRet(12); uno::Type* pTypes = aRet.getArray(); @@ -285,7 +281,6 @@ SwXText::getTypes() throw (uno::RuntimeException, std::exception) void SAL_CALL SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange, const OUString& rString, sal_Bool bAbsorb) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -390,7 +385,6 @@ void SAL_CALL SwXText::insertControlCharacter( const uno::Reference< text::XTextRange > & xTextRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -503,7 +497,6 @@ SwXText::insertTextContent( const uno::Reference< text::XTextRange > & xRange, const uno::Reference< text::XTextContent > & xContent, sal_Bool bAbsorb) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -619,7 +612,6 @@ void SAL_CALL SwXText::insertTextContentBefore( const uno::Reference< text::XTextContent>& xNewContent, const uno::Reference< text::XTextContent>& xSuccessor) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -680,7 +672,6 @@ void SAL_CALL SwXText::insertTextContentAfter( const uno::Reference< text::XTextContent>& xNewContent, const uno::Reference< text::XTextContent>& xPredecessor) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -737,7 +728,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) void SAL_CALL SwXText::removeTextContentBefore( const uno::Reference< text::XTextContent>& xSuccessor) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -790,7 +780,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) void SAL_CALL SwXText::removeTextContentAfter( const uno::Reference< text::XTextContent>& xPredecessor) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -844,7 +833,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) void SAL_CALL SwXText::removeTextContent( const uno::Reference< text::XTextContent > & xContent) -throw (container::NoSuchElementException, uno::RuntimeException, std::exception) { // forward: need no solar mutex here if(!xContent.is()) @@ -857,7 +845,7 @@ throw (container::NoSuchElementException, uno::RuntimeException, std::exception) } uno::Reference< text::XText > SAL_CALL -SwXText::getText() throw (uno::RuntimeException, std::exception) +SwXText::getText() { SolarMutexGuard aGuard; @@ -866,7 +854,7 @@ SwXText::getText() throw (uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXText::getStart() throw (uno::RuntimeException, std::exception) +SwXText::getStart() { SolarMutexGuard aGuard; @@ -883,7 +871,7 @@ SwXText::getStart() throw (uno::RuntimeException, std::exception) } uno::Reference< text::XTextRange > SAL_CALL -SwXText::getEnd() throw (uno::RuntimeException, std::exception) +SwXText::getEnd() { SolarMutexGuard aGuard; @@ -899,7 +887,7 @@ SwXText::getEnd() throw (uno::RuntimeException, std::exception) return xRet; } -OUString SAL_CALL SwXText::getString() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwXText::getString() { SolarMutexGuard aGuard; @@ -915,7 +903,7 @@ OUString SAL_CALL SwXText::getString() throw (uno::RuntimeException, std::except } void SAL_CALL -SwXText::setString(const OUString& rString) throw (uno::RuntimeException, std::exception) +SwXText::setString(const OUString& rString) { SolarMutexGuard aGuard; @@ -985,7 +973,6 @@ SwXText::setString(const OUString& rString) throw (uno::RuntimeException, std::e // Only one of the pointers has to be set! bool SwXText::Impl::CheckForOwnMember( const SwPaM & rPaM) -throw (lang::IllegalArgumentException, uno::RuntimeException) { const uno::Reference<text::XTextCursor> xOwnCursor(m_rThis.CreateCursor()); @@ -1032,7 +1019,6 @@ sal_Int16 SwXText::Impl::ComparePositions( const uno::Reference<text::XTextRange>& xPos1, const uno::Reference<text::XTextRange>& xPos2) -throw (lang::IllegalArgumentException, uno::RuntimeException) { SwUnoInternalPaM aPam1(*m_pDoc); SwUnoInternalPaM aPam2(*m_pDoc); @@ -1072,7 +1058,6 @@ sal_Int16 SAL_CALL SwXText::compareRegionStarts( const uno::Reference<text::XTextRange>& xRange1, const uno::Reference<text::XTextRange>& xRange2) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1090,7 +1075,6 @@ sal_Int16 SAL_CALL SwXText::compareRegionEnds( const uno::Reference<text::XTextRange>& xRange1, const uno::Reference<text::XTextRange>& xRange2) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1105,7 +1089,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } uno::Reference< beans::XPropertySetInfo > SAL_CALL -SwXText::getPropertySetInfo() throw(uno::RuntimeException, std::exception) +SwXText::getPropertySetInfo() { SolarMutexGuard g; @@ -1117,9 +1101,6 @@ SwXText::getPropertySetInfo() throw(uno::RuntimeException, std::exception) void SAL_CALL SwXText::setPropertyValue(const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/) -throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { throw lang::IllegalArgumentException(); } @@ -1127,8 +1108,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXText::getPropertyValue( const OUString& rPropertyName) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1183,8 +1162,6 @@ void SAL_CALL SwXText::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXText::addPropertyChangeListener(): not implemented"); } @@ -1193,8 +1170,6 @@ void SAL_CALL SwXText::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXText::removePropertyChangeListener(): not implemented"); } @@ -1203,8 +1178,6 @@ void SAL_CALL SwXText::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXText::addVetoableChangeListener(): not implemented"); } @@ -1213,8 +1186,6 @@ void SAL_CALL SwXText::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) -throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL("SwXText::removeVetoableChangeListener(): not implemented"); } @@ -1231,7 +1202,6 @@ const uno::Sequence< sal_Int8 > & SwXText::getUnoTunnelId() sal_Int64 SAL_CALL SwXText::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException, std::exception) { return ::sw::UnoTunnelImpl<SwXText>(rId, this); } @@ -1239,7 +1209,6 @@ throw (uno::RuntimeException, std::exception) uno::Reference< text::XTextRange > SAL_CALL SwXText::finishParagraph( const uno::Sequence< beans::PropertyValue > & rProperties) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1250,7 +1219,6 @@ uno::Reference< text::XTextRange > SAL_CALL SwXText::finishParagraphInsert( const uno::Sequence< beans::PropertyValue > & rProperties, const uno::Reference< text::XTextRange >& xInsertPosition) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1261,7 +1229,6 @@ uno::Reference< text::XTextRange > SwXText::Impl::finishOrAppendParagraph( const uno::Sequence< beans::PropertyValue > & rProperties, const uno::Reference< text::XTextRange >& xInsertPosition) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if (!m_bIsValid) { @@ -1358,9 +1325,6 @@ SwXText::insertTextPortion( const uno::Sequence< beans::PropertyValue > & rCharacterAndParagraphProperties, const uno::Reference<text::XTextRange>& xInsertPosition) - throw (lang::IllegalArgumentException, beans::UnknownPropertyException, - beans::PropertyVetoException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1440,8 +1404,6 @@ SwXText::appendTextPortion( const OUString& rText, const uno::Sequence< beans::PropertyValue > & rCharacterAndParagraphProperties) -throw (lang::IllegalArgumentException, beans::UnknownPropertyException, - beans::PropertyVetoException, uno::RuntimeException, std::exception) { // Right now this doesn't need a guard, as it's just calling the insert // version, that has it already. @@ -1457,7 +1419,6 @@ SwXText::insertTextContentWithProperties( const uno::Sequence< beans::PropertyValue >& rCharacterAndParagraphProperties, const uno::Reference< text::XTextRange >& xInsertPosition) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1505,7 +1466,6 @@ SwXText::appendTextContent( const uno::Reference< text::XTextContent >& xTextContent, const uno::Sequence< beans::PropertyValue >& rCharacterAndParagraphProperties) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { // Right now this doesn't need a guard, as it's just calling the insert // version, that has it already. @@ -1520,8 +1480,6 @@ SwXText::convertToTextFrame( const uno::Reference< text::XTextRange >& xStart, const uno::Reference< text::XTextRange >& xEnd, const uno::Sequence< beans::PropertyValue >& rFrameProperties) - throw (lang::IllegalArgumentException, beans::UnknownPropertyException, - beans::PropertyVetoException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2207,7 +2165,6 @@ SwXText::convertToTable( const uno::Sequence< uno::Sequence< beans::PropertyValue > >& rRowProperties, const uno::Sequence< beans::PropertyValue >& rTableProperties) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2350,7 +2307,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) void SAL_CALL SwXText::copyText( const uno::Reference< text::XTextCopy >& xSource ) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2384,7 +2340,7 @@ SwXBodyText::~SwXBodyText() } OUString SAL_CALL -SwXBodyText::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXBodyText::getImplementationName() { return OUString("SwXBodyText"); } @@ -2397,13 +2353,12 @@ static char const*const g_ServicesBodyText[] = static const size_t g_nServicesBodyText(SAL_N_ELEMENTS(g_ServicesBodyText)); sal_Bool SAL_CALL SwXBodyText::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXBodyText::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXBodyText::getSupportedServiceNames() { return ::sw::GetSupportedServiceNamesImpl( g_nServicesBodyText, g_ServicesBodyText); @@ -2411,7 +2366,6 @@ SwXBodyText::getSupportedServiceNames() throw (uno::RuntimeException, std::excep uno::Any SAL_CALL SwXBodyText::queryAggregation(const uno::Type& rType) -throw (uno::RuntimeException, std::exception) { uno::Any aRet; if (rType == cppu::UnoType<container::XEnumerationAccess>::get()) @@ -2438,7 +2392,7 @@ throw (uno::RuntimeException, std::exception) } uno::Sequence< uno::Type > SAL_CALL -SwXBodyText::getTypes() throw (uno::RuntimeException, std::exception) +SwXBodyText::getTypes() { const uno::Sequence< uno::Type > aTypes = SwXBodyText_Base::getTypes(); const uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes(); @@ -2446,14 +2400,13 @@ SwXBodyText::getTypes() throw (uno::RuntimeException, std::exception) } uno::Sequence< sal_Int8 > SAL_CALL -SwXBodyText::getImplementationId() throw (uno::RuntimeException, std::exception) +SwXBodyText::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } uno::Any SAL_CALL SwXBodyText::queryInterface(const uno::Type& rType) -throw (uno::RuntimeException, std::exception) { const uno::Any ret = SwXText::queryInterface(rType); return (ret.getValueType() == cppu::UnoType<void>::get()) @@ -2490,7 +2443,7 @@ SwXTextCursor * SwXBodyText::CreateTextCursor(const bool bIgnoreTables) } uno::Reference< text::XTextCursor > SAL_CALL -SwXBodyText::createTextCursor() throw (uno::RuntimeException, std::exception) +SwXBodyText::createTextCursor() { SolarMutexGuard aGuard; @@ -2508,7 +2461,6 @@ SwXBodyText::createTextCursor() throw (uno::RuntimeException, std::exception) uno::Reference< text::XTextCursor > SAL_CALL SwXBodyText::createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2553,7 +2505,6 @@ throw (uno::RuntimeException, std::exception) uno::Reference< container::XEnumeration > SAL_CALL SwXBodyText::createEnumeration() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2572,13 +2523,13 @@ throw (uno::RuntimeException, std::exception) } uno::Type SAL_CALL -SwXBodyText::getElementType() throw (uno::RuntimeException, std::exception) +SwXBodyText::getElementType() { return cppu::UnoType<text::XTextRange>::get(); } sal_Bool SAL_CALL -SwXBodyText::hasElements() throw (uno::RuntimeException, std::exception) +SwXBodyText::hasElements() { SolarMutexGuard aGuard; @@ -2665,7 +2616,7 @@ SwXHeadFootText::~SwXHeadFootText() } OUString SAL_CALL -SwXHeadFootText::getImplementationName() throw (uno::RuntimeException, std::exception) +SwXHeadFootText::getImplementationName() { return OUString("SwXHeadFootText"); } @@ -2676,13 +2627,12 @@ static char const*const g_ServicesHeadFootText[] = }; sal_Bool SAL_CALL SwXHeadFootText::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXHeadFootText::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +SwXHeadFootText::getSupportedServiceNames() { return ::sw::GetSupportedServiceNamesImpl( SAL_N_ELEMENTS(g_ServicesHeadFootText), @@ -2705,13 +2655,13 @@ const SwStartNode *SwXHeadFootText::GetStartNode() const } uno::Reference< text::XTextCursor > -SwXHeadFootText::CreateCursor() throw (uno::RuntimeException) +SwXHeadFootText::CreateCursor() { return createTextCursor(); } uno::Sequence< uno::Type > SAL_CALL -SwXHeadFootText::getTypes() throw (uno::RuntimeException, std::exception) +SwXHeadFootText::getTypes() { const uno::Sequence< uno::Type > aTypes = SwXHeadFootText_Base::getTypes(); const uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes(); @@ -2719,14 +2669,13 @@ SwXHeadFootText::getTypes() throw (uno::RuntimeException, std::exception) } uno::Sequence< sal_Int8 > SAL_CALL -SwXHeadFootText::getImplementationId() throw (uno::RuntimeException, std::exception) +SwXHeadFootText::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } uno::Any SAL_CALL SwXHeadFootText::queryInterface(const uno::Type& rType) -throw (uno::RuntimeException, std::exception) { const uno::Any ret = SwXHeadFootText_Base::queryInterface(rType); return (ret.getValueType() == cppu::UnoType<void>::get()) @@ -2735,7 +2684,7 @@ throw (uno::RuntimeException, std::exception) } uno::Reference< text::XTextCursor > SAL_CALL -SwXHeadFootText::createTextCursor() throw (uno::RuntimeException, std::exception) +SwXHeadFootText::createTextCursor() { SolarMutexGuard aGuard; @@ -2783,7 +2732,6 @@ SwXHeadFootText::createTextCursor() throw (uno::RuntimeException, std::exception uno::Reference< text::XTextCursor > SAL_CALL SwXHeadFootText::createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2818,7 +2766,6 @@ throw (uno::RuntimeException, std::exception) uno::Reference< container::XEnumeration > SAL_CALL SwXHeadFootText::createEnumeration() -throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2834,12 +2781,12 @@ throw (uno::RuntimeException, std::exception) } uno::Type SAL_CALL -SwXHeadFootText::getElementType() throw (uno::RuntimeException, std::exception) +SwXHeadFootText::getElementType() { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SAL_CALL SwXHeadFootText::hasElements() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXHeadFootText::hasElements() { return true; } diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index 933881085af8..df76dc9708dd 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -82,7 +82,7 @@ const ModelToViewHelper& SwXTextMarkup::GetConversionMap() return m_pImpl->m_ConversionMap; } -uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfoContainer() throw (uno::RuntimeException, std::exception) +uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfoContainer() { SolarMutexGuard aGuard; @@ -91,7 +91,7 @@ uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfo } void SAL_CALL SwXTextMarkup::commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const uno::Reference< text::XTextRange> & xRange, - const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) throw (uno::RuntimeException, std::exception) + const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) { SolarMutexGuard aGuard; @@ -138,7 +138,6 @@ void SAL_CALL SwXTextMarkup::commitStringMarkup( ::sal_Int32 nStart, ::sal_Int32 nLength, const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -386,7 +385,6 @@ static void lcl_commitGrammarMarkUp( void SAL_CALL SwXTextMarkup::commitMultiTextMarkup( const uno::Sequence< text::TextMarkupDescriptor > &rMarkups ) -throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -491,7 +489,7 @@ SwXStringKeyMap::SwXStringKeyMap() { } -uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString & aKey) throw (uno::RuntimeException, container::NoSuchElementException, std::exception) +uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString & aKey) { std::map< OUString, uno::Any >::const_iterator aIter = maMap.find( aKey ); if ( aIter == maMap.end() ) @@ -500,12 +498,12 @@ uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString & aKey) throw (uno::R return (*aIter).second; } -sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const OUString & aKey) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const OUString & aKey) { return maMap.find( aKey ) != maMap.end(); } -void SAL_CALL SwXStringKeyMap::insertValue(const OUString & aKey, const uno::Any & aValue) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException, std::exception) +void SAL_CALL SwXStringKeyMap::insertValue(const OUString & aKey, const uno::Any & aValue) { std::map< OUString, uno::Any >::const_iterator aIter = maMap.find( aKey ); if ( aIter != maMap.end() ) @@ -514,12 +512,12 @@ void SAL_CALL SwXStringKeyMap::insertValue(const OUString & aKey, const uno::Any maMap[ aKey ] = aValue; } -::sal_Int32 SAL_CALL SwXStringKeyMap::getCount() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwXStringKeyMap::getCount() { return maMap.size(); } -OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) +OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) { if ( (sal_uInt32)nIndex >= maMap.size() ) throw lang::IndexOutOfBoundsException(); @@ -527,7 +525,7 @@ OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) throw (uno: return OUString(); } -uno::Any SAL_CALL SwXStringKeyMap::getValueByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) +uno::Any SAL_CALL SwXStringKeyMap::getValueByIndex(::sal_Int32 nIndex) { if ( (sal_uInt32)nIndex >= maMap.size() ) throw lang::IndexOutOfBoundsException(); diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index f5d425bb4afb..8e75a53b4be3 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -380,30 +380,25 @@ public: // UNO Anbindung // XImageConsumer - virtual void SAL_CALL init( sal_Int32 Width, sal_Int32 Height) - throw( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL init( sal_Int32 Width, sal_Int32 Height) override; virtual void SAL_CALL setColorModel( sal_Int16 BitCount, const uno::Sequence< sal_Int32 >& RGBAPal, sal_Int32 RedMask, sal_Int32 GreenMask, sal_Int32 BlueMask, - sal_Int32 AlphaMask) - throw( uno::RuntimeException, std::exception ) override; + sal_Int32 AlphaMask) override; virtual void SAL_CALL setPixelsByBytes( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, const uno::Sequence< sal_Int8 >& ProducerData, - sal_Int32 Offset, sal_Int32 Scansize) - throw( uno::RuntimeException, std::exception ) override; + sal_Int32 Offset, sal_Int32 Scansize) override; virtual void SAL_CALL setPixelsByLongs( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, const uno::Sequence< sal_Int32 >& ProducerData, - sal_Int32 Offset, sal_Int32 Scansize) - throw( uno::RuntimeException, std::exception ) override; + sal_Int32 Offset, sal_Int32 Scansize) override; virtual void SAL_CALL complete( sal_Int32 Status, - const uno::Reference< awt::XImageProducer > & Producer) - throw( uno::RuntimeException, std::exception ) override; + const uno::Reference< awt::XImageProducer > & Producer) override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw ( uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; }; SwHTMLImageWatcher::SwHTMLImageWatcher( @@ -448,7 +443,6 @@ void SwHTMLImageWatcher::clear() } void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height ) - throw( uno::RuntimeException, std::exception ) { OSL_ENSURE( bSetWidth || bSetHeight, "Breite oder Hoehe muss angepasst werden" ); @@ -549,27 +543,23 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height ) void SwHTMLImageWatcher::setColorModel( sal_Int16, const Sequence< sal_Int32 >&, sal_Int32, sal_Int32, sal_Int32, sal_Int32 ) - throw( uno::RuntimeException, std::exception ) { } void SwHTMLImageWatcher::setPixelsByBytes( sal_Int32, sal_Int32, sal_Int32, sal_Int32, const Sequence< sal_Int8 >&, sal_Int32, sal_Int32 ) - throw( uno::RuntimeException, std::exception ) { } void SwHTMLImageWatcher::setPixelsByLongs( sal_Int32, sal_Int32, sal_Int32, sal_Int32, const Sequence< sal_Int32 >&, sal_Int32, sal_Int32 ) - throw( uno::RuntimeException, std::exception ) { } void SwHTMLImageWatcher::complete( sal_Int32 Status, const uno::Reference< awt::XImageProducer >& ) - throw( uno::RuntimeException, std::exception ) { if( awt::ImageStatus::IMAGESTATUS_ERROR == Status || awt::ImageStatus::IMAGESTATUS_ABORTED == Status ) { @@ -580,7 +570,7 @@ void SwHTMLImageWatcher::complete( sal_Int32 Status, } } -void SwHTMLImageWatcher::disposing(const lang::EventObject& evt) throw ( uno::RuntimeException, std::exception) +void SwHTMLImageWatcher::disposing(const lang::EventObject& evt) { uno::Reference< awt::XImageConsumer > xTmp; diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index 6b4d1b016c3c..fe6b8abdff29 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -89,7 +89,7 @@ OUString DocxExport_getImplementationName() return OUString( IMPL_NAME ); } -OUString DocxExportFilter::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString DocxExportFilter::getImplementationName() { return DocxExport_getImplementationName(); } @@ -100,7 +100,7 @@ uno::Sequence< OUString > SAL_CALL DocxExport_getSupportedServiceNames() throw() } /// @throws uno::Exception -uno::Reference< uno::XInterface > SAL_CALL DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) throw( uno::Exception ) +uno::Reference< uno::XInterface > SAL_CALL DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) { return static_cast<cppu::OWeakObject*>(new DocxExportFilter( xCtx )); } diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index 983c8d7f83c3..0efcc51c79fe 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.hxx @@ -43,7 +43,7 @@ public: virtual bool exportDocument() override; private: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual ::oox::ole::VbaProject* implCreateVbaProject() const override { diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index f09a8c525702..5da1c7329838 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -38,7 +38,7 @@ RtfExportFilter::RtfExportFilter(const uno::Reference< uno::XComponentContext >& RtfExportFilter::~RtfExportFilter() = default; -sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor) throw(uno::RuntimeException, std::exception) +sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor) { utl::MediaDescriptor aMediaDesc = aDescriptor; uno::Reference<io::XStream> xStream = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STREAMFOROUTPUT(), uno::Reference< io::XStream >()); @@ -87,11 +87,11 @@ sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& aD return true; } -void RtfExportFilter::cancel() throw(uno::RuntimeException, std::exception) +void RtfExportFilter::cancel() { } -void RtfExportFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) +void RtfExportFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc) { m_xSrcDoc = xDoc; } @@ -108,7 +108,7 @@ uno::Sequence< OUString > SAL_CALL RtfExport_getSupportedServiceNames() throw() return uno::Sequence< OUString > { "com.sun.star.document.ExportFilter" }; } -uno::Reference< uno::XInterface > SAL_CALL RtfExport_createInstance(const uno::Reference< uno::XComponentContext >& xCtx) throw(uno::Exception) +uno::Reference< uno::XInterface > SAL_CALL RtfExport_createInstance(const uno::Reference< uno::XComponentContext >& xCtx) { return static_cast<cppu::OWeakObject*>(new RtfExportFilter(xCtx)); } diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx index 13921975b1f6..842ac77738af 100644 --- a/sw/source/filter/ww8/rtfexportfilter.hxx +++ b/sw/source/filter/ww8/rtfexportfilter.hxx @@ -51,12 +51,11 @@ public: virtual ~RtfExportFilter() override; // XFilter - virtual sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) override; + virtual void SAL_CALL cancel() override; // XExporter - virtual void SAL_CALL setSourceDocument(const css::uno::Reference<css::lang::XComponent>& xDoc) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument(const css::uno::Reference<css::lang::XComponent>& xDoc) override; RtfWriter m_aWriter; }; @@ -64,7 +63,7 @@ public: OUString RtfExport_getImplementationName(); css::uno::Sequence<OUString> SAL_CALL RtfExport_getSupportedServiceNames() throw(); /// @throws css::uno::Exception -css::uno::Reference<css::uno::XInterface> SAL_CALL RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx) throw(css::uno::Exception); +css::uno::Reference<css::uno::XInterface> SAL_CALL RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx); #define IMPL_NAME_RTFEXPORT "com.sun.star.comp.Writer.RtfExport" diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index e1b73dfe8131..fe873b616b6d 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -234,7 +234,6 @@ namespace sw <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ template<class T> const T & item_cast(const SfxPoolItem &rItem) - throw(std::bad_cast) { if (dynamic_cast<const T *>(&rItem) == nullptr) throw std::bad_cast(); @@ -290,7 +289,7 @@ namespace sw <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ template<class T> const T & ItemGet(const SwContentNode &rNode, - sal_uInt16 eType) throw(std::bad_cast) + sal_uInt16 eType) { return item_cast<T>(rNode.GetAttr(eType)); } @@ -319,7 +318,7 @@ namespace sw <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ template<class T> const T & ItemGet(const SwFormat &rFormat, - sal_uInt16 eType) throw(std::bad_cast, css::uno::RuntimeException) + sal_uInt16 eType) { return item_cast<T>(rFormat.GetFormatAttr(eType)); } @@ -350,7 +349,7 @@ namespace sw <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ template<class T> const T & ItemGet(const SfxItemSet &rSet, - sal_uInt16 eType) throw(std::bad_cast) + sal_uInt16 eType) { return item_cast<T>(rSet.Get(eType)); } @@ -385,7 +384,7 @@ namespace sw <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ template<class T> const T & DefaultItemGet(const SfxItemPool &rPool, - sal_uInt16 eType) throw(std::bad_cast) + sal_uInt16 eType) { return item_cast<T>(rPool.GetDefaultItem(eType)); } @@ -421,7 +420,7 @@ namespace sw <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> */ template<class T> const T & DefaultItemGet(const SwDoc &rDoc, - sal_uInt16 eType) throw(std::bad_cast) + sal_uInt16 eType) { return DefaultItemGet<T>(rDoc.GetAttrPool(), eType); } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 483aefb85611..741af3e66d26 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -499,7 +499,6 @@ const Sequence< sal_Int8 > & SwXMLExport::getUnoTunnelId() throw() } sal_Int64 SAL_CALL SwXMLExport::getSomething( const Sequence< sal_Int8 >& rId ) - throw(RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index bc1ced23c22b..c08b0e2b33b0 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -126,7 +126,7 @@ public: // XUnoTunnel static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; const SwDoc* getDoc() const; SwDoc* getDoc(); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 880d96ff650f..dae5ed530470 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -426,7 +426,6 @@ const Sequence< sal_Int8 > & SwXMLImport::getUnoTunnelId() throw() } sal_Int64 SAL_CALL SwXMLImport::getSomething( const Sequence< sal_Int8 >& rId ) - throw(RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -450,9 +449,6 @@ static OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCurso } void SwXMLImport::startDocument() - throw (xml::sax::SAXException, - uno::RuntimeException, - std::exception) { // delegate to parent SvXMLImport::startDocument(); @@ -668,7 +664,6 @@ void SwXMLImport::startDocument() } void SwXMLImport::endDocument() - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { OSL_ENSURE( GetModel().is(), "model missing; maybe startDocument wasn't called?" ); if( !GetModel().is() ) @@ -1418,7 +1413,6 @@ void SwXMLImport::SetDocumentSpecificSettings( void SwXMLImport::initialize( const Sequence<Any>& aArguments ) - throw( uno::Exception, uno::RuntimeException, std::exception) { // delegate to super class SvXMLImport::initialize(aArguments); diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 621f35b5873b..ee6395994d90 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -120,19 +120,15 @@ public: virtual ~SwXMLImport() throw() override; // css::xml::sax::XDocumentHandler - virtual void SAL_CALL startDocument() - throw (css::xml::sax::SAXException, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL endDocument() - throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL startDocument() override; + virtual void SAL_CALL endDocument() override; // XUnoTunnel static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; // 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; void InsertStyles( bool bAuto ); void FinishStyles(); diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 570331019342..a64ab5cab11a 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -90,15 +90,15 @@ class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper public: explicit SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg); - virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; }; SwXSelChgLstnr_Impl::SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg) : rParent(rParentDlg) {} -void SwXSelChgLstnr_Impl::selectionChanged( const EventObject& ) throw (RuntimeException, std::exception) +void SwXSelChgLstnr_Impl::selectionChanged( const EventObject& ) { //call the parent to enable selection mode Sequence <Any> aSelection; @@ -115,7 +115,7 @@ void SwXSelChgLstnr_Impl::selectionChanged( const EventObject& ) throw (Runtime } } -void SwXSelChgLstnr_Impl::disposing( const EventObject& ) throw (RuntimeException, std::exception) +void SwXSelChgLstnr_Impl::disposing( const EventObject& ) { OSL_FAIL("disposing"); } diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index 765bd86a3f31..44d5c205eb6a 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -42,7 +42,7 @@ SwFilterDetect::~SwFilterDetect() { } -OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) { MediaDescriptor aMediaDesc( lDescriptor ); OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME(), OUString() ); @@ -111,19 +111,19 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor } /* XServiceInfo */ -OUString SAL_CALL SwFilterDetect::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SwFilterDetect::getImplementationName() { return OUString("com.sun.star.comp.writer.FormatDetector" ); } /* XServiceInfo */ -sal_Bool SAL_CALL SwFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SwFilterDetect::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } /* XServiceInfo */ -Sequence< OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() { Sequence< OUString > seqServiceNames( 3 ); seqServiceNames.getArray() [0] = "com.sun.star.frame.ExtendedTypeDetection"; diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx index bd5e5a6357d4..e861b598c24b 100644 --- a/sw/source/ui/uno/swdetect.hxx +++ b/sw/source/ui/uno/swdetect.hxx @@ -57,12 +57,12 @@ public: virtual ~SwFilterDetect() override; /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual 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& sServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XExtendedFilterDetect - virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override; }; #endif diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx index d225416100cf..deb7734d3a6d 100644 --- a/sw/source/ui/vba/vbaaddin.cxx +++ b/sw/source/ui/vba/vbaaddin.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL ) throw ( uno::RuntimeException ) : +SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL ) : SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbInstalled( true ) { } @@ -34,7 +34,7 @@ SwVbaAddin::~SwVbaAddin() { } -OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwVbaAddin::getName() { OUString sName; INetURLObject aURL( msFileURL ); @@ -43,29 +43,29 @@ OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException, std::excep } void SAL_CALL -SwVbaAddin::setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ) +SwVbaAddin::setName( const OUString& ) { throw uno::RuntimeException(" Fail to set name" ); } -OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwVbaAddin::getPath() { INetURLObject aURL( msFileURL ); aURL.CutLastName(); return aURL.GetURLPath(); } -sal_Bool SAL_CALL SwVbaAddin::getAutoload() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaAddin::getAutoload() { return true; } -sal_Bool SAL_CALL SwVbaAddin::getInstalled() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaAddin::getInstalled() { return mbInstalled; } -void SAL_CALL SwVbaAddin::setInstalled( sal_Bool _installed ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaAddin::setInstalled( sal_Bool _installed ) { if( bool(_installed) != mbInstalled ) { diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index e5a779f7ab22..7b66b6ba6218 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -32,16 +32,16 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL ) throw ( css::uno::RuntimeException ); + SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL ); virtual ~SwVbaAddin() override; // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInstalled( sal_Bool _installed ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& _name ) override; + virtual OUString SAL_CALL getPath() override; + virtual sal_Bool SAL_CALL getAutoload() override; + virtual sal_Bool SAL_CALL getInstalled() override; + virtual void SAL_CALL setInstalled( sal_Bool _installed ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 8a5a4656072f..d00a658cdf0a 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -57,17 +57,17 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u return xAddinsAccess; } -SwVbaAddins::SwVbaAddins( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext ) throw (uno::RuntimeException): SwVbaAddins_BASE( xParent, xContext, lcl_getAddinCollection( xParent,xContext ) ) +SwVbaAddins::SwVbaAddins( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext ): SwVbaAddins_BASE( xParent, xContext, lcl_getAddinCollection( xParent,xContext ) ) { } // XEnumerationAccess uno::Type -SwVbaAddins::getElementType() throw (uno::RuntimeException) +SwVbaAddins::getElementType() { return cppu::UnoType<word::XAddin>::get(); } uno::Reference< container::XEnumeration > -SwVbaAddins::createEnumeration() throw (uno::RuntimeException) +SwVbaAddins::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return xEnumerationAccess->createEnumeration(); diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx index 624aaea2404f..017014ef6f32 100644 --- a/sw/source/ui/vba/vbaaddins.hxx +++ b/sw/source/ui/vba/vbaaddins.hxx @@ -29,11 +29,11 @@ class SwVbaAddins : public SwVbaAddins_BASE { public: /// @throws css::uno::RuntimeException - SwVbaAddins( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext ) throw (css::uno::RuntimeException); + SwVbaAddins( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaAddins_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index 6922ccee9867..282ca8979bfd 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -47,19 +47,19 @@ SwVbaApplication::~SwVbaApplication() } OUString SAL_CALL -SwVbaApplication::getName() throw (uno::RuntimeException, std::exception) +SwVbaApplication::getName() { return OUString("Microsoft Word" ); } uno::Reference< word::XDocument > SAL_CALL -SwVbaApplication::getActiveDocument() throw (uno::RuntimeException, std::exception) +SwVbaApplication::getActiveDocument() { return new SwVbaDocument( this, mxContext, getCurrentDocument() ); } uno::Reference< word::XWindow > SAL_CALL -SwVbaApplication::getActiveWindow() throw (uno::RuntimeException, std::exception) +SwVbaApplication::getActiveWindow() { // #FIXME so far can't determine Parent uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_SET_THROW ); @@ -68,31 +68,31 @@ SwVbaApplication::getActiveWindow() throw (uno::RuntimeException, std::exception } uno::Reference<word::XSystem > SAL_CALL -SwVbaApplication::getSystem() throw (uno::RuntimeException, std::exception) +SwVbaApplication::getSystem() { return uno::Reference< word::XSystem >( new SwVbaSystem( mxContext ) ); } uno::Reference<word::XOptions > SAL_CALL -SwVbaApplication::getOptions() throw (uno::RuntimeException, std::exception) +SwVbaApplication::getOptions() { return uno::Reference< word::XOptions >( new SwVbaOptions( mxContext ) ); } uno::Any SAL_CALL -SwVbaApplication::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +SwVbaApplication::CommandBars( const uno::Any& aIndex ) { return VbaApplicationBase::CommandBars( aIndex ); } uno::Reference< word::XSelection > SAL_CALL -SwVbaApplication::getSelection() throw (uno::RuntimeException, std::exception) +SwVbaApplication::getSelection() { return new SwVbaSelection( this, mxContext, getCurrentDocument() ); } uno::Any SAL_CALL -SwVbaApplication::Documents( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaApplication::Documents( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaDocuments( this, mxContext ) ); if ( index.hasValue() ) @@ -101,7 +101,7 @@ SwVbaApplication::Documents( const uno::Any& index ) throw (uno::RuntimeExceptio } uno::Any SAL_CALL -SwVbaApplication::Addins( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaApplication::Addins( const uno::Any& index ) { static uno::Reference< XCollection > xCol( new SwVbaAddins( this, mxContext ) ); if ( index.hasValue() ) @@ -110,7 +110,7 @@ SwVbaApplication::Addins( const uno::Any& index ) throw (uno::RuntimeException, } uno::Any SAL_CALL -SwVbaApplication::Dialogs( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaApplication::Dialogs( const uno::Any& index ) { uno::Reference< word::XDialogs > xCol( new SwVbaDialogs( this, mxContext, getCurrentDocument() )); if ( index.hasValue() ) @@ -119,7 +119,7 @@ SwVbaApplication::Dialogs( const uno::Any& index ) throw (uno::RuntimeException, } uno::Any SAL_CALL -SwVbaApplication::ListGalleries( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaApplication::ListGalleries( const uno::Any& index ) { uno::Reference< text::XTextDocument > xTextDoc( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xCol( new SwVbaListGalleries( this, mxContext, xTextDoc ) ); @@ -128,34 +128,34 @@ SwVbaApplication::ListGalleries( const uno::Any& index ) throw (uno::RuntimeExce return uno::makeAny( xCol ); } -sal_Bool SAL_CALL SwVbaApplication::getDisplayAutoCompleteTips() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaApplication::getDisplayAutoCompleteTips() { return SvxAutoCorrCfg::Get().IsAutoTextTip(); } -void SAL_CALL SwVbaApplication::setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaApplication::setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) { SvxAutoCorrCfg::Get().SetAutoTextTip( _displayAutoCompleteTips ); } -sal_Int32 SAL_CALL SwVbaApplication::getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwVbaApplication::getEnableCancelKey() { // the default value is wdCancelInterrupt in Word return word::WdEnableCancelKey::wdCancelInterrupt; } -void SAL_CALL SwVbaApplication::setEnableCancelKey( sal_Int32/* _enableCancelKey */) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaApplication::setEnableCancelKey( sal_Int32/* _enableCancelKey */) { // seems not supported in Writer } -float SAL_CALL SwVbaApplication::CentimetersToPoints( float Centimeters ) throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaApplication::CentimetersToPoints( float Centimeters ) { return VbaApplicationBase::CentimetersToPoints( Centimeters ); } uno::Reference< frame::XModel > -SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException) +SwVbaApplication::getCurrentDocument() { return getCurrentWordDoc( mxContext ); } diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 63b33d125df2..7a2fc9bd37ad 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -40,27 +40,27 @@ public: virtual ~SwVbaApplication() override; // XApplication - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL CentimetersToPoints( float Centimeters ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() override; + virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() override; + virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() override; + virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() override; + virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() override; + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) override; + virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() override; + virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) override; + virtual sal_Int32 SAL_CALL getEnableCancelKey() override; + virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) override; + virtual float SAL_CALL CentimetersToPoints( float Centimeters ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; protected: - virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() override; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAAPPLICATION_HXX diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index e846ef35a4d8..e6bd1fd457f3 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -26,7 +26,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaAutoTextEntry::SwVbaAutoTextEntry( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XAutoTextEntry >& xEntry ) throw ( uno::RuntimeException ) : +SwVbaAutoTextEntry::SwVbaAutoTextEntry( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XAutoTextEntry >& xEntry ) : SwVbaAutoTextEntry_BASE( rParent, rContext ), mxEntry( xEntry ) { } @@ -35,7 +35,7 @@ SwVbaAutoTextEntry::~SwVbaAutoTextEntry() { } -uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& _richtext ) throw ( uno::RuntimeException, std::exception ) +uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& _richtext ) { SwVbaRange* pWhere = dynamic_cast<SwVbaRange*>( _where.get() ); if( pWhere ) @@ -93,18 +93,18 @@ SwVbaAutoTextEntry::getServiceNames() return aServiceNames; } -SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ) +SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ) { } // XEnumerationAccess uno::Type -SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException) +SwVbaAutoTextEntries::getElementType() { return cppu::UnoType<word::XAutoTextEntry>::get(); } uno::Reference< container::XEnumeration > -SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException) +SwVbaAutoTextEntries::createEnumeration() { throw uno::RuntimeException("Not implemented" ); } diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index ff249b327f26..08d82b5d9220 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -35,11 +35,11 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaAutoTextEntry( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XAutoTextEntry >& xEntry ) throw ( css::uno::RuntimeException ); + SwVbaAutoTextEntry( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XAutoTextEntry >& xEntry ); virtual ~SwVbaAutoTextEntry() override; // XAutoTextEntry - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) override; // XHelperInterface virtual OUString getServiceImplName() override; @@ -52,11 +52,11 @@ class SwVbaAutoTextEntries : public SwVbaAutoTextEntries_BASE { public: /// @throws css::uno::RuntimeException - SwVbaAutoTextEntries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw (css::uno::RuntimeException); + SwVbaAutoTextEntries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaAutoTextEntries_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx index 17891937a387..02a806413e7d 100644 --- a/sw/source/ui/vba/vbabookmark.cxx +++ b/sw/source/ui/vba/vbabookmark.cxx @@ -32,7 +32,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; SwVbaBookmark::SwVbaBookmark( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, - const css::uno::Reference< frame::XModel >& rModel, const OUString& rBookmarkName ) throw ( css::uno::RuntimeException ) : + const css::uno::Reference< frame::XModel >& rModel, const OUString& rBookmarkName ) : SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maBookmarkName( rBookmarkName ), mbValid( true ) { uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( mxModel, uno::UNO_QUERY_THROW ); @@ -43,13 +43,13 @@ SwVbaBookmark::~SwVbaBookmark() { } -void SwVbaBookmark::checkVality() throw ( uno::RuntimeException ) +void SwVbaBookmark::checkVality() { if( !mbValid ) throw uno::RuntimeException("The bookmark is not valid" ); } -void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException, std::exception ) +void SAL_CALL SwVbaBookmark::Delete() { checkVality(); uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW ); @@ -57,25 +57,25 @@ void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException, std::except mbValid = false; } -void SAL_CALL SwVbaBookmark::Select() throw ( uno::RuntimeException, std::exception ) +void SAL_CALL SwVbaBookmark::Select() { checkVality(); uno::Reference< view::XSelectionSupplier > xSelectSupp( mxModel->getCurrentController(), uno::UNO_QUERY_THROW ); xSelectSupp->select( uno::makeAny( mxBookmark ) ); } -OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException, std::exception ) +OUString SAL_CALL SwVbaBookmark::getName() { return maBookmarkName; } -void SAL_CALL SwVbaBookmark::setName( const OUString& _name ) throw ( uno::RuntimeException, std::exception ) +void SAL_CALL SwVbaBookmark::setName( const OUString& _name ) { uno::Reference< container::XNamed > xNamed( mxBookmark, uno::UNO_QUERY_THROW ); xNamed->setName( _name ); } -uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL SwVbaBookmark::Range() { uno::Reference< text::XTextContent > xTextContent( mxBookmark, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index d963db155def..ab91b7333bfc 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -36,20 +36,20 @@ private: private: /// @throws css::uno::RuntimeException - void checkVality() throw ( css::uno::RuntimeException ); + void checkVality(); public: /// @throws css::uno::RuntimeException SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rName ) throw ( css::uno::RuntimeException ); + const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rName ); virtual ~SwVbaBookmark() override; // Methods - virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& ) override; + virtual void SAL_CALL Delete() override; + virtual void SAL_CALL Select() override; + virtual css::uno::Any SAL_CALL Range() override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index dc095523043f..ca1cbe14ed01 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -36,9 +36,9 @@ class BookmarksEnumeration : public EnumerationHelperImpl uno::Reference< frame::XModel > mxModel; public: /// @throws uno::RuntimeException - BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ) {} + BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); OUString aName = xNamed->getName(); @@ -57,25 +57,25 @@ private: uno::Any cachePos; public: /// @throws uno::RuntimeException - explicit BookmarkCollectionHelper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : mxIndexAccess( xIndexAccess ) + explicit BookmarkCollectionHelper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ) { mxNameAccess.set( mxIndexAccess, uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return mxIndexAccess->getElementType(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return mxIndexAccess->hasElements(); } + virtual uno::Type SAL_CALL getElementType( ) override { return mxIndexAccess->getElementType(); } + virtual sal_Bool SAL_CALL hasElements( ) override { return mxIndexAccess->hasElements(); } // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return cachePos; } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { return mxNameAccess->getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { if( mxNameAccess->hasByName( aName ) ) { @@ -98,11 +98,11 @@ public: return false; } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return mxIndexAccess->getCount(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { return mxIndexAccess->getByIndex( Index ); } @@ -115,12 +115,12 @@ SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParen } // XEnumerationAccess uno::Type -SwVbaBookmarks::getElementType() throw (uno::RuntimeException) +SwVbaBookmarks::getElementType() { return cppu::UnoType<word::XBookmark>::get(); } uno::Reference< container::XEnumeration > -SwVbaBookmarks::createEnumeration() throw (uno::RuntimeException) +SwVbaBookmarks::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return new BookmarksEnumeration( getParent(), mxContext,xEnumAccess->createEnumeration(), mxModel ); @@ -134,13 +134,13 @@ SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) ); } -void SwVbaBookmarks::removeBookmarkByName( const OUString& rName ) throw (uno::RuntimeException) +void SwVbaBookmarks::removeBookmarkByName( const OUString& rName ) { uno::Reference< text::XTextContent > xBookmark( m_xNameAccess->getByName( rName ), uno::UNO_QUERY_THROW ); word::getXTextViewCursor( mxModel )->getText()->removeTextContent( xBookmark ); } -void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException) +void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) { uno::Reference< lang::XMultiServiceFactory > xDocMSF( xModel, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance("com.sun.star.text.Bookmark"), uno::UNO_QUERY_THROW ); @@ -150,7 +150,7 @@ void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& x } uno::Any SAL_CALL -SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException, std::exception) +SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange ) { uno::Reference< text::XTextRange > xTextRange; uno::Reference< word::XRange > xRange; @@ -176,31 +176,31 @@ SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange ) throw (uno: } sal_Int32 SAL_CALL -SwVbaBookmarks::getDefaultSorting() throw (css::uno::RuntimeException, std::exception) +SwVbaBookmarks::getDefaultSorting() { return word::WdBookmarkSortBy::wdSortByName; } void SAL_CALL -SwVbaBookmarks::setDefaultSorting( sal_Int32/* _type*/ ) throw (css::uno::RuntimeException, std::exception) +SwVbaBookmarks::setDefaultSorting( sal_Int32/* _type*/ ) { // not support in Writer } sal_Bool SAL_CALL -SwVbaBookmarks::getShowHidden() throw (css::uno::RuntimeException, std::exception) +SwVbaBookmarks::getShowHidden() { return true; } void SAL_CALL -SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeException, std::exception) +SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) { // not support in Writer } sal_Bool SAL_CALL -SwVbaBookmarks::Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) +SwVbaBookmarks::Exists( const OUString& rName ) { bool bExist = m_xNameAccess->hasByName( rName ); return bExist; diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx index 234223277e87..4035b6010316 100644 --- a/sw/source/ui/vba/vbabookmarks.hxx +++ b/sw/source/ui/vba/vbabookmarks.hxx @@ -38,16 +38,16 @@ private: private: /// @throws css::uno::RuntimeException - void removeBookmarkByName( const OUString& rName ) throw (css::uno::RuntimeException); + void removeBookmarkByName( const OUString& rName ); public: SwVbaBookmarks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xBookmarks, const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException); + static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaBookmarks_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; @@ -55,13 +55,13 @@ public: virtual css::uno::Sequence<OUString> getServiceNames() override; // XBookmarks - virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDefaultSorting() override; + virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) override; + virtual sal_Bool SAL_CALL getShowHidden() override; + virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) override; - virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) override; + virtual sal_Bool SAL_CALL Exists( const OUString& rName ) override; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBABOOKMARKS_HXX diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index b301ba244866..552cfaf294bf 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -150,7 +150,7 @@ protected: public: SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType ) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ) {} - uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) override + uno::Any SAL_CALL getLineStyle() override { sal_Int32 nLineStyle = word::WdLineStyle::wdLineStyleNone; table::BorderLine aBorderLine; @@ -171,7 +171,7 @@ public: } return uno::makeAny( nLineStyle ); } - void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) override + void SAL_CALL setLineStyle( const uno::Any& _linestyle ) override { // Urk no choice but to silently ignore we don't support this attribute // #TODO would be nice to support the word line styles @@ -251,11 +251,11 @@ public: { } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return SAL_N_ELEMENTS( supportedIndexTable ); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { sal_Int32 nIndex = getTableIndex( Index ); @@ -266,11 +266,11 @@ public: } throw lang::IndexOutOfBoundsException(); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<word::XBorder>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } @@ -288,12 +288,12 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); @@ -308,7 +308,7 @@ SwVbaBorders::SwVbaBorders( const uno::Reference< XHelperInterface >& xParent, c } uno::Reference< container::XEnumeration > -SwVbaBorders::createEnumeration() throw (uno::RuntimeException) +SwVbaBorders::createEnumeration() { return new RangeBorderEnumWrapper( m_xIndexAccess ); } @@ -320,24 +320,24 @@ SwVbaBorders::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -SwVbaBorders::getElementType() throw (uno::RuntimeException) +SwVbaBorders::getElementType() { return cppu::UnoType<word::XBorders>::get(); } uno::Any -SwVbaBorders::getItemByIntIndex( const sal_Int32 nIndex ) throw (uno::RuntimeException) +SwVbaBorders::getItemByIntIndex( const sal_Int32 nIndex ) { return createCollectionObject( m_xIndexAccess->getByIndex( nIndex ) ); } -sal_Bool SAL_CALL SwVbaBorders::getShadow() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaBorders::getShadow() { // always return False for table border in MS Word return false; } -void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) { // not support in Table border in Word // TODO: diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx index faf2d6ebd311..45364e3c5f59 100644 --- a/sw/source/ui/vba/vbaborders.hxx +++ b/sw/source/ui/vba/vbaborders.hxx @@ -30,20 +30,20 @@ class VbaPalette; class SwVbaBorders : public SwVbaBorders_BASE { // XEnumerationAccess - virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) override; + virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) override; css::uno::Reference< css::beans::XPropertySet > m_xProps; public: SwVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, VbaPalette& rPalette ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; - virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getShadow() override; + virtual void SAL_CALL setShadow( sal_Bool _shadow ) override; virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx index 1b267c8f107b..17b518eb8b54 100644 --- a/sw/source/ui/vba/vbacell.cxx +++ b/sw/source/ui/vba/vbacell.cxx @@ -30,7 +30,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaCell::SwVbaCell( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nColumn, sal_Int32 nRow ) throw ( uno::RuntimeException ) : +SwVbaCell::SwVbaCell( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nColumn, sal_Int32 nRow ) : SwVbaCell_BASE( rParent, rContext ), mxTextTable( xTextTable ), mnColumn( nColumn ), mnRow( nRow ) { } @@ -39,49 +39,49 @@ SwVbaCell::~SwVbaCell() { } -::sal_Int32 SAL_CALL SwVbaCell::getWidth() throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaCell::getWidth() { SwVbaTableHelper aTableHelper( mxTextTable ); return aTableHelper.GetColWidth( mnColumn, mnRow, true ); } -void SAL_CALL SwVbaCell::setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaCell::setWidth( ::sal_Int32 _width ) { SwVbaTableHelper aTableHelper( mxTextTable ); aTableHelper.SetColWidth( _width, mnColumn, mnRow, true ); } -uno::Any SAL_CALL SwVbaCell::getHeight() throw (css::uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaCell::getHeight() { uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnRow ) ); return xRow->getHeight(); } -void SAL_CALL SwVbaCell::setHeight( const uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaCell::setHeight( const uno::Any& _height ) { uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnRow ) ); xRow->setHeight( _height ); } -::sal_Int32 SAL_CALL SwVbaCell::getHeightRule() throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaCell::getHeightRule() { uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnRow ) ); return xRow->getHeightRule(); } -void SAL_CALL SwVbaCell::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaCell::setHeightRule( ::sal_Int32 _heightrule ) { uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnRow ) ); xRow->setHeightRule( _heightrule ); } -void SAL_CALL SwVbaCell::SetWidth( float width, sal_Int32 /*rulestyle*/ ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaCell::SetWidth( float width, sal_Int32 /*rulestyle*/ ) { // FIXME: handle the argument: rulestyle setWidth( static_cast<sal_Int32>(width) ); } -void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule ) { // FIXME: handle the argument: heightrule setHeightRule( heightrule ); diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx index 63c6569d327d..9c9e7524e43f 100644 --- a/sw/source/ui/vba/vbacell.hxx +++ b/sw/source/ui/vba/vbacell.hxx @@ -34,20 +34,20 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaCell( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nColumn, sal_Int32 nRow ) throw ( css::uno::RuntimeException ); + SwVbaCell( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nColumn, sal_Int32 nRow ); virtual ~SwVbaCell() override; // Attributes - virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getWidth() override; + virtual void SAL_CALL setWidth( ::sal_Int32 _width ) override; + virtual css::uno::Any SAL_CALL getHeight() override; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) override; + virtual ::sal_Int32 SAL_CALL getHeightRule() override; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) override; // Methods - virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) override; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 19251712385f..b47d6a48c3ae 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -35,12 +35,12 @@ public: explicit CellsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if( nIndex < mxIndexAccess->getCount() ) { @@ -64,15 +64,15 @@ private: public: /// @throws css::uno::RuntimeException - CellCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw ( css::uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ), mxTextTable( xTextTable ), mnLeft( nLeft ), mnTop( nTop ), mnRight( nRight ), mnBottom( nBottom ) + CellCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ): mxParent( xParent ), mxContext( xContext ), mxTextTable( xTextTable ), mnLeft( nLeft ), mnTop( nTop ), mnRight( nRight ), mnBottom( nBottom ) { } - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount( ) override { return ( mnRight - mnLeft + 1 ) * ( mnBottom - mnTop + 1 ); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); @@ -88,32 +88,32 @@ public: throw css::lang::IndexOutOfBoundsException(); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<word::XCell>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { return new CellsEnumWrapper( this ); } }; -SwVbaCells::SwVbaCells( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (uno::RuntimeException) : SwVbaCells_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new CellCollectionHelper( xParent, xContext, xTextTable, nLeft, nTop, nRight, nBottom ) ) ), mxTextTable( xTextTable ), mnTop( nTop ), mnBottom( nBottom ) +SwVbaCells::SwVbaCells( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) : SwVbaCells_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new CellCollectionHelper( xParent, xContext, xTextTable, nLeft, nTop, nRight, nBottom ) ) ), mxTextTable( xTextTable ), mnTop( nTop ), mnBottom( nBottom ) { } -::sal_Int32 SAL_CALL SwVbaCells::getWidth() throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaCells::getWidth() { uno::Reference< word::XCell > xCell( m_xIndexAccess->getByIndex( 0 ), uno::UNO_QUERY_THROW ); return xCell->getWidth(); } -void SAL_CALL SwVbaCells::setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaCells::setWidth( ::sal_Int32 _width ) { sal_Int32 nIndex = 0; while( nIndex < m_xIndexAccess->getCount() ) @@ -123,13 +123,13 @@ void SAL_CALL SwVbaCells::setWidth( ::sal_Int32 _width ) throw (css::uno::Runtim } } -uno::Any SAL_CALL SwVbaCells::getHeight() throw (css::uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaCells::getHeight() { uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnTop ) ); return xRow->getHeight(); } -void SAL_CALL SwVbaCells::setHeight( const uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaCells::setHeight( const uno::Any& _height ) { for( sal_Int32 row = mnTop; row <= mnBottom; row++ ) { @@ -138,13 +138,13 @@ void SAL_CALL SwVbaCells::setHeight( const uno::Any& _height ) throw (css::uno:: } } -::sal_Int32 SAL_CALL SwVbaCells::getHeightRule() throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaCells::getHeightRule() { uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnTop ) ); return xRow->getHeightRule(); } -void SAL_CALL SwVbaCells::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaCells::setHeightRule( ::sal_Int32 _heightrule ) { for( sal_Int32 row = mnTop; row <= mnBottom; row++ ) { @@ -153,7 +153,7 @@ void SAL_CALL SwVbaCells::setHeightRule( ::sal_Int32 _heightrule ) throw (css::u } } -void SAL_CALL SwVbaCells::SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaCells::SetWidth( float width, sal_Int32 rulestyle ) { sal_Int32 nIndex = 0; while( nIndex < m_xIndexAccess->getCount() ) @@ -163,7 +163,7 @@ void SAL_CALL SwVbaCells::SetWidth( float width, sal_Int32 rulestyle ) throw (cs } } -void SAL_CALL SwVbaCells::SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaCells::SetHeight( float height, sal_Int32 heightrule ) { for( sal_Int32 row = mnTop; row <= mnBottom; row++ ) { @@ -174,13 +174,13 @@ void SAL_CALL SwVbaCells::SetHeight( float height, sal_Int32 heightrule ) throw // XEnumerationAccess uno::Type -SwVbaCells::getElementType() throw (uno::RuntimeException) +SwVbaCells::getElementType() { return cppu::UnoType<word::XCell>::get(); } uno::Reference< container::XEnumeration > -SwVbaCells::createEnumeration() throw (uno::RuntimeException) +SwVbaCells::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return xEnumAccess->createEnumeration(); diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx index 3d3c4f8d49d0..be6b1b1af122 100644 --- a/sw/source/ui/vba/vbacells.hxx +++ b/sw/source/ui/vba/vbacells.hxx @@ -35,23 +35,23 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaCells( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw ( css::uno::RuntimeException ); + SwVbaCells( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ); // Attributes - virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getWidth() override; + virtual void SAL_CALL setWidth( ::sal_Int32 _width ) override; + virtual css::uno::Any SAL_CALL getHeight() override; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) override; + virtual ::sal_Int32 SAL_CALL getHeightRule() override; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) override; // Methods - virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) override; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaCells_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx index 758576f86890..ffa15ce28181 100644 --- a/sw/source/ui/vba/vbacolumn.cxx +++ b/sw/source/ui/vba/vbacolumn.cxx @@ -29,7 +29,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaColumn::SwVbaColumn( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( uno::RuntimeException ) : +SwVbaColumn::SwVbaColumn( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nIndex ) : SwVbaColumn_BASE( rParent, rContext ), mxTextTable( xTextTable ), mnIndex( nIndex ) { mxTableColumns = mxTextTable->getColumns(); @@ -40,14 +40,14 @@ SwVbaColumn::~SwVbaColumn() } sal_Int32 SAL_CALL -SwVbaColumn::getWidth( ) throw ( css::uno::RuntimeException, std::exception ) +SwVbaColumn::getWidth( ) { SwVbaTableHelper aTableHelper( mxTextTable ); return aTableHelper.GetColWidth( mnIndex ); } void SAL_CALL -SwVbaColumn::setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, std::exception ) +SwVbaColumn::setWidth( sal_Int32 _width ) { SwVbaTableHelper aTableHelper( mxTextTable ); @@ -55,12 +55,12 @@ SwVbaColumn::setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, st } void SAL_CALL -SwVbaColumn::Select( ) throw ( uno::RuntimeException, std::exception ) +SwVbaColumn::Select( ) { SelectColumn( getCurrentWordDoc(mxContext), mxTextTable, mnIndex, mnIndex ); } -void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw ( uno::RuntimeException ) +void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) { OUStringBuffer aRangeName; OUString sStartCol = SwVbaTableHelper::getColumnStr( nStartColumn ); diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx index 8ecbbd21f1a2..dd4f31820176 100644 --- a/sw/source/ui/vba/vbacolumn.hxx +++ b/sw/source/ui/vba/vbacolumn.hxx @@ -36,16 +36,16 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaColumn( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( css::uno::RuntimeException ); + SwVbaColumn( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex ); virtual ~SwVbaColumn() override; // Methods - virtual sal_Int32 SAL_CALL getWidth() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getWidth() override; + virtual void SAL_CALL setWidth( sal_Int32 _width ) override; + virtual void SAL_CALL Select( ) override; /// @throws css::uno::RuntimeException - static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw (css::uno::RuntimeException); + static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ); // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index 214392114efe..6b9c577ac369 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -41,12 +41,12 @@ public: { mxIndexAccess.set( mxTextTable->getColumns(), uno::UNO_QUERY ); } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if( nIndex < mxIndexAccess->getCount() ) { @@ -56,30 +56,30 @@ public: } }; -SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ) +SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns ) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ) { mnStartColumnIndex = 0; SwVbaTableHelper aTableHelper( mxTextTable ); mnEndColumnIndex = aTableHelper.getTabColumnsMaxCount( ) - 1; } -SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mnStartColumnIndex( nStartCol ), mnEndColumnIndex( nEndCol ) +SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mnStartColumnIndex( nStartCol ), mnEndColumnIndex( nEndCol ) { if( mnEndColumnIndex < mnStartColumnIndex ) throw uno::RuntimeException(); } -uno::Reference< word::XColumn > SwVbaColumns::getColumnAtIndex( sal_Int32 index ) throw (uno::RuntimeException) +uno::Reference< word::XColumn > SwVbaColumns::getColumnAtIndex( sal_Int32 index ) { return uno::Reference< word::XColumn >( new SwVbaColumn( this, mxContext, mxTextTable, index ) ); } -::sal_Int32 SAL_CALL SwVbaColumns::getWidth() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaColumns::getWidth() { return getColumnAtIndex( mnStartColumnIndex )->getWidth(); } -void SAL_CALL SwVbaColumns::setWidth( ::sal_Int32 _width ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaColumns::setWidth( ::sal_Int32 _width ) { for( sal_Int32 index = mnStartColumnIndex; index <= mnEndColumnIndex; index++ ) { @@ -87,17 +87,17 @@ void SAL_CALL SwVbaColumns::setWidth( ::sal_Int32 _width ) throw (uno::RuntimeEx } } -void SAL_CALL SwVbaColumns::Select( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaColumns::Select( ) { SwVbaColumn::SelectColumn( getCurrentWordDoc(mxContext), mxTextTable, mnStartColumnIndex, mnEndColumnIndex ); } -::sal_Int32 SAL_CALL SwVbaColumns::getCount() throw (uno::RuntimeException) +::sal_Int32 SAL_CALL SwVbaColumns::getCount() { return ( mnEndColumnIndex - mnStartColumnIndex + 1 ); } -uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) { sal_Int32 nIndex = 0; if( ( Index1 >>= nIndex ) ) @@ -113,12 +113,12 @@ uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /* // XEnumerationAccess uno::Type -SwVbaColumns::getElementType() throw (uno::RuntimeException) +SwVbaColumns::getElementType() { return cppu::UnoType<word::XColumn>::get(); } uno::Reference< container::XEnumeration > -SwVbaColumns::createEnumeration() throw (uno::RuntimeException) +SwVbaColumns::createEnumeration() { return new ColumnsEnumWrapper( this, mxContext, mxTextTable ); } diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx index 6fe9cd31d7e0..d4b957fd53f5 100644 --- a/sw/source/ui/vba/vbacolumns.hxx +++ b/sw/source/ui/vba/vbacolumns.hxx @@ -37,24 +37,24 @@ private: private: /// @throws css::uno::RuntimeException - css::uno::Reference< ooo::vba::word::XColumn > getColumnAtIndex( sal_Int32 index ) throw (css::uno::RuntimeException); + css::uno::Reference< ooo::vba::word::XColumn > getColumnAtIndex( sal_Int32 index ); public: /// @throws css::uno::RuntimeException - SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns ) throw ( css::uno::RuntimeException ); + SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns ); /// @throws css::uno::RuntimeException - SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw ( css::uno::RuntimeException ); + SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ); - virtual sal_Int32 SAL_CALL getWidth( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getWidth( ) override; + virtual void SAL_CALL setWidth( sal_Int32 _width ) override; + virtual void SAL_CALL Select( ) override; //XCollection - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaColumns_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx index e7624398450e..f4de6d75f8af 100644 --- a/sw/source/ui/vba/vbadialogs.cxx +++ b/sw/source/ui/vba/vbadialogs.cxx @@ -24,7 +24,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; uno::Any -SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException, std::exception) +SwVbaDialogs::Item( const uno::Any &aItem ) { sal_Int32 nIndex = 0; aItem >>= nIndex; diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx index c01134cd102c..0c9400e4d65b 100644 --- a/sw/source/ui/vba/vbadialogs.hxx +++ b/sw/source/ui/vba/vbadialogs.hxx @@ -34,7 +34,7 @@ public: SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): SwVbaDialogs_BASE( xParent, xContext, xModel ) {} // XCollection - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index b70c9623e6d8..0ca98f9bd478 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -77,7 +77,7 @@ void SwVbaDocument::Initialize() } uno::Reference< word::XRange > SAL_CALL -SwVbaDocument::getContent() throw ( uno::RuntimeException, std::exception ) +SwVbaDocument::getContent() { uno::Reference< text::XTextRange > xStart = mxTextDocument->getText()->getStart(); uno::Reference< text::XTextRange > xEnd; @@ -86,7 +86,6 @@ SwVbaDocument::getContent() throw ( uno::RuntimeException, std::exception ) uno::Reference< word::XRange > SAL_CALL SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) - throw (css::script::BasicErrorException, uno::RuntimeException, std::exception) { if( !rStart.hasValue() && !rEnd.hasValue() ) return getContent(); @@ -130,7 +129,7 @@ SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) } uno::Any SAL_CALL -SwVbaDocument::BuiltInDocumentProperties( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::BuiltInDocumentProperties( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaBuiltinDocumentProperties( mxParent, mxContext, getModel() ) ); if ( index.hasValue() ) @@ -139,7 +138,7 @@ SwVbaDocument::BuiltInDocumentProperties( const uno::Any& index ) throw (uno::Ru } uno::Any SAL_CALL -SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaCustomDocumentProperties( mxParent, mxContext, getModel() ) ); if ( index.hasValue() ) @@ -148,7 +147,7 @@ SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) throw (uno::Run } uno::Any SAL_CALL -SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException, std::exception ) +SwVbaDocument::Bookmarks( const uno::Any& rIndex ) { uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( getModel(),uno::UNO_QUERY_THROW ); uno::Reference<container::XIndexAccess > xBookmarks( xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY_THROW ); @@ -160,7 +159,7 @@ SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException } uno::Any SAL_CALL -SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException, std::exception ) +SwVbaDocument::Variables( const uno::Any& rIndex ) { uno::Reference< css::document::XDocumentPropertiesSupplier > xDocumentPropertiesSupplier( getModel(),uno::UNO_QUERY_THROW ); uno::Reference< css::document::XDocumentProperties > xDocumentProperties = xDocumentPropertiesSupplier->getDocumentProperties(); @@ -174,7 +173,7 @@ SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException } uno::Any SAL_CALL -SwVbaDocument::Paragraphs( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::Paragraphs( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaParagraphs( mxParent, mxContext, mxTextDocument ) ); if ( index.hasValue() ) @@ -183,7 +182,7 @@ SwVbaDocument::Paragraphs( const uno::Any& index ) throw (uno::RuntimeException, } uno::Any SAL_CALL -SwVbaDocument::Styles( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::Styles( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaStyles( mxParent, mxContext, getModel() ) ); if ( index.hasValue() ) @@ -192,7 +191,7 @@ SwVbaDocument::Styles( const uno::Any& index ) throw (uno::RuntimeException, std } uno::Any SAL_CALL -SwVbaDocument::Fields( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::Fields( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, getModel() ) ); if ( index.hasValue() ) @@ -201,7 +200,7 @@ SwVbaDocument::Fields( const uno::Any& index ) throw (uno::RuntimeException, std } uno::Any SAL_CALL -SwVbaDocument::Shapes( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::Shapes( const uno::Any& index ) { uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getModel(), uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW ); @@ -214,7 +213,7 @@ SwVbaDocument::Shapes( const uno::Any& index ) throw (uno::RuntimeException, std } uno::Any SAL_CALL -SwVbaDocument::Sections( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::Sections( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaSections( mxParent, mxContext, getModel() ) ); if ( index.hasValue() ) @@ -223,7 +222,7 @@ SwVbaDocument::Sections( const uno::Any& index ) throw (uno::RuntimeException, s } uno::Any SAL_CALL -SwVbaDocument::TablesOfContents( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::TablesOfContents( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaTablesOfContents( this, mxContext, mxTextDocument ) ); if ( index.hasValue() ) @@ -232,14 +231,14 @@ SwVbaDocument::TablesOfContents( const uno::Any& index ) throw (uno::RuntimeExce } uno::Any SAL_CALL -SwVbaDocument::FormFields( const uno::Any& /*index*/ ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::FormFields( const uno::Any& /*index*/ ) { uno::Reference< XCollection > xCol; return uno::makeAny( xCol ); } uno::Any SAL_CALL -SwVbaDocument::PageSetup( ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::PageSetup( ) { uno::Reference< beans::XPropertySet > xPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) ); @@ -252,7 +251,7 @@ SwVbaDocument::getServiceImplName() } uno::Any SAL_CALL -SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException, std::exception) +SwVbaDocument::getAttachedTemplate() { uno::Reference< word::XTemplate > xTemplate; uno::Reference<css::document::XDocumentPropertiesSupplier> const xDocPropSupp( @@ -265,7 +264,7 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException, std::exceptio } void SAL_CALL -SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) { OUString sTemplate; if( !( _attachedtemplate >>= sTemplate ) ) @@ -289,7 +288,7 @@ SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) thr } uno::Any SAL_CALL -SwVbaDocument::Tables( const css::uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::Tables( const css::uno::Any& aIndex ) { uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xColl( new SwVbaTables( mxParent, mxContext, xModel ) ); @@ -299,34 +298,34 @@ SwVbaDocument::Tables( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio return uno::makeAny( xColl ); } -void SAL_CALL SwVbaDocument::Activate() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaDocument::Activate() { VbaDocumentBase::Activate(); } -::sal_Int32 SAL_CALL SwVbaDocument::getProtectionType() throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaDocument::getProtectionType() { //TODO return word::WdProtectionType::wdNoProtection; } -void SAL_CALL SwVbaDocument::setProtectionType( ::sal_Int32 /*_protectiontype*/ ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaDocument::setProtectionType( ::sal_Int32 /*_protectiontype*/ ) { //TODO } -sal_Bool SAL_CALL SwVbaDocument::getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaDocument::getUpdateStylesOnOpen() { //TODO return false; } -void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( sal_Bool /*_updatestylesonopen*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( sal_Bool /*_updatestylesonopen*/ ) { //TODO } -sal_Bool SAL_CALL SwVbaDocument::getAutoHyphenation() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaDocument::getAutoHyphenation() { // check this property only in default paragraph style bool IsAutoHyphenation = false; @@ -335,25 +334,25 @@ sal_Bool SAL_CALL SwVbaDocument::getAutoHyphenation() throw (uno::RuntimeExcepti return IsAutoHyphenation; } -void SAL_CALL SwVbaDocument::setAutoHyphenation( sal_Bool _autohyphenation ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaDocument::setAutoHyphenation( sal_Bool _autohyphenation ) { //TODO uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); xParaProps->setPropertyValue("ParaIsHyphenation", uno::makeAny( _autohyphenation ) ); } -::sal_Int32 SAL_CALL SwVbaDocument::getHyphenationZone() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaDocument::getHyphenationZone() { //TODO return 0; } -void SAL_CALL SwVbaDocument::setHyphenationZone( ::sal_Int32 /*_hyphenationzone*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaDocument::setHyphenationZone( ::sal_Int32 /*_hyphenationzone*/ ) { //TODO } -::sal_Int32 SAL_CALL SwVbaDocument::getConsecutiveHyphensLimit() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaDocument::getConsecutiveHyphensLimit() { //TODO sal_Int16 nHyphensLimit = 0; @@ -362,38 +361,38 @@ void SAL_CALL SwVbaDocument::setHyphenationZone( ::sal_Int32 /*_hyphenationzone* return nHyphensLimit; } -void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) { sal_Int16 nHyphensLimit = static_cast< sal_Int16 >( _consecutivehyphenslimit ); uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW ); xParaProps->setPropertyValue("ParaHyphenationMaxHyphens", uno::makeAny( nHyphensLimit ) ); } -void SAL_CALL SwVbaDocument::Protect( ::sal_Int32 /*Type*/, const uno::Any& /*NOReset*/, const uno::Any& /*Password*/, const uno::Any& /*UseIRM*/, const uno::Any& /*EnforceStyleLock*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaDocument::Protect( ::sal_Int32 /*Type*/, const uno::Any& /*NOReset*/, const uno::Any& /*Password*/, const uno::Any& /*UseIRM*/, const uno::Any& /*EnforceStyleLock*/ ) { // Seems not support in Writer // VbaDocumentBase::Protect( Password ); } -void SAL_CALL SwVbaDocument::PrintOut( const uno::Any& /*Background*/, const uno::Any& /*Append*/, const uno::Any& /*Range*/, const uno::Any& /*OutputFileName*/, const uno::Any& /*From*/, const uno::Any& /*To*/, const uno::Any& /*Item*/, const uno::Any& /*Copies*/, const uno::Any& /*Pages*/, const uno::Any& /*PageType*/, const uno::Any& /*PrintToFile*/, const uno::Any& /*Collate*/, const uno::Any& /*FileName*/, const uno::Any& /*ActivePrinterMacGX*/, const uno::Any& /*ManualDuplexPrint*/, const uno::Any& /*PrintZoomColumn*/, const uno::Any& /*PrintZoomRow*/, const uno::Any& /*PrintZoomPaperWidth*/, const uno::Any& /*PrintZoomPaperHeight*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaDocument::PrintOut( const uno::Any& /*Background*/, const uno::Any& /*Append*/, const uno::Any& /*Range*/, const uno::Any& /*OutputFileName*/, const uno::Any& /*From*/, const uno::Any& /*To*/, const uno::Any& /*Item*/, const uno::Any& /*Copies*/, const uno::Any& /*Pages*/, const uno::Any& /*PageType*/, const uno::Any& /*PrintToFile*/, const uno::Any& /*Collate*/, const uno::Any& /*FileName*/, const uno::Any& /*ActivePrinterMacGX*/, const uno::Any& /*ManualDuplexPrint*/, const uno::Any& /*PrintZoomColumn*/, const uno::Any& /*PrintZoomRow*/, const uno::Any& /*PrintZoomPaperWidth*/, const uno::Any& /*PrintZoomPaperHeight*/ ) { //TODO } -void SAL_CALL SwVbaDocument::PrintPreview( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaDocument::PrintPreview( ) { OUString url = ".uno:PrintPreview"; dispatchRequests( mxModel,url ); } -void SAL_CALL SwVbaDocument::ClosePrintPreview( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaDocument::ClosePrintPreview( ) { OUString url = ".uno:ClosePreview"; dispatchRequests( mxModel,url ); } uno::Any SAL_CALL -SwVbaDocument::Revisions( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::Revisions( const uno::Any& index ) { uno::Reference< css::document::XRedlinesSupplier > xRedlinesSupp( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xRedlines( xRedlinesSupp->getRedlines(), uno::UNO_QUERY_THROW ); @@ -404,7 +403,7 @@ SwVbaDocument::Revisions( const uno::Any& index ) throw (uno::RuntimeException, } uno::Any SAL_CALL -SwVbaDocument::Frames( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::Frames( const uno::Any& index ) { uno::Reference< text::XTextFramesSupplier > xTextFramesSupp( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xFrames( xTextFramesSupp->getTextFrames(), uno::UNO_QUERY_THROW ); @@ -439,25 +438,25 @@ SwVbaDocument::getControlShape( const OUString& sName ) } uno::Reference< beans::XIntrospectionAccess > SAL_CALL -SwVbaDocument::getIntrospection( ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::getIntrospection( ) { return uno::Reference< beans::XIntrospectionAccess >(); } uno::Any SAL_CALL -SwVbaDocument::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +SwVbaDocument::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) { SAL_INFO("sw", "** will barf " << aFunctionName ); throw uno::RuntimeException(); // unsupported operation } void SAL_CALL -SwVbaDocument::setValue( const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +SwVbaDocument::setValue( const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) { throw uno::RuntimeException(); // unsupported operation } uno::Any SAL_CALL -SwVbaDocument::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) +SwVbaDocument::getValue( const OUString& aPropertyName ) { uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); @@ -468,13 +467,13 @@ SwVbaDocument::getValue( const OUString& aPropertyName ) throw (beans::UnknownPr } sal_Bool SAL_CALL -SwVbaDocument::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::hasMethod( const OUString& /*aName*/ ) { return false; } sal_Bool SAL_CALL -SwVbaDocument::hasProperty( const OUString& aName ) throw (uno::RuntimeException, std::exception) +SwVbaDocument::hasProperty( const OUString& aName ) { uno::Reference< container::XNameAccess > xFormControls( getFormControls() ); if ( xFormControls.is() ) diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx index da7e419a0829..5a54d2f1433e 100644 --- a/sw/source/ui/vba/vbadocument.hxx +++ b/sw/source/ui/vba/vbadocument.hxx @@ -42,50 +42,49 @@ public: virtual ~SwVbaDocument() override; // XDocument - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) - throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL TablesOfContents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL FormFields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getProtectionType() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setProtectionType( ::sal_Int32 _protectiontype ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setUpdateStylesOnOpen( sal_Bool _updatestylesonopen ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoHyphenation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoHyphenation( sal_Bool _autohyphenation ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getHyphenationZone() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() override; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) override; + virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) override; + virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) override; + virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL getAttachedTemplate() override; + virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) override; + virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL Activate() override; + virtual css::uno::Any SAL_CALL PageSetup() override; + virtual css::uno::Any SAL_CALL TablesOfContents( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL FormFields( const css::uno::Any& aIndex ) override; + virtual ::sal_Int32 SAL_CALL getProtectionType() override; + virtual void SAL_CALL setProtectionType( ::sal_Int32 _protectiontype ) override; + virtual sal_Bool SAL_CALL getUpdateStylesOnOpen() override; + virtual void SAL_CALL setUpdateStylesOnOpen( sal_Bool _updatestylesonopen ) override; + virtual sal_Bool SAL_CALL getAutoHyphenation() override; + virtual void SAL_CALL setAutoHyphenation( sal_Bool _autohyphenation ) override; + virtual ::sal_Int32 SAL_CALL getHyphenationZone() override; + virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) override; + virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() override; + virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) override; using VbaDocumentBase::Protect; - virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL PrintPreview( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ClosePrintPreview( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) override; + virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) override; + virtual void SAL_CALL PrintPreview( ) override; + virtual void SAL_CALL ClosePrintPreview( ) override; + virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex ) override; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) override; + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) override; + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) override; + virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override; + virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 4ca696d2960c..5f042ab2abf7 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -32,7 +32,7 @@ using namespace ::ooo::vba; using namespace css; /// @throws lang::IllegalArgumentException -static sal_Int8 lcl_toMSOPropType( const uno::Type& aType ) throw ( lang::IllegalArgumentException ) +static sal_Int8 lcl_toMSOPropType( const uno::Type& aType ) { sal_Int16 msoType = office::MsoDocProperties::msoPropertyTypeString; @@ -449,19 +449,19 @@ protected: public: SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ); // XDocumentProperty - virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& Name ) override; + virtual ::sal_Int8 SAL_CALL getType( ) override; + virtual void SAL_CALL setType( ::sal_Int8 Type ) override; + virtual sal_Bool SAL_CALL getLinkToContent( ) override; + virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) override; + virtual uno::Any SAL_CALL getValue( ) override; + virtual void SAL_CALL setValue( const uno::Any& Value ) override; + virtual OUString SAL_CALL getLinkSource( ) override; + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) override; //XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) override { return OUString("Value"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) override { return OUString("Value"); } // XHelperInterface virtual OUString getServiceImplName() override; virtual uno::Sequence<OUString> getServiceNames() override; @@ -473,14 +473,14 @@ public: SwVbaCustomDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ); - virtual sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getLinkToContent( ) override; + virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) override; - virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkSource( ) override; + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL setName( const OUString& Name ) override; + virtual void SAL_CALL setType( ::sal_Int8 Type ) override; }; @@ -489,32 +489,32 @@ SwVbaCustomDocumentProperty::SwVbaCustomDocumentProperty( const uno::Reference< } sal_Bool -SwVbaCustomDocumentProperty::getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaCustomDocumentProperty::getLinkToContent( ) { // #FIXME we need to store the link content somewhere return false; } void -SwVbaCustomDocumentProperty::setLinkToContent( sal_Bool /*bLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaCustomDocumentProperty::setLinkToContent( sal_Bool /*bLinkContent*/ ) { } OUString -SwVbaCustomDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaCustomDocumentProperty::getLinkSource( ) { // #FIXME we need to store the link content somewhere return OUString(); } void -SwVbaCustomDocumentProperty::setLinkSource( const OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaCustomDocumentProperty::setLinkSource( const OUString& /*rsLinkContent*/ ) { // #FIXME we need to store the link source somewhere } void SAL_CALL -SwVbaCustomDocumentProperty::setName( const OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaCustomDocumentProperty::setName( const OUString& /*Name*/ ) { // setName on existing property ? // #FIXME @@ -522,14 +522,14 @@ SwVbaCustomDocumentProperty::setName( const OUString& /*Name*/ ) throw (script:: } void SAL_CALL -SwVbaCustomDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaCustomDocumentProperty::setType( ::sal_Int8 /*Type*/ ) { // setType, do we need to do a conversion? // #FIXME the underlying value needs to be changed to the new type } void SAL_CALL -SwVbaCustomDocumentProperty::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaCustomDocumentProperty::Delete( ) { uno::Reference< beans::XPropertyContainer > xContainer( mPropInfo.getUserDefinedProperties(), uno::UNO_QUERY_THROW); @@ -541,53 +541,53 @@ SwVbaBuiltInDocumentProperty::SwVbaBuiltInDocumentProperty( const uno::Reference } void SAL_CALL -SwVbaBuiltInDocumentProperty::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::Delete( ) { // not valid for Builtin throw uno::RuntimeException(); } OUString SAL_CALL -SwVbaBuiltInDocumentProperty::getName( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::getName( ) { return mPropInfo.msMSODesc; } void SAL_CALL -SwVbaBuiltInDocumentProperty::setName( const OUString& ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::setName( const OUString& ) { // not valid for Builtin throw uno::RuntimeException(); } ::sal_Int8 SAL_CALL -SwVbaBuiltInDocumentProperty::getType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::getType( ) { return lcl_toMSOPropType( getValue().getValueType() ); } void SAL_CALL -SwVbaBuiltInDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::setType( ::sal_Int8 /*Type*/ ) { // not valid for Builtin throw uno::RuntimeException(); } sal_Bool SAL_CALL -SwVbaBuiltInDocumentProperty::getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::getLinkToContent( ) { return false; // built-in always false } void SAL_CALL -SwVbaBuiltInDocumentProperty::setLinkToContent( sal_Bool /*LinkToContent*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::setLinkToContent( sal_Bool /*LinkToContent*/ ) { // not valid for Builtin throw uno::RuntimeException(); } uno::Any SAL_CALL -SwVbaBuiltInDocumentProperty::getValue( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::getValue( ) { uno::Any aRet = mPropInfo.getValue(); if ( !aRet.hasValue() ) @@ -596,20 +596,20 @@ SwVbaBuiltInDocumentProperty::getValue( ) throw (script::BasicErrorException, u } void SAL_CALL -SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) { mPropInfo.setValue( Value ); } OUString SAL_CALL -SwVbaBuiltInDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::getLinkSource( ) { // not valid for Builtin throw uno::RuntimeException(); } void SAL_CALL -SwVbaBuiltInDocumentProperty::setLinkSource( const OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltInDocumentProperty::setLinkSource( const OUString& /*LinkSource*/ ) { // not valid for Builtin throw uno::RuntimeException(); @@ -646,11 +646,11 @@ class DocPropEnumeration : public ::cppu::WeakImplHelper< css::container::XEnume public: explicit DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return mIt != mDocProps.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -680,11 +680,11 @@ protected: } } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return mDocProps.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { // correct the correct by the base class for 1 based indices DocProps::iterator it = mDocProps.find( ++Index ); @@ -692,7 +692,7 @@ protected: throw lang::IndexOutOfBoundsException(); return uno::makeAny( it->second ); } - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -700,7 +700,7 @@ protected: return uno::Any( it->second ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { uno::Sequence< OUString > aNames( getCount() ); OUString* pName = aNames.getArray(); @@ -710,7 +710,7 @@ protected: return aNames; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { DocPropsByName::iterator it = mNamedDocProps.find( aName ); if ( it == mNamedDocProps.end() ) @@ -718,15 +718,15 @@ protected: return true; } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<XDocumentProperty>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return !mDocProps.empty(); } - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { return new DocPropEnumeration( mDocProps ); } @@ -737,20 +737,20 @@ SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Refer } uno::Reference< XDocumentProperty > SAL_CALL -SwVbaBuiltinDocumentProperties::Add( const OUString& /*Name*/, sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaBuiltinDocumentProperties::Add( const OUString& /*Name*/, sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) { throw uno::RuntimeException( "not supported for Builtin properties" ); } // XEnumerationAccess uno::Type SAL_CALL -SwVbaBuiltinDocumentProperties::getElementType() throw (uno::RuntimeException) +SwVbaBuiltinDocumentProperties::getElementType() { return cppu::UnoType<XDocumentProperty>::get(); } uno::Reference< container::XEnumeration > SAL_CALL -SwVbaBuiltinDocumentProperties::createEnumeration() throw (uno::RuntimeException) +SwVbaBuiltinDocumentProperties::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return xEnumAccess->createEnumeration(); @@ -799,12 +799,12 @@ public: uno::UNO_SET_THROW); }; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return mxUserDefinedProp->getPropertySetInfo()->getProperties().getLength(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); if ( Index >= aProps.getLength() ) @@ -814,7 +814,7 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -823,7 +823,7 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); uno::Sequence< OUString > aNames( aProps.getLength() ); @@ -835,24 +835,24 @@ public: return aNames; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { SAL_INFO("sw", "hasByName(" << aName << ") returns " << mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) ); return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<XDocumentProperty>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return getCount() > 0; } - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { // create a map of properties ( the key doesn't matter ) SAL_INFO("sw", "Creating an enumeration"); @@ -883,7 +883,7 @@ SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Referen } uno::Reference< XDocumentProperty > SAL_CALL -SwVbaCustomDocumentProperties::Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaCustomDocumentProperties::Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) { CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() ); uno::Reference< XDocumentProperty > xDocProp; diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index 78322b0fa5c2..740353e8291b 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -31,10 +31,10 @@ public: SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; @@ -48,7 +48,7 @@ class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties public: SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) override; // XHelperInterface virtual OUString getServiceImplName() override; }; diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 7b130a8ed284..c59c7a60130f 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -65,9 +65,9 @@ class DocumentEnumImpl : public EnumerationHelperImpl uno::Any m_aApplication; public: /// @throws uno::RuntimeException - DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {} + DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< text::XTextDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return getDocument( m_xContext, xDoc, m_aApplication ); @@ -79,12 +79,12 @@ SwVbaDocuments::SwVbaDocuments( const uno::Reference< XHelperInterface >& xParen } // XEnumerationAccess uno::Type -SwVbaDocuments::getElementType() throw (uno::RuntimeException) +SwVbaDocuments::getElementType() { return cppu::UnoType<word::XDocument>::get(); } uno::Reference< container::XEnumeration > -SwVbaDocuments::createEnumeration() throw (uno::RuntimeException) +SwVbaDocuments::createEnumeration() { // #FIXME its possible the DocumentEnumImpl here doesn't reflect // the state of this object ( although it should ) would be @@ -102,7 +102,7 @@ SwVbaDocuments::createCollectionObject( const uno::Any& aSource ) } uno::Any SAL_CALL -SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, const uno::Any& /*DocumentType*/, const uno::Any& /*Visible*/ ) throw (uno::RuntimeException, std::exception) +SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, const uno::Any& /*DocumentType*/, const uno::Any& /*Visible*/ ) { OUString sFileName; if( Template.hasValue() && ( Template >>= sFileName ) ) @@ -118,13 +118,13 @@ SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, // #TODO# #FIXME# can any of the unused params below be used? void SAL_CALL -SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ ) throw (uno::RuntimeException, std::exception) +SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ ) { } // #TODO# #FIXME# can any of the unused params below be used? uno::Any SAL_CALL -SwVbaDocuments::Open( const OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException, std::exception) +SwVbaDocuments::Open( const OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) { // we need to detect if this is a URL, if not then assume it's a file path OUString aURL; diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index ac5280a33a33..ccf3a4d9b938 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -34,8 +34,8 @@ public: SwVbaDocuments( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaDocuments_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; @@ -43,9 +43,9 @@ public: virtual css::uno::Sequence<OUString> getServiceNames() override; // Methods - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) override; + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) override; + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) override; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx index 04f3d5b1e53b..28b6f4e08650 100644 --- a/sw/source/ui/vba/vbaeventshelper.cxx +++ b/sw/source/ui/vba/vbaeventshelper.cxx @@ -45,7 +45,7 @@ SwVbaEventsHelper::~SwVbaEventsHelper() } bool SwVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue, - const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& /*rArgs*/ ) throw (uno::RuntimeException) + const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& /*rArgs*/ ) { switch( rInfo.mnEventId ) { @@ -63,20 +63,20 @@ bool SwVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue, } uno::Sequence< uno::Any > SwVbaEventsHelper::implBuildArgumentList( const EventHandlerInfo& /*rInfo*/, - const uno::Sequence< uno::Any >& /*rArgs*/ ) throw (lang::IllegalArgumentException) + const uno::Sequence< uno::Any >& /*rArgs*/ ) { // no event handler expects any arguments return uno::Sequence< uno::Any >(); } void SwVbaEventsHelper::implPostProcessEvent( EventQueue& /*rEventQueue*/, - const EventHandlerInfo& /*rInfo*/, bool /*bCancel*/ ) throw (uno::RuntimeException) + const EventHandlerInfo& /*rInfo*/, bool /*bCancel*/ ) { // nothing to do after any event } OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& /*rInfo*/, - const uno::Sequence< uno::Any >& /*rArgs*/ ) const throw (lang::IllegalArgumentException) + const uno::Sequence< uno::Any >& /*rArgs*/ ) const { // TODO: get actual codename from document return OUString( "ThisDocument" ); diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx index a366ee19452a..03a2f8a45f2b 100644 --- a/sw/source/ui/vba/vbaeventshelper.hxx +++ b/sw/source/ui/vba/vbaeventshelper.hxx @@ -31,10 +31,10 @@ public: virtual ~SwVbaEventsHelper() override; protected: - virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException) override; - virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException) override; - virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) override; + virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) override; + virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) override; + virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) override; + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const override; }; #endif diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index af1e1be2d9f7..ae340194c406 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -35,12 +35,12 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaField::SwVbaField( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< css::text::XTextField >& xTextField) throw ( uno::RuntimeException ) : SwVbaField_BASE( rParent, rContext ) +SwVbaField::SwVbaField( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< css::text::XTextField >& xTextField) : SwVbaField_BASE( rParent, rContext ) { mxTextField.set( xTextField, uno::UNO_QUERY_THROW ); } -sal_Bool SAL_CALL SwVbaField::Update() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaField::Update() { uno::Reference< util::XUpdatable > xUpdatable( mxTextField, uno::UNO_QUERY ); if( xUpdatable.is() ) @@ -234,11 +234,11 @@ public: FieldEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< container::XEnumeration >& xEnumeration ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return mxEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -255,16 +255,16 @@ class FieldCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAc uno::Reference< container::XEnumerationAccess > mxEnumerationAccess; public: /// @throws css::uno::RuntimeException - FieldCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) throw (css::uno::RuntimeException) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) + FieldCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) { uno::Reference< text::XTextFieldsSupplier > xSupp( xModel, uno::UNO_QUERY_THROW ); mxEnumerationAccess.set( xSupp->getTextFields(), uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return mxEnumerationAccess->getElementType(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return mxEnumerationAccess->hasElements(); } + virtual uno::Type SAL_CALL getElementType( ) override { return mxEnumerationAccess->getElementType(); } + virtual sal_Bool SAL_CALL hasElements( ) override { return mxEnumerationAccess->hasElements(); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { uno::Reference< container::XEnumeration > xEnumeration = mxEnumerationAccess->createEnumeration(); sal_Int32 nCount = 0; @@ -275,7 +275,7 @@ public: } return nCount; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -293,7 +293,7 @@ public: throw lang::IndexOutOfBoundsException(); } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { uno::Reference< container::XEnumeration > xEnumeration = mxEnumerationAccess->createEnumeration(); return uno::Reference< container::XEnumeration >( new FieldEnumeration( mxParent, mxContext, mxModel, xEnumeration ) ); @@ -306,7 +306,7 @@ SwVbaFields::SwVbaFields( const uno::Reference< XHelperInterface >& xParent, con } uno::Reference< word::XField > SAL_CALL -SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& /*PreserveFormatting*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& /*PreserveFormatting*/ ) { sal_Int32 nType = word::WdFieldType::wdFieldEmpty; Type >>= nType; @@ -343,7 +343,6 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, } uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const OUString& _text ) - throw (uno::RuntimeException, script::BasicErrorException) { uno::Reference< text::XTextField > xTextField( mxMSF->createInstance("com.sun.star.text.TextField.FileName"), uno::UNO_QUERY_THROW ); sal_Int16 nFileFormat = text::FilenameDisplayFormat::NAME_AND_EXT; @@ -412,7 +411,7 @@ static const DocPropertyTable aDocPropertyTables[] = { nullptr, nullptr } }; -uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const OUString& _text ) throw (uno::RuntimeException) +uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const OUString& _text ) { OUString aDocProperty; SwVbaReadFieldParams aReadParam( _text ); @@ -473,7 +472,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const } uno::Reference< container::XEnumeration > SAL_CALL -SwVbaFields::createEnumeration() throw (uno::RuntimeException) +SwVbaFields::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return xEnumerationAccess->createEnumeration(); @@ -486,7 +485,7 @@ SwVbaFields::createCollectionObject( const uno::Any& aSource ) return lcl_createField( mxParent, mxContext, mxModel, aSource ); } -sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwVbaFields::Update() { sal_Int32 nUpdate = 1; try @@ -512,7 +511,7 @@ SwVbaFields::getServiceImplName() // XEnumerationAccess uno::Type SAL_CALL -SwVbaFields::getElementType() throw (uno::RuntimeException) +SwVbaFields::getElementType() { return cppu::UnoType<word::XField>::get(); } diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 650a09692219..370ceaec3931 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -33,9 +33,9 @@ class SwVbaField : public SwVbaField_BASE css::uno::Reference< css::text::XTextField > mxTextField; public: /// @throws css::uno::RuntimeException - SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException); + SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextField >& xTextField); - virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL Update() override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; @@ -50,19 +50,18 @@ class SwVbaFields : public SwVbaFields_BASE private: /// @throws css::uno::RuntimeException /// @throws css::script::BasicErrorException - css::uno::Reference< css::text::XTextField > Create_Field_FileName(const OUString& rText) - throw (css::uno::RuntimeException, css::script::BasicErrorException); + css::uno::Reference< css::text::XTextField > Create_Field_FileName(const OUString& rText); /// @throws css::uno::RuntimeException - css::uno::Reference< css::text::XTextField > Create_Field_DocProperty( const OUString& _text ) throw (css::uno::RuntimeException); + css::uno::Reference< css::text::XTextField > Create_Field_DocProperty( const OUString& _text ); public: SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); // XFields - virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL Update() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) override; + virtual sal_Int32 SAL_CALL Update() override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx index 3bb5b37a0d23..3556673b0b9a 100644 --- a/sw/source/ui/vba/vbafind.cxx +++ b/sw/source/ui/vba/vbafind.cxx @@ -29,7 +29,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaFind::SwVbaFind( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) : +SwVbaFind::SwVbaFind( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) : SwVbaFind_BASE( rParent, rContext ), mxModel( xModel ), mxTextRange( xTextRange ), mbReplace( false ), mnReplaceType( word::WdReplace::wdReplaceOne ), mnWrap( word::WdFindWrap::wdFindStop ) { mxReplaceable.set( mxModel, uno::UNO_QUERY_THROW ); @@ -42,7 +42,7 @@ SwVbaFind::~SwVbaFind() { } -bool SwVbaFind::InRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException ) +bool SwVbaFind::InRange( const uno::Reference< text::XTextRange >& xCurrentRange ) { uno::Reference< text::XTextRangeCompare > xTRC( mxTextRange->getText(), uno::UNO_QUERY_THROW ); if( xTRC->compareRegionStarts( mxTextRange, xCurrentRange ) >= 0 && xTRC->compareRegionEnds( mxTextRange, xCurrentRange ) <= 0 ) @@ -50,7 +50,7 @@ bool SwVbaFind::InRange( const uno::Reference< text::XTextRange >& xCurrentRange return false; } -bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException ) +bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrentRange ) { uno::Reference< text::XTextRangeCompare > xTRC( mxTextRange->getText(), uno::UNO_QUERY_THROW ); if( xTRC->compareRegionStarts( mxTextRange, xCurrentRange ) == 0 && xTRC->compareRegionEnds( mxTextRange, xCurrentRange ) == 0 ) @@ -58,13 +58,13 @@ bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrent return false; } -void SwVbaFind::SetReplaceWith( const OUString& rText ) throw (uno::RuntimeException) +void SwVbaFind::SetReplaceWith( const OUString& rText ) { mxPropertyReplace->setReplaceString( rText ); mbReplace = true; } -OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException) +OUString SwVbaFind::GetReplaceWith() { return mxPropertyReplace->getReplaceString(); } @@ -73,7 +73,7 @@ void SwVbaFind::SetReplace( sal_Int32 type ) mnReplaceType = type; mbReplace = true; } -uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::RuntimeException ) +uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() { uno::Reference< text::XTextRange > xFoundOne; if( !mxTVC->getString().isEmpty() ) @@ -118,7 +118,7 @@ uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::Runt return xFoundOne; } -bool SwVbaFind::SearchReplace() throw (uno::RuntimeException) +bool SwVbaFind::SearchReplace() { bool result = false; @@ -176,111 +176,111 @@ bool SwVbaFind::SearchReplace() throw (uno::RuntimeException) return result; } -OUString SAL_CALL SwVbaFind::getText() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwVbaFind::getText() { return mxPropertyReplace->getSearchString(); } -void SAL_CALL SwVbaFind::setText( const OUString& _text ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setText( const OUString& _text ) { mxPropertyReplace->setSearchString( _text ); } -uno::Any SAL_CALL SwVbaFind::getReplacement() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaFind::getReplacement() { return uno::makeAny( uno::Reference< word::XReplacement >( new SwVbaReplacement( this, mxContext, mxPropertyReplace ) ) ); } -void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) { throw uno::RuntimeException("Not implemented" ); } -sal_Bool SAL_CALL SwVbaFind::getForward() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaFind::getForward() { bool bBackward = false; mxPropertyReplace->getPropertyValue("SearchBackwards") >>= bBackward; return !bBackward; } -void SAL_CALL SwVbaFind::setForward( sal_Bool _forward ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setForward( sal_Bool _forward ) { bool bBackward = !_forward; mxPropertyReplace->setPropertyValue("SearchBackwards", uno::makeAny( bBackward ) ); } -::sal_Int32 SAL_CALL SwVbaFind::getWrap() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaFind::getWrap() { // seems not supported in Writer return mnWrap; } -void SAL_CALL SwVbaFind::setWrap( ::sal_Int32 _wrap ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setWrap( ::sal_Int32 _wrap ) { // seems not supported in Writer mnWrap = _wrap; } -sal_Bool SAL_CALL SwVbaFind::getFormat() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaFind::getFormat() { return mxPropertyReplace->getValueSearch(); } -void SAL_CALL SwVbaFind::setFormat( sal_Bool _format ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setFormat( sal_Bool _format ) { mxPropertyReplace->setValueSearch( _format ); } -sal_Bool SAL_CALL SwVbaFind::getMatchCase() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaFind::getMatchCase() { bool value = false; mxPropertyReplace->getPropertyValue("SearchCaseSensitive") >>= value; return value; } -void SAL_CALL SwVbaFind::setMatchCase( sal_Bool _matchcase ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setMatchCase( sal_Bool _matchcase ) { mxPropertyReplace->setPropertyValue("SearchCaseSensitive", uno::makeAny( _matchcase ) ); } -sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() { bool value = false; mxPropertyReplace->getPropertyValue("SearchWords") >>= value; return value; } -void SAL_CALL SwVbaFind::setMatchWholeWord( sal_Bool _matchwholeword ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setMatchWholeWord( sal_Bool _matchwholeword ) { mxPropertyReplace->setPropertyValue("SearchWords", uno::makeAny( _matchwholeword ) ); } -sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() { bool value = false; mxPropertyReplace->getPropertyValue("SearchRegularExpression") >>= value; return value; } -void SAL_CALL SwVbaFind::setMatchWildcards( sal_Bool _matchwildcards ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setMatchWildcards( sal_Bool _matchwildcards ) { mxPropertyReplace->setPropertyValue("SearchRegularExpression", uno::makeAny( _matchwildcards ) ); } -sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() { bool value = false; mxPropertyReplace->getPropertyValue("SearchSimilarity") >>= value; return value; } -void SAL_CALL SwVbaFind::setMatchSoundsLike( sal_Bool _matchsoundslike ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setMatchSoundsLike( sal_Bool _matchsoundslike ) { // seems not accurate mxPropertyReplace->setPropertyValue("SearchSimilarity", uno::makeAny( _matchsoundslike ) ); } -sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() { bool value = false; mxPropertyReplace->getPropertyValue("SearchSimilarity") >>= value; @@ -289,25 +289,25 @@ sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException return value; } -void SAL_CALL SwVbaFind::setMatchAllWordForms( sal_Bool _matchallwordforms ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setMatchAllWordForms( sal_Bool _matchallwordforms ) { // seems not accurate mxPropertyReplace->setPropertyValue("SearchSimilarity", uno::makeAny( _matchallwordforms ) ); mxPropertyReplace->setPropertyValue("SearchSimilarityRelax", uno::makeAny( _matchallwordforms ) ); } -uno::Any SAL_CALL SwVbaFind::getStyle() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaFind::getStyle() { throw uno::RuntimeException("Not implemented" ); } -void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) { throw uno::RuntimeException("Not implemented" ); } sal_Bool SAL_CALL -SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const uno::Any& MatchWholeWord, const uno::Any& MatchWildcards, const uno::Any& MatchSoundsLike, const uno::Any& MatchAllWordForms, const uno::Any& Forward, const uno::Any& Wrap, const uno::Any& Format, const uno::Any& ReplaceWith, const uno::Any& Replace, const uno::Any& /*MatchKashida*/, const uno::Any& /*MatchDiacritics*/, const uno::Any& /*MatchAlefHamza*/, const uno::Any& /*MatchControl*/, const uno::Any& /*MatchPrefix*/, const uno::Any& /*MatchSuffix*/, const uno::Any& /*MatchPhrase*/, const uno::Any& /*IgnoreSpace*/, const uno::Any& /*IgnorePunct*/ ) throw (uno::RuntimeException, std::exception) +SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const uno::Any& MatchWholeWord, const uno::Any& MatchWildcards, const uno::Any& MatchSoundsLike, const uno::Any& MatchAllWordForms, const uno::Any& Forward, const uno::Any& Wrap, const uno::Any& Format, const uno::Any& ReplaceWith, const uno::Any& Replace, const uno::Any& /*MatchKashida*/, const uno::Any& /*MatchDiacritics*/, const uno::Any& /*MatchAlefHamza*/, const uno::Any& /*MatchControl*/, const uno::Any& /*MatchPrefix*/, const uno::Any& /*MatchSuffix*/, const uno::Any& /*MatchPhrase*/, const uno::Any& /*IgnoreSpace*/, const uno::Any& /*IgnorePunct*/ ) { bool result = false; if( FindText.hasValue() ) @@ -387,7 +387,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u } void SAL_CALL -SwVbaFind::ClearFormatting( ) throw (uno::RuntimeException, std::exception) +SwVbaFind::ClearFormatting( ) { uno::Sequence< beans::PropertyValue > aSearchAttribs; mxPropertyReplace->setSearchAttributes( aSearchAttribs ); diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index 3ce55cc329a4..54c712a86dea 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -45,51 +45,51 @@ private: private: /// @throws css::uno::RuntimeException - bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException ); + bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ); /// @throws css::uno::RuntimeException - bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException ); + bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ); void SetReplace( sal_Int32 type ); /// @throws css::uno::RuntimeException - void SetReplaceWith( const OUString& rText ) throw ( css::uno::RuntimeException ); + void SetReplaceWith( const OUString& rText ); /// @throws css::uno::RuntimeException - OUString GetReplaceWith() throw ( css::uno::RuntimeException ); + OUString GetReplaceWith(); /// @throws css::uno::RuntimeException - css::uno::Reference< css::text::XTextRange > FindOneElement() throw ( css::uno::RuntimeException ); + css::uno::Reference< css::text::XTextRange > FindOneElement(); /// @throws css::uno::RuntimeException - bool SearchReplace() throw ( css::uno::RuntimeException ); + bool SearchReplace(); public: /// @throws css::uno::RuntimeException - SwVbaFind( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException ); + SwVbaFind( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange ); virtual ~SwVbaFind() override; // Attributes - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setForward( sal_Bool _forward ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getWrap() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getFormat() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormat( sal_Bool _format ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMatchCase() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMatchCase( sal_Bool _matchcase ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMatchWholeWord() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMatchWholeWord( sal_Bool _matchwholeword ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMatchWildcards() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMatchWildcards( sal_Bool _matchwildcards ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMatchSoundsLike() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMatchSoundsLike( sal_Bool _matchsoundslike ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMatchAllWordForms() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMatchAllWordForms( sal_Bool _matchallwordforms ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() override; + virtual void SAL_CALL setText( const OUString& _text ) override; + virtual css::uno::Any SAL_CALL getReplacement() override; + virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) override; + virtual sal_Bool SAL_CALL getForward() override; + virtual void SAL_CALL setForward( sal_Bool _forward ) override; + virtual ::sal_Int32 SAL_CALL getWrap() override; + virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) override; + virtual sal_Bool SAL_CALL getFormat() override; + virtual void SAL_CALL setFormat( sal_Bool _format ) override; + virtual sal_Bool SAL_CALL getMatchCase() override; + virtual void SAL_CALL setMatchCase( sal_Bool _matchcase ) override; + virtual sal_Bool SAL_CALL getMatchWholeWord() override; + virtual void SAL_CALL setMatchWholeWord( sal_Bool _matchwholeword ) override; + virtual sal_Bool SAL_CALL getMatchWildcards() override; + virtual void SAL_CALL setMatchWildcards( sal_Bool _matchwildcards ) override; + virtual sal_Bool SAL_CALL getMatchSoundsLike() override; + virtual void SAL_CALL setMatchSoundsLike( sal_Bool _matchsoundslike ) override; + virtual sal_Bool SAL_CALL getMatchAllWordForms() override; + virtual void SAL_CALL setMatchAllWordForms( sal_Bool _matchallwordforms ) override; + virtual css::uno::Any SAL_CALL getStyle() override; + virtual void SAL_CALL setStyle( const css::uno::Any& _style ) override; // Methods - virtual sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ClearFormatting( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) override; + virtual void SAL_CALL ClearFormatting( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index 4d043d11287a..933032169085 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -88,7 +88,7 @@ public: } /// @throws lang::IllegalArgumentException - sal_Int32 getOOOFromMSO( sal_Int32 nMSOConst ) throw( lang::IllegalArgumentException ) + sal_Int32 getOOOFromMSO( sal_Int32 nMSOConst ) { ConstToConst::iterator it = MSO2OOO.find( nMSOConst ); if ( it == MSO2OOO.end() ) @@ -96,7 +96,7 @@ public: return it->second; } /// @throws lang::IllegalArgumentException - sal_Int32 getMSOFromOOO( sal_Int32 nOOOConst ) throw( lang::IllegalArgumentException ) + sal_Int32 getMSOFromOOO( sal_Int32 nOOOConst ) { ConstToConst::iterator it = OOO2MSO.find( nOOOConst ); if ( it == OOO2MSO.end() ) @@ -105,12 +105,12 @@ public: } }; -SwVbaFont::SwVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPalette, uno::Reference< css::beans::XPropertySet > const & xPropertySet ) throw ( css::uno::RuntimeException ) : SwVbaFont_BASE( xParent, xContext, xPalette, xPropertySet ) +SwVbaFont::SwVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPalette, uno::Reference< css::beans::XPropertySet > const & xPropertySet ) : SwVbaFont_BASE( xParent, xContext, xPalette, xPropertySet ) { } uno::Any SAL_CALL -SwVbaFont::getUnderline() throw (uno::RuntimeException, std::exception) +SwVbaFont::getUnderline() { sal_Int32 nOOVal = 0; mxFont->getPropertyValue( UnderLineMapper::propName() ) >>= nOOVal; @@ -118,7 +118,7 @@ SwVbaFont::getUnderline() throw (uno::RuntimeException, std::exception) } void SAL_CALL -SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeException, std::exception) +SwVbaFont::setUnderline( const uno::Any& _underline ) { sal_Int32 nMSOVal = 0; @@ -136,7 +136,7 @@ SwVbaFont::getServiceImplName() } void SAL_CALL -SwVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException, std::exception ) +SwVbaFont::setColorIndex( const uno::Any& _colorindex ) { sal_Int32 nIndex = 0; _colorindex >>= nIndex; @@ -144,7 +144,7 @@ SwVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep } uno::Any SAL_CALL -SwVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) +SwVbaFont::getColorIndex() { sal_Int32 nColor = 0; @@ -164,7 +164,7 @@ SwVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) return uno::makeAny( nIndex ); } uno::Any SAL_CALL -SwVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception ) +SwVbaFont::getSubscript() { bool bRes = false; SwVbaFont_BASE::getSubscript() >>= bRes; @@ -174,7 +174,7 @@ SwVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -SwVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception ) +SwVbaFont::getSuperscript() { bool bRes = false; SwVbaFont_BASE::getSuperscript() >>= bRes; @@ -184,7 +184,7 @@ SwVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -SwVbaFont::getBold() throw (uno::RuntimeException, std::exception) +SwVbaFont::getBold() { bool bRes = false; SwVbaFont_BASE::getBold() >>= bRes; @@ -194,7 +194,7 @@ SwVbaFont::getBold() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -SwVbaFont::getItalic() throw (uno::RuntimeException, std::exception) +SwVbaFont::getItalic() { bool bRes = false; SwVbaFont_BASE::getItalic() >>= bRes; @@ -204,7 +204,7 @@ SwVbaFont::getItalic() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException, std::exception) +SwVbaFont::getStrikethrough() { bool bRes = false; SwVbaFont_BASE::getStrikethrough() >>= bRes; @@ -214,7 +214,7 @@ SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException, std::exception) } uno::Any SAL_CALL -SwVbaFont::getShadow() throw (uno::RuntimeException, std::exception) +SwVbaFont::getShadow() { bool bRes = false; SwVbaFont_BASE::getShadow() >>= bRes; diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx index e12b12447369..2902de5a2988 100644 --- a/sw/source/ui/vba/vbafont.hxx +++ b/sw/source/ui/vba/vbafont.hxx @@ -30,20 +30,20 @@ class SwVbaFont : public SwVbaFont_BASE { public: /// @throws css::uno::RuntimeException - SwVbaFont( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPalette, css::uno::Reference< css::beans::XPropertySet > const & xPropertySet ) throw ( css::uno::RuntimeException ); + SwVbaFont( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPalette, css::uno::Reference< css::beans::XPropertySet > const & xPropertySet ); // Attributes - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSubscript() throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getSuperscript() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override; + virtual css::uno::Any SAL_CALL getColorIndex() override; + virtual css::uno::Any SAL_CALL getUnderline() override; + virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) override; + virtual css::uno::Any SAL_CALL getSubscript() override; + virtual css::uno::Any SAL_CALL getSuperscript() override; - virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getBold() override; + virtual css::uno::Any SAL_CALL getItalic() override; + virtual css::uno::Any SAL_CALL getStrikethrough() override; + virtual css::uno::Any SAL_CALL getShadow() override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx index 7ddc227ca202..656fc9a6f699 100644 --- a/sw/source/ui/vba/vbaframe.cxx +++ b/sw/source/ui/vba/vbaframe.cxx @@ -28,7 +28,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaFrame::SwVbaFrame( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< frame::XModel >& rModel, const css::uno::Reference< text::XTextFrame >& xTextFrame ) throw ( css::uno::RuntimeException ) : +SwVbaFrame::SwVbaFrame( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< frame::XModel >& rModel, const css::uno::Reference< text::XTextFrame >& xTextFrame ) : SwVbaFrame_BASE( rParent, rContext ), mxModel( rModel ), mxTextFrame( xTextFrame ) { } @@ -37,7 +37,7 @@ SwVbaFrame::~SwVbaFrame() { } -void SAL_CALL SwVbaFrame::Select() throw ( uno::RuntimeException, std::exception ) +void SAL_CALL SwVbaFrame::Select() { uno::Reference< view::XSelectionSupplier > xSelectSupp( mxModel->getCurrentController(), uno::UNO_QUERY_THROW ); xSelectSupp->select( uno::makeAny( mxTextFrame ) ); diff --git a/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx index 099366aced21..2097e9ac1a24 100644 --- a/sw/source/ui/vba/vbaframe.hxx +++ b/sw/source/ui/vba/vbaframe.hxx @@ -33,11 +33,11 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaFrame( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const css::uno::Reference< css::text::XTextFrame >& xTextFrame ) throw ( css::uno::RuntimeException ); + SwVbaFrame( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const css::uno::Reference< css::text::XTextFrame >& xTextFrame ); virtual ~SwVbaFrame() override; // Methods - virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL Select() override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index 3e733ac1efe4..7951b83ccb56 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -37,15 +37,15 @@ private: sal_Int32 nCurrentPos; public: /// @throws uno::RuntimeException - FramesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : mxParent( xParent ), mxContext( xContext), mxIndexAccess( xIndexAccess ), mxModel( xModel ), nCurrentPos(0) + FramesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext), mxIndexAccess( xIndexAccess ), mxModel( xModel ), nCurrentPos(0) { } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nCurrentPos < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -61,13 +61,13 @@ SwVbaFrames::SwVbaFrames( const uno::Reference< XHelperInterface >& xParent, con } // XEnumerationAccess uno::Type -SwVbaFrames::getElementType() throw (uno::RuntimeException) +SwVbaFrames::getElementType() { return cppu::UnoType<word::XFrame>::get(); } uno::Reference< container::XEnumeration > -SwVbaFrames::createEnumeration() throw (uno::RuntimeException) +SwVbaFrames::createEnumeration() { return new FramesEnumeration( this, mxContext,m_xIndexAccess, mxModel ); } diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx index 4ef3ff1b5a14..c0af24f825d5 100644 --- a/sw/source/ui/vba/vbaframes.hxx +++ b/sw/source/ui/vba/vbaframes.hxx @@ -36,8 +36,8 @@ public: SwVbaFrames( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xFrames, const css::uno::Reference< css::frame::XModel >& xModel ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaFrames_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index a37eb5831b67..3bd9c957352a 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -54,7 +54,7 @@ SwVbaGlobals::~SwVbaGlobals() // XGlobals uno::Reference<word::XApplication > const & -SwVbaGlobals::getApplication() throw (uno::RuntimeException) +SwVbaGlobals::getApplication() { SAL_INFO("sw", "In SwVbaGlobals::getApplication"); if ( !mxApplication.is() ) @@ -64,72 +64,72 @@ SwVbaGlobals::getApplication() throw (uno::RuntimeException) } uno::Reference<word::XSystem > SAL_CALL -SwVbaGlobals::getSystem() throw (uno::RuntimeException, std::exception) +SwVbaGlobals::getSystem() { return getApplication()->getSystem(); } uno::Reference< word::XDocument > SAL_CALL -SwVbaGlobals::getActiveDocument() throw (uno::RuntimeException, std::exception) +SwVbaGlobals::getActiveDocument() { return getApplication()->getActiveDocument(); } uno::Reference< word::XWindow > SAL_CALL -SwVbaGlobals::getActiveWindow() throw (uno::RuntimeException, std::exception) +SwVbaGlobals::getActiveWindow() { return getApplication()->getActiveWindow(); } OUString SAL_CALL -SwVbaGlobals::getName() throw (uno::RuntimeException, std::exception) +SwVbaGlobals::getName() { return getApplication()->getName(); } uno::Reference<word::XOptions > SAL_CALL -SwVbaGlobals::getOptions() throw (uno::RuntimeException, std::exception) +SwVbaGlobals::getOptions() { return getApplication()->getOptions(); } uno::Any SAL_CALL -SwVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +SwVbaGlobals::CommandBars( const uno::Any& aIndex ) { return getApplication()->CommandBars( aIndex ); } uno::Any SAL_CALL -SwVbaGlobals::Documents( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaGlobals::Documents( const uno::Any& index ) { return getApplication()->Documents( index ); } uno::Any SAL_CALL -SwVbaGlobals::Addins( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaGlobals::Addins( const uno::Any& index ) { return getApplication()->Addins( index ); } uno::Any SAL_CALL -SwVbaGlobals::Dialogs( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaGlobals::Dialogs( const uno::Any& index ) { return getApplication()->Dialogs( index ); } uno::Any SAL_CALL -SwVbaGlobals::ListGalleries( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaGlobals::ListGalleries( const uno::Any& index ) { return getApplication()->ListGalleries( index ); } uno::Reference<word::XSelection > SAL_CALL -SwVbaGlobals::getSelection() throw (uno::RuntimeException, std::exception) +SwVbaGlobals::getSelection() { return getApplication()->getSelection(); } -float SAL_CALL SwVbaGlobals::CentimetersToPoints( float Centimeters ) throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaGlobals::CentimetersToPoints( float Centimeters ) { return getApplication()->CentimetersToPoints( Centimeters ); } @@ -153,7 +153,7 @@ SwVbaGlobals::getServiceNames() } uno::Sequence< OUString > -SwVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException, std::exception) +SwVbaGlobals::getAvailableServiceNames( ) { static bool bInit = false; static uno::Sequence< OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() ); diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index e82783366307..2674112af21f 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -39,7 +39,7 @@ private: css::uno::Reference< ooo::vba::word::XApplication > mxApplication; /// @throws css::uno::RuntimeException - css::uno::Reference< ooo::vba::word::XApplication > const & getApplication() throw (css::uno::RuntimeException); + css::uno::Reference< ooo::vba::word::XApplication > const & getApplication(); public: @@ -47,20 +47,20 @@ public: virtual ~SwVbaGlobals() override; // XGlobals - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL CentimetersToPoints( float Centimeters ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() override; + virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() override; + virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() override; + virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() override; + virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() override; + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) override; + virtual float SAL_CALL CentimetersToPoints( float Centimeters ) override; // XMultiServiceFactory - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx index 7b185fed6335..61548d62d521 100644 --- a/sw/source/ui/vba/vbaheaderfooter.cxx +++ b/sw/source/ui/vba/vbaheaderfooter.cxx @@ -29,27 +29,27 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaHeaderFooter::SwVbaHeaderFooter( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rProps, bool isHeader, sal_Int32 index ) throw ( uno::RuntimeException ) : SwVbaHeaderFooter_BASE( rParent, rContext ), mxModel( xModel ), mxPageStyleProps( rProps ), mbHeader( isHeader ), mnIndex( index ) +SwVbaHeaderFooter::SwVbaHeaderFooter( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rProps, bool isHeader, sal_Int32 index ) : SwVbaHeaderFooter_BASE( rParent, rContext ), mxModel( xModel ), mxPageStyleProps( rProps ), mbHeader( isHeader ), mnIndex( index ) { } -sal_Bool SAL_CALL SwVbaHeaderFooter::getIsHeader() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaHeaderFooter::getIsHeader() { return mbHeader; } -sal_Bool SAL_CALL SwVbaHeaderFooter::getLinkToPrevious() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaHeaderFooter::getLinkToPrevious() { // seems always false return false; } -void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( sal_Bool /*_linktoprevious*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( sal_Bool /*_linktoprevious*/ ) { // not support in Writer } -uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno::RuntimeException, std::exception) +uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() { OUString sPropsNameText; if( mbHeader ) @@ -71,7 +71,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno } uno::Any SAL_CALL -SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaHeaderFooter::Shapes( const uno::Any& index ) { // #FIXME: only get the shapes in the current header/footer uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx index 42e5295b16c9..fd3a3dea462b 100644 --- a/sw/source/ui/vba/vbaheaderfooter.hxx +++ b/sw/source/ui/vba/vbaheaderfooter.hxx @@ -35,14 +35,14 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader, sal_Int32 index ) throw ( css::uno::RuntimeException ); + SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader, sal_Int32 index ); // Attributes - virtual sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getLinkToPrevious() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkToPrevious( sal_Bool _linktoprevious ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsHeader() override; + virtual sal_Bool SAL_CALL getLinkToPrevious() override; + virtual void SAL_CALL setLinkToPrevious( sal_Bool _linktoprevious ) override; + virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() override; + virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx index 271334503b75..3c873b2769cb 100644 --- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx +++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx @@ -34,12 +34,12 @@ using namespace ::ooo::vba; #define FIRST_PAGE 1 // Class HeaderFooterHelper -bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel >& xModel ) { return isHeaderFooter( word::getCurrentXText( xModel ) ); } -bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException) +bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW ); OUString aImplName = xServiceInfo->getImplementationName(); @@ -48,7 +48,7 @@ bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xT return false; } -bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel ) { const uno::Reference< text::XText > xCurrentText = word::getCurrentXText( xModel ); if( !isHeaderFooter( xCurrentText ) ) @@ -86,7 +86,7 @@ bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel return false; } -bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel ) { if( isHeader( xModel ) ) { @@ -98,7 +98,7 @@ bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel return false; } -bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel ) { if( isHeader( xModel ) ) { @@ -114,7 +114,7 @@ bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel return false; } -bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel ) { const uno::Reference< text::XText > xCurrentText = word::getCurrentXText( xModel ); if( !isHeaderFooter( xCurrentText ) ) @@ -152,7 +152,7 @@ bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel return false; } -bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel ) { if( isFooter( xModel ) ) { @@ -163,7 +163,7 @@ bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel return false; } -bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel ) { if( isFooter( xModel ) ) { diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.hxx b/sw/source/ui/vba/vbaheaderfooterhelper.hxx index 1706a63fd7c9..aca71c8196c3 100644 --- a/sw/source/ui/vba/vbaheaderfooterhelper.hxx +++ b/sw/source/ui/vba/vbaheaderfooterhelper.hxx @@ -29,21 +29,21 @@ class HeaderFooterHelper { public: /// @throws css::uno::RuntimeException - static bool isHeaderFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + static bool isHeaderFooter( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - static bool isHeaderFooter( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException); + static bool isHeaderFooter( const css::uno::Reference< css::text::XText >& xText ); /// @throws css::uno::RuntimeException - static bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + static bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - static bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + static bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - static bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + static bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - static bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + static bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - static bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + static bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - static bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + static bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel ); }; #endif diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index db97153c44a4..c4cedf3f3a14 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -38,22 +38,22 @@ public: HeadersFootersIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, bool bHeader ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( bHeader ) {} // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount( ) override { // first page, even pages and primary page return 3; } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override { if( Index < 1 || Index > 3 ) throw lang::IndexOutOfBoundsException(); return uno::makeAny( uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( mxParent, mxContext, mxModel, mxPageStyleProps, mbHeader, Index ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<word::XHeaderFooter>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } @@ -65,12 +65,12 @@ class HeadersFootersEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit HeadersFootersEnumWrapper( SwVbaHeadersFooters* _pHeadersFooters ) : pHeadersFooters( _pHeadersFooters ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < pHeadersFooters->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex < pHeadersFooters->getCount() ) return pHeadersFooters->Item( uno::makeAny( ++nIndex ), uno::Any() ); @@ -82,13 +82,13 @@ SwVbaHeadersFooters::SwVbaHeadersFooters( const uno::Reference< XHelperInterface { } -::sal_Int32 SAL_CALL SwVbaHeadersFooters::getCount() throw (uno::RuntimeException) +::sal_Int32 SAL_CALL SwVbaHeadersFooters::getCount() { // wdHeaderFooterFirstPage, wdHeaderFooterPrimary and wdHeaderFooterEvenPages return 3; } -uno::Any SAL_CALL SwVbaHeadersFooters::Item( const uno::Any& Index1, const uno::Any& ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +uno::Any SAL_CALL SwVbaHeadersFooters::Item( const uno::Any& Index1, const uno::Any& ) { sal_Int32 nIndex = 0; Index1 >>= nIndex; @@ -101,13 +101,13 @@ uno::Any SAL_CALL SwVbaHeadersFooters::Item( const uno::Any& Index1, const uno:: // XEnumerationAccess uno::Type -SwVbaHeadersFooters::getElementType() throw (uno::RuntimeException) +SwVbaHeadersFooters::getElementType() { return cppu::UnoType<word::XHeaderFooter>::get(); } uno::Reference< container::XEnumeration > -SwVbaHeadersFooters::createEnumeration() throw (uno::RuntimeException) +SwVbaHeadersFooters::createEnumeration() { return new HeadersFootersEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx index bd9477e73ccb..3e9e32d9909e 100644 --- a/sw/source/ui/vba/vbaheadersfooters.hxx +++ b/sw/source/ui/vba/vbaheadersfooters.hxx @@ -35,11 +35,11 @@ private: public: SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader ); - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaHeadersFooters_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbainformationhelper.cxx b/sw/source/ui/vba/vbainformationhelper.cxx index 55128004edcd..4e2a266fdbf6 100644 --- a/sw/source/ui/vba/vbainformationhelper.cxx +++ b/sw/source/ui/vba/vbainformationhelper.cxx @@ -32,18 +32,18 @@ using namespace ::com::sun::star; static const sal_Int32 DEFAULT_PAGE_DISTANCE = 500; -sal_Int32 SwVbaInformationHelper::handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException ) +sal_Int32 SwVbaInformationHelper::handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) { uno::Reference< text::XPageCursor > xPageCursor( xTVCursor, uno::UNO_QUERY_THROW ); return xPageCursor->getPage(); } -sal_Int32 SwVbaInformationHelper::handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException ) +sal_Int32 SwVbaInformationHelper::handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ) { return word::getPageCount( xModel ); } -double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException ) +double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) { xTVCursor->collapseToStart(); uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbainformationhelper.hxx b/sw/source/ui/vba/vbainformationhelper.hxx index 86191061d0eb..0424a958e019 100644 --- a/sw/source/ui/vba/vbainformationhelper.hxx +++ b/sw/source/ui/vba/vbainformationhelper.hxx @@ -27,11 +27,11 @@ class SwVbaInformationHelper { public: /// @throws css::uno::RuntimeException - static sal_Int32 handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException ); + static sal_Int32 handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ); /// @throws css::uno::RuntimeException - static sal_Int32 handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException ); + static sal_Int32 handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - static double handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException ); + static double handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ); //static double verticalPositionRelativeToPageBoundary( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor, const css::uno::Reference< css::beans::XPropertySet >& xStyleProps ) throw( css::uno::RuntimeException ); }; diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx index 55ae07d1aca2..670fe376b427 100644 --- a/sw/source/ui/vba/vbalistformat.cxx +++ b/sw/source/ui/vba/vbalistformat.cxx @@ -29,7 +29,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaListFormat::SwVbaListFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) : SwVbaListFormat_BASE( rParent, rContext ), mxTextRange( xTextRange ) +SwVbaListFormat::SwVbaListFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextRange >& xTextRange ) : SwVbaListFormat_BASE( rParent, rContext ), mxTextRange( xTextRange ) { } @@ -37,7 +37,7 @@ SwVbaListFormat::~SwVbaListFormat() { } -void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) { bool bContinuePreviousList = true; if( ContinuePreviousList.hasValue() ) @@ -88,7 +88,7 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor while( xEnum->hasMoreElements() ); } -void SAL_CALL SwVbaListFormat::ConvertNumbersToText( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListFormat::ConvertNumbersToText( ) { throw uno::RuntimeException("Not implemented" ); } diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index 9223714ed894..e5b5d4fbeef8 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -34,12 +34,12 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaListFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException ); + SwVbaListFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextRange >& xTextRange ); virtual ~SwVbaListFormat() override; // Methods - virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ConvertNumbersToText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) override; + virtual void SAL_CALL ConvertNumbersToText( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index dac186307a90..30ef9d2f1ca2 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -29,12 +29,12 @@ class ListGalleriesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit ListGalleriesEnumWrapper( SwVbaListGalleries* pGalleries ) : pListGalleries( pGalleries ), nIndex( 1 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex <= pListGalleries->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex <= pListGalleries->getCount() ) return pListGalleries->Item( uno::makeAny( nIndex++ ), uno::Any() ); @@ -42,17 +42,17 @@ public: } }; -SwVbaListGalleries::SwVbaListGalleries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xTextDoc ) throw (uno::RuntimeException) : SwVbaListGalleries_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ), mxTextDocument( xTextDoc ) +SwVbaListGalleries::SwVbaListGalleries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xTextDoc ) : SwVbaListGalleries_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ), mxTextDocument( xTextDoc ) { } -::sal_Int32 SAL_CALL SwVbaListGalleries::getCount() throw (uno::RuntimeException) +::sal_Int32 SAL_CALL SwVbaListGalleries::getCount() { // 3 types of list( bullet, numbered and outline ) return 3; } -uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException) +uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) { sal_Int32 nIndex = 0; if( ( Index1 >>= nIndex ) ) @@ -67,13 +67,13 @@ uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::A // XEnumerationAccess uno::Type -SwVbaListGalleries::getElementType() throw (uno::RuntimeException) +SwVbaListGalleries::getElementType() { return cppu::UnoType<word::XListGallery>::get(); } uno::Reference< container::XEnumeration > -SwVbaListGalleries::createEnumeration() throw (uno::RuntimeException) +SwVbaListGalleries::createEnumeration() { return new ListGalleriesEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx index d26ed1407720..7cbf653a4d97 100644 --- a/sw/source/ui/vba/vbalistgalleries.hxx +++ b/sw/source/ui/vba/vbalistgalleries.hxx @@ -33,13 +33,13 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaListGalleries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc ) throw (css::uno::RuntimeException); + SwVbaListGalleries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc ); - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaListGalleries_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx index 037ab1adccd7..f41dcbd639d3 100644 --- a/sw/source/ui/vba/vbalistgallery.cxx +++ b/sw/source/ui/vba/vbalistgallery.cxx @@ -24,7 +24,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaListGallery::SwVbaListGallery( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw ( uno::RuntimeException ) : SwVbaListGallery_BASE( rParent, rContext ), mxTextDocument( xTextDoc ), mnType( nType ) +SwVbaListGallery::SwVbaListGallery( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nType ) : SwVbaListGallery_BASE( rParent, rContext ), mxTextDocument( xTextDoc ), mnType( nType ) { } @@ -33,7 +33,7 @@ SwVbaListGallery::~SwVbaListGallery() } uno::Any SAL_CALL -SwVbaListGallery::ListTemplates( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaListGallery::ListTemplates( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaListTemplates( mxParent, mxContext, mxTextDocument, mnType ) ); if ( index.hasValue() ) diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index 3fe3618aecfb..187cdd418dde 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -33,11 +33,11 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaListGallery( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw ( css::uno::RuntimeException ); + SwVbaListGallery( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ); virtual ~SwVbaListGallery() override; // Methods - virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx index 7a3fd941e13c..483526bfab13 100644 --- a/sw/source/ui/vba/vbalisthelper.cxx +++ b/sw/source/ui/vba/vbalisthelper.cxx @@ -46,12 +46,12 @@ static const sal_Int16 CHAR_DIAMOND = 10022; static const sal_Int16 CHAR_ARROW = 10146; static const sal_Int16 CHAR_CHECK_MARK = 10003; -SwVbaListHelper::SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw( css::uno::RuntimeException ) : mxTextDocument( xTextDoc ), mnGalleryType( nGalleryType ), mnTemplateType( nTemplateType ) +SwVbaListHelper::SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) : mxTextDocument( xTextDoc ), mnGalleryType( nGalleryType ), mnTemplateType( nTemplateType ) { Init(); } -void SwVbaListHelper::Init() throw( css::uno::RuntimeException ) +void SwVbaListHelper::Init() { // set the numbering style name switch( mnGalleryType ) @@ -102,7 +102,7 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException ) } } -void SwVbaListHelper::CreateListTemplate() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateListTemplate() { switch( mnGalleryType ) { @@ -128,7 +128,7 @@ void SwVbaListHelper::CreateListTemplate() throw( css::uno::RuntimeException ) } } -void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateBulletListTemplate() { // there is only 1 level for each bullet list in MSWord sal_Int32 nLevel = 0; @@ -188,7 +188,7 @@ void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeExcepti mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } -void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateNumberListTemplate() { // there is only 1 level for each bullet list in MSWord sal_Int32 nLevel = 0; @@ -253,7 +253,7 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) ); } -void SwVbaListHelper::CreateOutlineNumberListTemplate() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateOutlineNumberListTemplate() { switch( mnTemplateType ) { @@ -300,7 +300,7 @@ void SwVbaListHelper::CreateOutlineNumberListTemplate() throw( css::uno::Runtime } } -void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateOutlineNumberForType1() { sal_Int16 nNumberingType = 0; OUString sPrefix; @@ -377,7 +377,7 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce } } -void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateOutlineNumberForType2() { sal_Int16 nNumberingType = style::NumberingType::ARABIC; sal_Int16 nParentNumbering = 0; @@ -398,7 +398,7 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce } } -void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateOutlineNumberForType3() { sal_Int16 nNumberingType = style::NumberingType::CHAR_SPECIAL; OUString sCharStyleName( "Bullet Symbols" ); @@ -447,7 +447,7 @@ void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeExce } } -void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateOutlineNumberForType4() { sal_Int16 nNumberingType = 0; OUString sPrefix; @@ -532,7 +532,7 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce } } -void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateOutlineNumberForType5() { sal_Int16 nNumberingType = style::NumberingType::ARABIC; sal_Int16 nParentNumbering = 0; @@ -551,7 +551,7 @@ void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeExce } } -void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateOutlineNumberForType6() { sal_Int16 nNumberingType = 0; OUString sPrefix; @@ -634,7 +634,7 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce } } -void SwVbaListHelper::CreateOutlineNumberForType7() throw( css::uno::RuntimeException ) +void SwVbaListHelper::CreateOutlineNumberForType7() { sal_Int16 nNumberingType = style::NumberingType::ARABIC; uno::Sequence< beans::PropertyValue > aPropertyValues; @@ -649,14 +649,14 @@ void SwVbaListHelper::CreateOutlineNumberForType7() throw( css::uno::RuntimeExce } } -uno::Any SwVbaListHelper::getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) throw( css::uno::RuntimeException ) +uno::Any SwVbaListHelper::getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) { uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; return getPropertyValue( aPropertyValues, sName ); } -void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException ) +void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) { uno::Sequence< beans::PropertyValue > aPropertyValues; mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues; diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx index b6ece448dd51..0cc0efafca85 100644 --- a/sw/source/ui/vba/vbalisthelper.hxx +++ b/sw/source/ui/vba/vbalisthelper.hxx @@ -29,40 +29,40 @@ private: OUString msStyleName; /// @throws css::uno::RuntimeException - void Init() throw( css::uno::RuntimeException ); + void Init(); /// @throws css::uno::RuntimeException - void CreateListTemplate() throw( css::uno::RuntimeException ); + void CreateListTemplate(); /// @throws css::uno::RuntimeException - void CreateBulletListTemplate() throw( css::uno::RuntimeException ); + void CreateBulletListTemplate(); /// @throws css::uno::RuntimeException - void CreateNumberListTemplate() throw( css::uno::RuntimeException ); + void CreateNumberListTemplate(); /// @throws css::uno::RuntimeException - void CreateOutlineNumberListTemplate() throw( css::uno::RuntimeException ); + void CreateOutlineNumberListTemplate(); /// @throws css::uno::RuntimeException - void CreateOutlineNumberForType1() throw( css::uno::RuntimeException ); + void CreateOutlineNumberForType1(); /// @throws css::uno::RuntimeException - void CreateOutlineNumberForType2() throw( css::uno::RuntimeException ); + void CreateOutlineNumberForType2(); /// @throws css::uno::RuntimeException - void CreateOutlineNumberForType3() throw( css::uno::RuntimeException ); + void CreateOutlineNumberForType3(); /// @throws css::uno::RuntimeException - void CreateOutlineNumberForType4() throw( css::uno::RuntimeException ); + void CreateOutlineNumberForType4(); /// @throws css::uno::RuntimeException - void CreateOutlineNumberForType5() throw( css::uno::RuntimeException ); + void CreateOutlineNumberForType5(); /// @throws css::uno::RuntimeException - void CreateOutlineNumberForType6() throw( css::uno::RuntimeException ); + void CreateOutlineNumberForType6(); /// @throws css::uno::RuntimeException - void CreateOutlineNumberForType7() throw( css::uno::RuntimeException ); + void CreateOutlineNumberForType7(); public: /// @throws css::uno::RuntimeException - SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw( css::uno::RuntimeException ); + SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ); sal_Int32 getGalleryType() const { return mnGalleryType; } const css::uno::Reference< css::container::XIndexReplace >& getNumberingRules() const { return mxNumberingRules; } /// @throws css::uno::RuntimeException - css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) throw( css::uno::RuntimeException ); + css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ); /// @throws css::uno::RuntimeException - void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException ); + void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ); }; diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx index 9b7aa4294a5f..41a4aaf412cd 100644 --- a/sw/source/ui/vba/vbalistlevel.cxx +++ b/sw/source/ui/vba/vbalistlevel.cxx @@ -28,7 +28,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaListLevel::SwVbaListLevel( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper, sal_Int32 nLevel ) throw ( uno::RuntimeException ) : SwVbaListLevel_BASE( rParent, rContext ), pListHelper( pHelper ), mnLevel( nLevel ) +SwVbaListLevel::SwVbaListLevel( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper, sal_Int32 nLevel ) : SwVbaListLevel_BASE( rParent, rContext ), pListHelper( pHelper ), mnLevel( nLevel ) { } @@ -36,7 +36,7 @@ SwVbaListLevel::~SwVbaListLevel() { } -::sal_Int32 SAL_CALL SwVbaListLevel::getAlignment() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaListLevel::getAlignment() { sal_Int16 nAlignment = 0; pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "Adjust" ) >>= nAlignment; @@ -65,7 +65,7 @@ SwVbaListLevel::~SwVbaListLevel() return nAlignment; } -void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment ) { sal_Int16 nAlignment = text::HoriOrientation::LEFT; switch( _alignment ) @@ -93,44 +93,44 @@ void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment ) throw (uno: pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "Adjust", uno::makeAny( nAlignment ) ); } -uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont() throw (uno::RuntimeException, std::exception) +uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont() { throw uno::RuntimeException("Not implemented" ); } -void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::XFont >& /*_font*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::XFont >& /*_font*/ ) { throw uno::RuntimeException("Not implemented" ); } -::sal_Int32 SAL_CALL SwVbaListLevel::getIndex() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaListLevel::getIndex() { return mnLevel + 1; } -OUString SAL_CALL SwVbaListLevel::getLinkedStyle() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwVbaListLevel::getLinkedStyle() { // TODO: return OUString(); } -void SAL_CALL SwVbaListLevel::setLinkedStyle( const OUString& /*_linkedstyle*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setLinkedStyle( const OUString& /*_linkedstyle*/ ) { // TODO: } -OUString SAL_CALL SwVbaListLevel::getNumberFormat() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwVbaListLevel::getNumberFormat() { // TODO:: return OUString(); } -void SAL_CALL SwVbaListLevel::setNumberFormat( const OUString& /*_numberformat*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setNumberFormat( const OUString& /*_numberformat*/ ) { // TODO:: } -float SAL_CALL SwVbaListLevel::getNumberPosition() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaListLevel::getNumberPosition() { // indentAt + firstlineindent sal_Int32 nIndentAt = 0; @@ -143,7 +143,7 @@ float SAL_CALL SwVbaListLevel::getNumberPosition() throw (uno::RuntimeException, return static_cast< float >( Millimeter::getInPoints( nResult ) ); } -void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) { sal_Int32 nNumberPosition = Millimeter::getInHundredthsOfOneMillimeter( _numberposition ); @@ -154,7 +154,7 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw ( pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent", uno::makeAny( nFirstLineIndent ) ); } -::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle() { sal_Int16 nNumberingType = 0; pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "NumberingType" ) >>= nNumberingType; @@ -218,7 +218,7 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw ( return nNumberingType; } -void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle ) { sal_Int16 nNumberingType = 0; switch( _numberstyle ) @@ -292,31 +292,31 @@ void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle ) throw ( pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "NumberingType", uno::makeAny( nNumberingType ) ); } -::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher() { //seems not support? return 0; } -void SAL_CALL SwVbaListLevel::setResetOnHigher( ::sal_Int32 /*_resetonhigher*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setResetOnHigher( ::sal_Int32 /*_resetonhigher*/ ) { //seems not support? } -::sal_Int32 SAL_CALL SwVbaListLevel::getStartAt() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaListLevel::getStartAt() { sal_Int16 nStartWith = 0; pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "StartWith" ) >>= nStartWith; return nStartWith; } -void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat ) { sal_Int16 nStartWith = (sal_Int16)_startat; pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "StartWith", uno::makeAny( nStartWith ) ); } -float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaListLevel::getTabPosition() { sal_Int32 nTabPosition = 0; pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "ListtabStopPosition" ) >>= nTabPosition; @@ -324,13 +324,13 @@ float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException, st return static_cast< float >( Millimeter::getInPoints( nTabPosition ) ); } -void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition ) { sal_Int32 nTabPosition = Millimeter::getInHundredthsOfOneMillimeter( _tabposition ); pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "ListtabStopPosition", uno::makeAny( nTabPosition ) ); } -float SAL_CALL SwVbaListLevel::getTextPosition() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaListLevel::getTextPosition() { // indentAt sal_Int32 nIndentAt = 0; @@ -339,7 +339,7 @@ float SAL_CALL SwVbaListLevel::getTextPosition() throw (uno::RuntimeException, s return static_cast< float >( Millimeter::getInPoints( nIndentAt ) ); } -void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) { sal_Int32 nIndentAt = 0; sal_Int32 nFirstLineIndent = 0; @@ -354,7 +354,7 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno: pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent", uno::makeAny( nFirstLineIndent ) ); } -::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter() { sal_Int16 nLabelFollowedBy= 0; pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "LabelFollowedBy" ) >>= nLabelFollowedBy; @@ -362,7 +362,7 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno: return nLabelFollowedBy; } -void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharacter ) { sal_Int16 nLabelFollowedBy = (sal_Int16)_trailingcharacter; pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "LabelFollowedBy", uno::makeAny( nLabelFollowedBy ) ); diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index c4ec40ce37c6..3b40c45f80b4 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -34,33 +34,33 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaListLevel( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper, sal_Int32 nLevel ) throw ( css::uno::RuntimeException ); + SwVbaListLevel( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper, sal_Int32 nLevel ); virtual ~SwVbaListLevel() override; // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNumberStyle( ::sal_Int32 _numberstyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getResetOnHigher() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setResetOnHigher( ::sal_Int32 _resetonhigher ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getStartAt() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStartAt( ::sal_Int32 _startat ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getTabPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTabPosition( float _tabposition ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getTextPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTextPosition( float _textposition ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getTrailingCharacter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getAlignment() override; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) override; + virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() override; + virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) override; + virtual ::sal_Int32 SAL_CALL getIndex() override; + virtual OUString SAL_CALL getLinkedStyle() override; + virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) override; + virtual OUString SAL_CALL getNumberFormat() override; + virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) override; + virtual float SAL_CALL getNumberPosition() override; + virtual void SAL_CALL setNumberPosition( float _numberposition ) override; + virtual ::sal_Int32 SAL_CALL getNumberStyle() override; + virtual void SAL_CALL setNumberStyle( ::sal_Int32 _numberstyle ) override; + virtual ::sal_Int32 SAL_CALL getResetOnHigher() override; + virtual void SAL_CALL setResetOnHigher( ::sal_Int32 _resetonhigher ) override; + virtual ::sal_Int32 SAL_CALL getStartAt() override; + virtual void SAL_CALL setStartAt( ::sal_Int32 _startat ) override; + virtual float SAL_CALL getTabPosition() override; + virtual void SAL_CALL setTabPosition( float _tabposition ) override; + virtual float SAL_CALL getTextPosition() override; + virtual void SAL_CALL setTextPosition( float _textposition ) override; + virtual ::sal_Int32 SAL_CALL getTrailingCharacter() override; + virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index ff4125b3dbd5..b92fdd29cfb7 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -29,12 +29,12 @@ class ListLevelsEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit ListLevelsEnumWrapper( SwVbaListLevels* pLevels ) : pListLevels( pLevels ), nIndex( 1 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex <= pListLevels->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex <= pListLevels->getCount() ) return pListLevels->Item( uno::makeAny( nIndex++ ), uno::Any() ); @@ -42,11 +42,11 @@ public: } }; -SwVbaListLevels::SwVbaListLevels( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, SwVbaListHelperRef const & pHelper ) throw (uno::RuntimeException) : SwVbaListLevels_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ), pListHelper( pHelper ) +SwVbaListLevels::SwVbaListLevels( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, SwVbaListHelperRef const & pHelper ) : SwVbaListLevels_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ), pListHelper( pHelper ) { } -::sal_Int32 SAL_CALL SwVbaListLevels::getCount() throw (uno::RuntimeException) +::sal_Int32 SAL_CALL SwVbaListLevels::getCount() { sal_Int32 nGalleryType = pListHelper->getGalleryType(); if( nGalleryType == word::WdListGalleryType::wdBulletGallery @@ -57,7 +57,7 @@ SwVbaListLevels::SwVbaListLevels( const uno::Reference< XHelperInterface >& xPar return 0; } -uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException) +uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) { sal_Int32 nIndex = 0; if( !( Index1 >>= nIndex ) ) @@ -70,13 +70,13 @@ uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& // XEnumerationAccess uno::Type -SwVbaListLevels::getElementType() throw (uno::RuntimeException) +SwVbaListLevels::getElementType() { return cppu::UnoType<word::XListLevel>::get(); } uno::Reference< container::XEnumeration > -SwVbaListLevels::createEnumeration() throw (uno::RuntimeException) +SwVbaListLevels::createEnumeration() { return new ListLevelsEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index d61d13fa0443..a3252c8fab6c 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -33,13 +33,13 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaListLevels( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper ) throw ( css::uno::RuntimeException ); + SwVbaListLevels( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper ); - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaListLevels_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx index 3052745647f5..a4e646d26f78 100644 --- a/sw/source/ui/vba/vbalisttemplate.cxx +++ b/sw/source/ui/vba/vbalisttemplate.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaListTemplate::SwVbaListTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw ( uno::RuntimeException ) : SwVbaListTemplate_BASE( rParent, rContext ) +SwVbaListTemplate::SwVbaListTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) : SwVbaListTemplate_BASE( rParent, rContext ) { pListHelper.reset( new SwVbaListHelper( xTextDoc, nGalleryType, nTemplateType ) ); } @@ -35,7 +35,7 @@ SwVbaListTemplate::~SwVbaListTemplate() } uno::Any SAL_CALL -SwVbaListTemplate::ListLevels( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaListTemplate::ListLevels( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaListLevels( mxParent, mxContext, pListHelper ) ); if ( index.hasValue() ) @@ -43,7 +43,7 @@ SwVbaListTemplate::ListLevels( const uno::Any& index ) throw (uno::RuntimeExcept return uno::makeAny( xCol ); } -void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException) +void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet >& xProps ) { uno::Reference< container::XIndexReplace > xNumberingRules = pListHelper->getNumberingRules(); xProps->setPropertyValue("NumberingRules", uno::makeAny( xNumberingRules ) ); diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index e3d277d5bf82..598656f9dd48 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -33,14 +33,14 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaListTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw ( css::uno::RuntimeException ); + SwVbaListTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ); virtual ~SwVbaListTemplate() override; /// @throws css::uno::RuntimeException - void applyListTemplate( css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException ); + void applyListTemplate( css::uno::Reference< css::beans::XPropertySet >& xProps ); // Methods - virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index 6cf196afd338..84a979301901 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -28,12 +28,12 @@ class ListTemplatesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit ListTemplatesEnumWrapper( SwVbaListTemplates* pTemplates ) : pListTemplates( pTemplates ), nIndex( 1 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex <= pListTemplates->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex <= pListTemplates->getCount() ) return pListTemplates->Item( uno::makeAny( nIndex++ ), uno::Any() ); @@ -41,17 +41,17 @@ public: } }; -SwVbaListTemplates::SwVbaListTemplates( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw (uno::RuntimeException) : SwVbaListTemplates_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ), mxTextDocument( xTextDoc ), mnGalleryType( nType ) +SwVbaListTemplates::SwVbaListTemplates( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nType ) : SwVbaListTemplates_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ), mxTextDocument( xTextDoc ), mnGalleryType( nType ) { } -::sal_Int32 SAL_CALL SwVbaListTemplates::getCount() throw (uno::RuntimeException) +::sal_Int32 SAL_CALL SwVbaListTemplates::getCount() { // 3 types of list( bullet, numbered and outline ) return 7; } -uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException) +uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) { sal_Int32 nIndex = 0; if( !( Index1 >>= nIndex ) ) @@ -64,13 +64,13 @@ uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::A // XEnumerationAccess uno::Type -SwVbaListTemplates::getElementType() throw (uno::RuntimeException) +SwVbaListTemplates::getElementType() { return cppu::UnoType<word::XListTemplate>::get(); } uno::Reference< container::XEnumeration > -SwVbaListTemplates::createEnumeration() throw (uno::RuntimeException) +SwVbaListTemplates::createEnumeration() { return new ListTemplatesEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx index 8dd0a3754090..6a3f71cc2253 100644 --- a/sw/source/ui/vba/vbalisttemplates.hxx +++ b/sw/source/ui/vba/vbalisttemplates.hxx @@ -34,13 +34,13 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaListTemplates( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw (css::uno::RuntimeException); + SwVbaListTemplates( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ); - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaListTemplates_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx index aceca9346e6d..34b2b38146ba 100644 --- a/sw/source/ui/vba/vbaoptions.cxx +++ b/sw/source/ui/vba/vbaoptions.cxx @@ -41,7 +41,6 @@ SwVbaOptions::~SwVbaOptions() uno::Any SAL_CALL SwVbaOptions::DefaultFilePath( sal_Int32 _path ) - throw (css::script::BasicErrorException, uno::RuntimeException, std::exception) { switch( _path ) { @@ -127,132 +126,132 @@ uno::Any SwVbaOptions::getValueEvent() return uno::makeAny( sPath ); } -sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineStyle() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineStyle() { return word::WdLineStyle::wdLineStyleSingle; } -void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 /*_defaultborderlinestyle*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 /*_defaultborderlinestyle*/ ) { // not support in Writer } -sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineWidth() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineWidth() { return word::WdLineWidth::wdLineWidth050pt; } -void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 /*_defaultborderlinewidth*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 /*_defaultborderlinewidth*/ ) { // not support in Writer } -sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderColorIndex() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderColorIndex() { return word::WdColorIndex::wdAuto; } -void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 /*_defaultbordercolorindex*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 /*_defaultbordercolorindex*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaOptions::getReplaceSelection() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaOptions::getReplaceSelection() { return true; } -void SAL_CALL SwVbaOptions::setReplaceSelection( sal_Bool /*_replaceselection*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setReplaceSelection( sal_Bool /*_replaceselection*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaOptions::getMapPaperSize() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaOptions::getMapPaperSize() { return false; } -void SAL_CALL SwVbaOptions::setMapPaperSize( sal_Bool /*_mappapersize*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setMapPaperSize( sal_Bool /*_mappapersize*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyHeadings() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyHeadings() { return false; } -void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( sal_Bool /*_autoformatasyoutypeapplyheadings*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( sal_Bool /*_autoformatasyoutypeapplyheadings*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyBulletedLists() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyBulletedLists() { return false; } -void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool /*_autoformatasyoutypeapplybulletedlists*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool /*_autoformatasyoutypeapplybulletedlists*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyNumberedLists() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyNumberedLists() { return false; } -void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool /*_autoformatasyoutypeapplynumberedlists*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool /*_autoformatasyoutypeapplynumberedlists*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeFormatListItemBeginning() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeFormatListItemBeginning() { return false; } -void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool /*_autoformatasyoutypeformatlistitembeginning*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool /*_autoformatasyoutypeformatlistitembeginning*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeDefineStyles() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeDefineStyles() { return false; } -void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( sal_Bool /*_autoformatasyoutypedefinestyles*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( sal_Bool /*_autoformatasyoutypedefinestyles*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyHeadings() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyHeadings() { return false; } -void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( sal_Bool /*_autoformatapplyheadings*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( sal_Bool /*_autoformatapplyheadings*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyLists() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyLists() { return false; } -void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( sal_Bool /*_autoformatapplylists*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( sal_Bool /*_autoformatapplylists*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyBulletedLists() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyBulletedLists() { return false; } -void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( sal_Bool /*_autoformatapplybulletedlists*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( sal_Bool /*_autoformatapplybulletedlists*/ ) { // not support in Writer } diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx index 9a15ccd8a759..d7de9d6ea661 100644 --- a/sw/source/ui/vba/vbaoptions.hxx +++ b/sw/source/ui/vba/vbaoptions.hxx @@ -36,36 +36,35 @@ public: virtual ~SwVbaOptions() override; // Attributes - virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getReplaceSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReplaceSelection( sal_Bool _replaceselection ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMapPaperSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMapPaperSize( sal_Bool _mappapersize ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( sal_Bool _autoformatasyoutypeapplyheadings ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( sal_Bool _autoformatasyoutypedefinestyles ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoFormatApplyHeadings() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoFormatApplyHeadings( sal_Bool _autoformatapplyheadings ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoFormatApplyLists() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoFormatApplyLists( sal_Bool _autoformatapplylists ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoFormatApplyBulletedLists( sal_Bool _autoformatapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() override; + virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) override; + virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() override; + virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) override; + virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() override; + virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) override; + virtual sal_Bool SAL_CALL getReplaceSelection() override; + virtual void SAL_CALL setReplaceSelection( sal_Bool _replaceselection ) override; + virtual sal_Bool SAL_CALL getMapPaperSize() override; + virtual void SAL_CALL setMapPaperSize( sal_Bool _mappapersize ) override; + virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() override; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( sal_Bool _autoformatasyoutypeapplyheadings ) override; + virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() override; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool _autoformatasyoutypeapplybulletedlists ) override; + virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() override; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool _autoformatasyoutypeapplynumberedlists ) override; + virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() override; + virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool _autoformatasyoutypeformatlistitembeginning ) override; + virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() override; + virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( sal_Bool _autoformatasyoutypedefinestyles ) override; + virtual sal_Bool SAL_CALL getAutoFormatApplyHeadings() override; + virtual void SAL_CALL setAutoFormatApplyHeadings( sal_Bool _autoformatapplyheadings ) override; + virtual sal_Bool SAL_CALL getAutoFormatApplyLists() override; + virtual void SAL_CALL setAutoFormatApplyLists( sal_Bool _autoformatapplylists ) override; + virtual sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() override; + virtual void SAL_CALL setAutoFormatApplyBulletedLists( sal_Bool _autoformatapplybulletedlists ) override; // Methods - virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) - throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) override; //PropListener virtual void setValueEvent( const css::uno::Any& value ) override; diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index bf2f975625fb..dec1c8b47652 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -32,7 +32,7 @@ using namespace ::ooo::vba; SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, - const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException): + const uno::Reference< beans::XPropertySet >& xProps ): SwVbaPageSetup_BASE( xParent, xContext ) { mxModel.set( xModel, uno::UNO_QUERY_THROW ); @@ -41,13 +41,13 @@ SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent mnOrientLandscape = word::WdOrientation::wdOrientLandscape; } -double SAL_CALL SwVbaPageSetup::getGutter() throw (uno::RuntimeException, std::exception) +double SAL_CALL SwVbaPageSetup::getGutter() { // not support in Writer return 0; } -void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) { // default add gutter into left margin if( _gutter != 0 ) @@ -57,7 +57,7 @@ void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeExc } } -double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException, std::exception) +double SAL_CALL SwVbaPageSetup::getHeaderDistance() { bool isHeaderOn = false; mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn; @@ -75,7 +75,7 @@ double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException * @param: headerDistance is the value that is set in MS Word for the distance from the top of the page * to the header */ -void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) { sal_Int32 newHeaderDistance = Millimeter::getInHundredthsOfOneMillimeter( _headerdistance ); bool isHeaderOn = false; @@ -100,7 +100,7 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw mxPageProps->setPropertyValue("HeaderHeight", uno::makeAny( newHeaderHeight ) ); } -double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException, std::exception) +double SAL_CALL SwVbaPageSetup::getFooterDistance() { bool isFooterOn = false; mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn; @@ -109,7 +109,7 @@ double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException return VbaPageSetupBase::getFooterMargin(); } -void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) { sal_Int32 newFooterDistance = Millimeter::getInHundredthsOfOneMillimeter( _footerdistance ); bool isFooterOn = false; @@ -134,7 +134,7 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw mxPageProps->setPropertyValue("FooterHeight", uno::makeAny( newFooterHeight ) ); } -sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() { OUString pageStyle = getStyleOfFirstPage(); if ( pageStyle == "First Page" ) @@ -143,7 +143,7 @@ sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno return false; } -void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status ) { if( status == getDifferentFirstPageHeaderFooter() ) return; @@ -201,7 +201,7 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status xFirstPageProps->setPropertyValue("RightMargin", uno::makeAny( nRightMargin ) ); } -OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException) +OUString SwVbaPageSetup::getStyleOfFirstPage() { OUString styleFirstPage; uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW ); @@ -223,7 +223,7 @@ OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException) return styleFirstPage; } -::sal_Int32 SAL_CALL SwVbaPageSetup::getSectionStart() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaPageSetup::getSectionStart() { // FIXME: sal_Int32 wdSectionStart = word::WdSectionStart::wdSectionNewPage; @@ -238,7 +238,7 @@ OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException) return wdSectionStart; } -void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) { // fail to find corresponding feature in Writer // #FIXME: diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx index d51303d94f58..2cdd5caca960 100644 --- a/sw/source/ui/vba/vbapagesetup.hxx +++ b/sw/source/ui/vba/vbapagesetup.hxx @@ -32,26 +32,26 @@ class SwVbaPageSetup : public SwVbaPageSetup_BASE { private: /// @throws css::uno::RuntimeException - OUString getStyleOfFirstPage() throw (css::uno::RuntimeException); + OUString getStyleOfFirstPage(); public: /// @throws css::uno::RuntimeException SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel, - const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::beans::XPropertySet >& xProps ); // Attributes - virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGutter( double _gutter ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getHeaderDistance() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeaderDistance( double _headerdistance ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getFooterDistance() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFooterDistance( double _footerdistance ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getSectionStart() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getGutter() override; + virtual void SAL_CALL setGutter( double _gutter ) override; + virtual double SAL_CALL getHeaderDistance() override; + virtual void SAL_CALL setHeaderDistance( double _headerdistance ) override; + virtual double SAL_CALL getFooterDistance() override; + virtual void SAL_CALL setFooterDistance( double _footerdistance ) override; + virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() override; + virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) override; + virtual ::sal_Int32 SAL_CALL getSectionStart() override; + virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index 2c7f72a3e390..fa5dbe0218c7 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -58,12 +58,12 @@ public: DefaultPalette(){} // Methods XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount() override { return SAL_N_ELEMENTS(ColorTable); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -71,11 +71,11 @@ public: } // Methods XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType() override { return ::cppu::UnoType<sal_Int32>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() override { return true; } diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx index 4efb7580eacb..118538da3263 100644 --- a/sw/source/ui/vba/vbapane.cxx +++ b/sw/source/ui/vba/vbapane.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; SwVbaPane::SwVbaPane( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, - const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : + const uno::Reference< frame::XModel >& xModel ) : SwVbaPane_BASE( rParent, rContext ), mxModel( xModel ) { } @@ -35,13 +35,13 @@ SwVbaPane::~SwVbaPane() } uno::Any SAL_CALL -SwVbaPane::View() throw ( css::uno::RuntimeException, std::exception ) +SwVbaPane::View() { return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, mxModel ) ) ); } void SAL_CALL -SwVbaPane::Close( ) throw ( css::uno::RuntimeException, std::exception ) +SwVbaPane::Close( ) { OUString url = ".uno:CloseWin"; dispatchRequests( mxModel,url ); diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx index 5cf09bc90e41..e5c13bf1c324 100644 --- a/sw/source/ui/vba/vbapane.hxx +++ b/sw/source/ui/vba/vbapane.hxx @@ -32,12 +32,12 @@ private: public: /// @throws css::uno::RuntimeException SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException ); + const css::uno::Reference< css::frame::XModel >& xModel ); virtual ~SwVbaPane() override; // Methods - virtual css::uno::Any SAL_CALL View( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL View( ) override; + virtual void SAL_CALL Close( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index 7a163fe21b38..28edd7be2985 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -35,21 +35,21 @@ public: PanesIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) {} // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount( ) override { return 1; } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override { if( Index != 0 ) throw lang::IndexOutOfBoundsException(); return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<word::XPane>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } @@ -61,12 +61,12 @@ class PanesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit PanesEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); @@ -79,12 +79,12 @@ SwVbaPanes::SwVbaPanes( const uno::Reference< XHelperInterface >& xParent, const } // XEnumerationAccess uno::Type -SwVbaPanes::getElementType() throw (uno::RuntimeException) +SwVbaPanes::getElementType() { return cppu::UnoType<word::XPane>::get(); } uno::Reference< container::XEnumeration > -SwVbaPanes::createEnumeration() throw (uno::RuntimeException) +SwVbaPanes::createEnumeration() { return new PanesEnumWrapper( m_xIndexAccess ); } diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx index 2ee7ca287b4f..cfbc15330d66 100644 --- a/sw/source/ui/vba/vbapanes.hxx +++ b/sw/source/ui/vba/vbapanes.hxx @@ -33,8 +33,8 @@ public: SwVbaPanes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaPanes_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index b4108654e30c..42db168edb41 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -26,7 +26,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaParagraph::SwVbaParagraph( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xDocument, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) : +SwVbaParagraph::SwVbaParagraph( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xDocument, const uno::Reference< text::XTextRange >& xTextRange ) : SwVbaParagraph_BASE( rParent, rContext ), mxTextDocument( xDocument ), mxTextRange( xTextRange ) { } @@ -36,20 +36,20 @@ SwVbaParagraph::~SwVbaParagraph() } uno::Reference< word::XRange > SAL_CALL -SwVbaParagraph::getRange( ) throw ( uno::RuntimeException, std::exception ) +SwVbaParagraph::getRange( ) { return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText() ) ); } uno::Any SAL_CALL -SwVbaParagraph::getStyle( ) throw ( uno::RuntimeException, std::exception ) +SwVbaParagraph::getStyle( ) { uno::Reference< word::XRange > xRange = getRange(); return xRange->getStyle(); } void SAL_CALL -SwVbaParagraph::setStyle( const uno::Any& style ) throw ( uno::RuntimeException, std::exception ) +SwVbaParagraph::setStyle( const uno::Any& style ) { uno::Reference< word::XRange > xRange = getRange(); xRange->setStyle( style ); @@ -80,7 +80,7 @@ private: uno::Reference< text::XTextDocument > mxTextDocument; /// @throws uno::RuntimeException - uno::Reference< container::XEnumeration > getEnumeration() throw (uno::RuntimeException) + uno::Reference< container::XEnumeration > getEnumeration() { uno::Reference< container::XEnumerationAccess > xParEnumAccess( mxTextDocument->getText(), uno::UNO_QUERY_THROW ); return xParEnumAccess->createEnumeration(); @@ -88,14 +88,14 @@ private: public: /// @throws uno::RuntimeException - explicit ParagraphCollectionHelper( const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException): mxTextDocument( xDocument ) + explicit ParagraphCollectionHelper( const uno::Reference< text::XTextDocument >& xDocument ): mxTextDocument( xDocument ) { } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<text::XTextRange>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return true; } + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<text::XTextRange>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { sal_Int32 nCount = 0; uno::Reference< container::XEnumeration > xParEnum = getEnumeration(); @@ -109,7 +109,7 @@ public: } return nCount; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if( Index < getCount() ) { @@ -129,24 +129,24 @@ public: throw lang::IndexOutOfBoundsException(); } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { return getEnumeration(); } }; -SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument ) +SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument ) { } // XEnumerationAccess uno::Type -SwVbaParagraphs::getElementType() throw (uno::RuntimeException) +SwVbaParagraphs::getElementType() { return cppu::UnoType<word::XParagraph>::get(); } uno::Reference< container::XEnumeration > -SwVbaParagraphs::createEnumeration() throw (uno::RuntimeException) +SwVbaParagraphs::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return xEnumerationAccess->createEnumeration(); diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index ed3754b029c3..7ce0b0555630 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -36,13 +36,13 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaParagraph( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDocument, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException ); + SwVbaParagraph( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDocument, const css::uno::Reference< css::text::XTextRange >& xTextRange ); virtual ~SwVbaParagraph() override; // XParagraph - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getStyle() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setStyle( const css::uno::Any& style ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() override; + virtual css::uno::Any SAL_CALL getStyle() override; + virtual void SAL_CALL setStyle( const css::uno::Any& style ) override; // XHelperInterface virtual OUString getServiceImplName() override; @@ -57,11 +57,11 @@ private: css::uno::Reference< css::text::XTextDocument > mxTextDocument; public: /// @throws css::uno::RuntimeException - SwVbaParagraphs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDocument ) throw (css::uno::RuntimeException); + SwVbaParagraphs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDocument ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaParagraphs_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index e60acecf8e0d..b44130efa22a 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -45,40 +45,40 @@ SwVbaParagraphFormat::~SwVbaParagraphFormat() { } -sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment() throw (uno::RuntimeException, css::script::BasicErrorException, std::exception) +sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment() { style::ParagraphAdjust aParaAdjust = style::ParagraphAdjust_LEFT; mxParaProps->getPropertyValue("ParaAdjust") >>= aParaAdjust; return getMSWordAlignment( aParaAdjust ); } -void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment ) { style::ParagraphAdjust aParaAdjust = ( style::ParagraphAdjust ) getOOoAlignment( _alignment ); mxParaProps->setPropertyValue("ParaAdjust", uno::makeAny( aParaAdjust ) ); } -float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() { sal_Int32 indent = 0; mxParaProps->getPropertyValue("ParaFirstLineIndent") >>= indent; return (float)( Millimeter::getInPoints( indent ) ); } -void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) { sal_Int32 indent = Millimeter::getInHundredthsOfOneMillimeter( _firstlineindent ); mxParaProps->setPropertyValue("ParaFirstLineIndent", uno::makeAny( indent ) ); } -uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() { bool bKeep = false; mxParaProps->getPropertyValue("ParaKeepTogether") >>= bKeep; return uno::makeAny ( bKeep ); } -void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogether ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogether ) { bool bKeep = false; if( _keeptogether >>= bKeep ) @@ -91,14 +91,14 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth } } -uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() { bool bKeep = false; mxParaProps->getPropertyValue("ParaSplit") >>= bKeep; return uno::makeAny ( bKeep ); } -void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithnext ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithnext ) { bool bKeep = false; if( _keepwithnext >>= bKeep ) @@ -111,14 +111,14 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne } } -uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() { bool bHypn = false; mxParaProps->getPropertyValue("ParaIsHyphenation") >>= bHypn; return uno::makeAny ( bHypn ); } -void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation ) { bool bHypn = false; if( _hyphenation >>= bHypn ) @@ -131,14 +131,14 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation } } -float SAL_CALL SwVbaParagraphFormat::getLineSpacing() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaParagraphFormat::getLineSpacing() { style::LineSpacing aLineSpacing; mxParaProps->getPropertyValue("ParaLineSpacing") >>= aLineSpacing; return getMSWordLineSpacing( aLineSpacing ); } -void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) { style::LineSpacing aLineSpacing; mxParaProps->getPropertyValue("ParaLineSpacing") >>= aLineSpacing; @@ -146,27 +146,27 @@ void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) throw ( mxParaProps->setPropertyValue("ParaLineSpacing", uno::makeAny( aLineSpacing ) ); } -sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() { style::LineSpacing aLineSpacing; mxParaProps->getPropertyValue("ParaLineSpacing") >>= aLineSpacing; return getMSWordLineSpacingRule( aLineSpacing ); } -void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule ) { style::LineSpacing aLineSpacing = getOOoLineSpacingFromRule( _linespacingrule ); mxParaProps->setPropertyValue("ParaLineSpacing", uno::makeAny( aLineSpacing ) ); } -uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() { bool noLineNum = false; mxParaProps->getPropertyValue("ParaLineNumberCount") >>= noLineNum; return uno::makeAny ( noLineNum ); } -void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumber ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumber ) { bool noLineNum = false; if( _nolinenumber >>= noLineNum ) @@ -179,7 +179,7 @@ void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumb } } -sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() { sal_Int32 nLevel = word::WdOutlineLevel::wdOutlineLevelBodyText; OUString aHeading; @@ -193,7 +193,7 @@ sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeEx return nLevel; } -void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) { if( _outlinelevel != getOutlineLevel() ) { @@ -201,7 +201,7 @@ void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) t } } -uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() { style::BreakType aBreakType; mxParaProps->getPropertyValue("BreakType") >>= aBreakType; @@ -209,7 +209,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::Runtime return uno::makeAny( bBreakBefore ); } -void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbefore ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbefore ) { bool bBreakBefore = false; if( _breakbefore >>= bBreakBefore ) @@ -238,69 +238,69 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe } } -float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() { sal_Int32 nSpace = 0; mxParaProps->getPropertyValue("ParaTopMargin") >>= nSpace; return (float)( Millimeter::getInPoints( nSpace ) ); } -void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space ); mxParaProps->setPropertyValue("ParaTopMargin", uno::makeAny( nSpace ) ); } -float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() { sal_Int32 nSpace = 0; mxParaProps->getPropertyValue("ParaBottomMargin") >>= nSpace; return (float)( Millimeter::getInPoints( nSpace ) ); } -void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space ); mxParaProps->setPropertyValue("ParaBottomMargin", uno::makeAny( nSpace ) ); } -float SAL_CALL SwVbaParagraphFormat::getLeftIndent() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaParagraphFormat::getLeftIndent() { sal_Int32 nIndent = 0; mxParaProps->getPropertyValue("ParaLeftMargin") >>= nIndent; return (float)( Millimeter::getInPoints( nIndent ) ); } -void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) { sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _leftindent ); mxParaProps->setPropertyValue("ParaLeftMargin", uno::makeAny( nIndent ) ); } -float SAL_CALL SwVbaParagraphFormat::getRightIndent() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaParagraphFormat::getRightIndent() { sal_Int32 nIndent = 0; mxParaProps->getPropertyValue("ParaRightMargin") >>= nIndent; return (float)( Millimeter::getInPoints( nIndent ) ); } -void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) { sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _rightindent ); mxParaProps->setPropertyValue("ParaRightMargin", uno::makeAny( nIndent ) ); } -uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() { return uno::makeAny( uno::Reference< word::XTabStops >( new SwVbaTabStops( this, mxContext, mxParaProps ) ) ); } -void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) { throw uno::RuntimeException("Not implemented" ); } -uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() { sal_Int8 nWidow = 0; mxParaProps->getPropertyValue("ParaWidows") >>= nWidow; @@ -312,7 +312,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeExc return uno::makeAny( bWidow ); } -void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontrol ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontrol ) { // if we get true, the part of the paragraph on one page has to be // at least two lines @@ -474,7 +474,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL return wdLineSpacing; } -sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException) +sal_Int16 SwVbaParagraphFormat::getCharHeight() { float fCharHeight = 0.0; mxParaProps->getPropertyValue("CharHeight") >>= fCharHeight; diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index 2c6387e8a527..645c14c635cc 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -37,7 +37,7 @@ private: static float getMSWordLineSpacing( css::style::LineSpacing& rLineSpacing ); static sal_Int32 getMSWordLineSpacingRule( css::style::LineSpacing& rLineSpacing ); /// @throws css::uno::RuntimeException - sal_Int16 getCharHeight() throw (css::uno::RuntimeException); + sal_Int16 getCharHeight(); static sal_Int32 getOOoAlignment( sal_Int32 _alignment ); static sal_Int32 getMSWordAlignment( sal_Int32 _alignment ); @@ -46,38 +46,38 @@ public: virtual ~SwVbaParagraphFormat() override; // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override; - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFirstLineIndent() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getKeepTogether() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getKeepWithNext() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getHyphenation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getLineSpacing() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLineSpacing( float _linespacing ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLineSpacingRule() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getNoLineNumber() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getOutlineLevel() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPageBreakBefore() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getSpaceBefore() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSpaceBefore( float _spacebefore ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getSpaceAfter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSpaceAfter( float _spaceafter ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getLeftIndent() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeftIndent( float _leftindent ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getRightIndent() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRightIndent( float _rightindent ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getTabStops() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getWidowControl() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getAlignment() override; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) override; + virtual float SAL_CALL getFirstLineIndent() override; + virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) override; + virtual css::uno::Any SAL_CALL getKeepTogether() override; + virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) override; + virtual css::uno::Any SAL_CALL getKeepWithNext() override; + virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) override; + virtual css::uno::Any SAL_CALL getHyphenation() override; + virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) override; + virtual float SAL_CALL getLineSpacing() override; + virtual void SAL_CALL setLineSpacing( float _linespacing ) override; + virtual ::sal_Int32 SAL_CALL getLineSpacingRule() override; + virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) override; + virtual css::uno::Any SAL_CALL getNoLineNumber() override; + virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) override; + virtual ::sal_Int32 SAL_CALL getOutlineLevel() override; + virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) override; + virtual css::uno::Any SAL_CALL getPageBreakBefore() override; + virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) override; + virtual float SAL_CALL getSpaceBefore() override; + virtual void SAL_CALL setSpaceBefore( float _spacebefore ) override; + virtual float SAL_CALL getSpaceAfter() override; + virtual void SAL_CALL setSpaceAfter( float _spaceafter ) override; + virtual float SAL_CALL getLeftIndent() override; + virtual void SAL_CALL setLeftIndent( float _leftindent ) override; + virtual float SAL_CALL getRightIndent() override; + virtual void SAL_CALL setRightIndent( float _rightindent ) override; + virtual css::uno::Any SAL_CALL getTabStops() override; + virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) override; + virtual css::uno::Any SAL_CALL getWidowControl() override; + virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index 3ee72935845d..a76cd1cdce51 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -45,18 +45,18 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ) +SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart ) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ) { uno::Reference< text::XTextRange > xEnd; initialize( rStart, xEnd ); } -SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ) +SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ) { initialize( rStart, rEnd ); } -SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ) +SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText ) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ) { initialize( rStart, rEnd ); } @@ -65,7 +65,7 @@ SwVbaRange::~SwVbaRange() { } -void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, uno::RuntimeException) +void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) { if( !mxText.is() ) { @@ -84,7 +84,7 @@ void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, c } uno::Reference< text::XTextRange > SAL_CALL -SwVbaRange::getXTextRange() throw (uno::RuntimeException, std::exception) +SwVbaRange::getXTextRange() { uno::Reference< text::XTextRange > xTextRange( mxTextCursor, uno::UNO_QUERY_THROW ); return xTextRange; @@ -96,7 +96,7 @@ SwVbaRange::getXTextRange() throw (uno::RuntimeException, std::exception) * @return */ OUString SAL_CALL -SwVbaRange::getText() throw ( uno::RuntimeException, std::exception ) +SwVbaRange::getText() { OUString aText = mxTextCursor->getString(); sal_Int32 nLen = aText.getLength(); @@ -125,7 +125,7 @@ SwVbaRange::getText() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -SwVbaRange::setText( const OUString& rText ) throw ( uno::RuntimeException, std::exception ) +SwVbaRange::setText( const OUString& rText ) { // Emulate the MSWord behavior, Don't delete the bookmark // which contains no text string in current inserting position, @@ -171,7 +171,6 @@ SwVbaRange::setText( const OUString& rText ) throw ( uno::RuntimeException, std: // FIXME: test is not pass void SAL_CALL SwVbaRange::InsertBreak(const uno::Any& _breakType) - throw (css::script::BasicErrorException, uno::RuntimeException, std::exception) { // default type is wdPageBreak; sal_Int32 nBreakType = word::WdBreakType::wdPageBreak; @@ -215,7 +214,7 @@ void SAL_CALL SwVbaRange::InsertBreak(const uno::Any& _breakType) } void SAL_CALL -SwVbaRange::Select() throw ( uno::RuntimeException, std::exception ) +SwVbaRange::Select() { uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextViewCursor > xTextViewCursor = word::getXTextViewCursor( xModel ); @@ -224,14 +223,14 @@ SwVbaRange::Select() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -SwVbaRange::InsertParagraph() throw ( uno::RuntimeException, std::exception ) +SwVbaRange::InsertParagraph() { mxTextCursor->setString( "" ); InsertParagraphBefore(); } void SAL_CALL -SwVbaRange::InsertParagraphBefore() throw ( uno::RuntimeException, std::exception ) +SwVbaRange::InsertParagraphBefore() { uno::Reference< text::XTextRange > xTextRange = mxTextCursor->getStart(); mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, true ); @@ -239,26 +238,26 @@ SwVbaRange::InsertParagraphBefore() throw ( uno::RuntimeException, std::exceptio } void SAL_CALL -SwVbaRange::InsertParagraphAfter() throw ( uno::RuntimeException, std::exception ) +SwVbaRange::InsertParagraphAfter() { uno::Reference< text::XTextRange > xTextRange = mxTextCursor->getEnd(); mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, true ); } uno::Reference< word::XParagraphFormat > SAL_CALL -SwVbaRange::getParagraphFormat() throw ( uno::RuntimeException, std::exception ) +SwVbaRange::getParagraphFormat() { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, xParaProps ) ); } void SAL_CALL -SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& /*rParagraphFormat*/ ) throw ( uno::RuntimeException, std::exception ) +SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& /*rParagraphFormat*/ ) { throw uno::RuntimeException("Not implemented" ); } -void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( uno::RuntimeException ) +void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) { uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW ); if( ( xProp->getPropertyValue("CharStyleName") >>= aStyleName ) && !aStyleName.isEmpty() ) @@ -276,7 +275,7 @@ void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw } uno::Any SAL_CALL -SwVbaRange::getStyle() throw ( uno::RuntimeException, std::exception ) +SwVbaRange::getStyle() { OUString aStyleName; OUString aStyleType; @@ -289,39 +288,39 @@ SwVbaRange::getStyle() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -SwVbaRange::setStyle( const uno::Any& rStyle ) throw ( uno::RuntimeException, std::exception ) +SwVbaRange::setStyle( const uno::Any& rStyle ) { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); SwVbaStyle::setStyle( xParaProps, rStyle ); } uno::Reference< word::XFont > SAL_CALL -SwVbaRange::getFont() throw ( uno::RuntimeException, std::exception ) +SwVbaRange::getFont() { VbaPalette aColors; return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), uno::Reference< beans::XPropertySet >( getXTextRange(), uno::UNO_QUERY_THROW ) ); } uno::Reference< word::XListFormat > SAL_CALL -SwVbaRange::getListFormat() throw ( uno::RuntimeException, std::exception ) +SwVbaRange::getListFormat() { return uno::Reference< word::XListFormat >( new SwVbaListFormat( this, mxContext, getXTextRange() ) ); } -::sal_Int32 SAL_CALL SwVbaRange::getLanguageID() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaRange::getLanguageID() { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); return SwVbaStyle::getLanguageID( xParaProps ); } -void SAL_CALL SwVbaRange::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRange::setLanguageID( ::sal_Int32 _languageid ) { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); SwVbaStyle::setLanguageID( xParaProps, _languageid ); } uno::Any SAL_CALL -SwVbaRange::PageSetup( ) throw (uno::RuntimeException, std::exception) +SwVbaRange::PageSetup( ) { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); @@ -334,13 +333,13 @@ SwVbaRange::PageSetup( ) throw (uno::RuntimeException, std::exception) return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, xModel, xPageProps ) ) ); } -::sal_Int32 SAL_CALL SwVbaRange::getStart() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaRange::getStart() { uno::Reference< text::XText > xText = mxTextDocument->getText(); return SwVbaRangeHelper::getPosition( xText, mxTextCursor->getStart() ); } -void SAL_CALL SwVbaRange::setStart( ::sal_Int32 _start ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRange::setStart( ::sal_Int32 _start ) { uno::Reference< text::XText > xText = mxTextDocument->getText(); uno::Reference< text::XTextRange > xStart = SwVbaRangeHelper::getRangeByPosition( xText, _start ); @@ -350,13 +349,13 @@ void SAL_CALL SwVbaRange::setStart( ::sal_Int32 _start ) throw (uno::RuntimeExce mxTextCursor->gotoRange( xEnd, true ); } -::sal_Int32 SAL_CALL SwVbaRange::getEnd() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaRange::getEnd() { uno::Reference< text::XText > xText = mxTextDocument->getText(); return SwVbaRangeHelper::getPosition( xText, mxTextCursor->getEnd() ); } -void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end ) { uno::Reference< text::XText > xText = mxTextDocument->getText(); uno::Reference< text::XTextRange > xEnd = SwVbaRangeHelper::getRangeByPosition( xText, _end ); @@ -365,7 +364,7 @@ void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeExceptio mxTextCursor->gotoRange( xEnd, true ); } -sal_Bool SAL_CALL SwVbaRange::InRange( const uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaRange::InRange( const uno::Reference< ::ooo::vba::word::XRange >& Range ) { SwVbaRange* pRange = dynamic_cast< SwVbaRange* >( Range.get() ); if( !pRange ) @@ -378,7 +377,7 @@ sal_Bool SAL_CALL SwVbaRange::InRange( const uno::Reference< ::ooo::vba::word::X } uno::Any SAL_CALL -SwVbaRange::Revisions( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaRange::Revisions( const uno::Any& index ) { uno::Reference< text::XTextRange > xTextRange = getXTextRange(); uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); @@ -389,7 +388,7 @@ SwVbaRange::Revisions( const uno::Any& index ) throw (uno::RuntimeException, std } uno::Any SAL_CALL -SwVbaRange::Sections( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaRange::Sections( const uno::Any& index ) { uno::Reference< text::XTextRange > xTextRange = getXTextRange(); uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); @@ -400,7 +399,7 @@ SwVbaRange::Sections( const uno::Any& index ) throw (uno::RuntimeException, std: } uno::Any SAL_CALL -SwVbaRange::Fields( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaRange::Fields( const uno::Any& index ) { //FIXME: should be get the field in current range uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx index 816e12c3549a..d5ca830ff6aa 100644 --- a/sw/source/ui/vba/vbarange.hxx +++ b/sw/source/ui/vba/vbarange.hxx @@ -41,56 +41,53 @@ private: private: /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ); /// @throws css::uno::RuntimeException - void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( css::uno::RuntimeException ); + void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ); public: /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart) throw (css::script::BasicErrorException, css::uno::RuntimeException); + SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText) throw (css::script::BasicErrorException, css::uno::RuntimeException); + SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText); virtual ~SwVbaRange() override; const css::uno::Reference< css::text::XTextDocument >& getDocument() const { return mxTextDocument; } - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() override; const css::uno::Reference< css::text::XText >& getXText() const { return mxText; } void setXTextCursor( const css::uno::Reference< css::text::XTextCursor >& xTextCursor ) { mxTextCursor = xTextCursor; } // Attribute - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() override; + virtual void SAL_CALL setText( const OUString& rText ) override; + virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() override; + virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) override; + virtual css::uno::Any SAL_CALL getStyle() override; + virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) override; - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XListFormat > SAL_CALL getListFormat() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() override; + virtual css::uno::Reference< ooo::vba::word::XListFormat > SAL_CALL getListFormat() override; // Methods - virtual void SAL_CALL InsertBreak(const css::uno::Any& _breakType) - throw (css::script::BasicErrorException, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLanguageID() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL InsertBreak(const css::uno::Any& _breakType) override; + virtual void SAL_CALL Select() override; + virtual void SAL_CALL InsertParagraph() override; + virtual void SAL_CALL InsertParagraphBefore() override; + virtual void SAL_CALL InsertParagraphAfter() override; + virtual ::sal_Int32 SAL_CALL getLanguageID() override; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) override; + virtual css::uno::Any SAL_CALL PageSetup() override; + virtual ::sal_Int32 SAL_CALL getStart() override; + virtual void SAL_CALL setStart( ::sal_Int32 _start ) override; + virtual ::sal_Int32 SAL_CALL getEnd() override; + virtual void SAL_CALL setEnd( ::sal_Int32 _end ) override; + virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) override; + virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx index dda1bb6558f1..17fd3a0bfa71 100644 --- a/sw/source/ui/vba/vbarangehelper.cxx +++ b/sw/source/ui/vba/vbarangehelper.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; * @return a range for the position; null is returned if no range can be * constructed. */ -uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const uno::Reference< text::XText >& rText, sal_Int32 _position ) throw ( uno::RuntimeException ) +uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const uno::Reference< text::XText >& rText, sal_Int32 _position ) { uno::Reference< text::XTextRange > xRange; if( rText.is() ) @@ -60,7 +60,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u return xRange; } -void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, bool _bAbsorb ) throw ( uno::RuntimeException ) +void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, bool _bAbsorb ) { sal_Int32 nlastIndex = 0; sal_Int32 nIndex = 0; @@ -90,7 +90,6 @@ void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRa uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Reference< text::XTextRange >& rTextRange, const uno::Reference< text::XText >& rText ) - throw ( uno::RuntimeException, script::BasicErrorException ) { uno::Reference< text::XTextCursor > xTextCursor; bool bGotTextCursor = false; @@ -133,7 +132,7 @@ uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Ref return xTextCursor; } -sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rText, const uno::Reference< text::XTextRange >& rTextRange ) throw ( uno::RuntimeException ) +sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rText, const uno::Reference< text::XTextRange >& rTextRange ) { sal_Int32 nPosition = -1; if( rText.is() && rTextRange.is() ) @@ -163,7 +162,7 @@ sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rT return nPosition; } -uno::Reference< text::XTextContent > SwVbaRangeHelper::findBookmarkByPosition( const uno::Reference< text::XTextDocument >& xTextDoc, const uno::Reference< text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException ) +uno::Reference< text::XTextContent > SwVbaRangeHelper::findBookmarkByPosition( const uno::Reference< text::XTextDocument >& xTextDoc, const uno::Reference< text::XTextRange >& xTextRange ) { uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( xTextDoc, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xIndexAccess( xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx index f5eecabe0120..40b02531bd74 100644 --- a/sw/source/ui/vba/vbarangehelper.hxx +++ b/sw/source/ui/vba/vbarangehelper.hxx @@ -29,16 +29,16 @@ class SwVbaRangeHelper { public: /// @throws css::uno::RuntimeException - static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException ); + static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position ); /// @throws css::uno::RuntimeException - static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, bool _bAbsorb ) throw ( css::uno::RuntimeException ); + static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, bool _bAbsorb ); /// @throws css::uno::RuntimeException /// @throws css::script::BasicErrorException - static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ); + static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ); /// @throws css::uno::RuntimeException - static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw ( css::uno::RuntimeException ); + static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ); /// @throws css::uno::RuntimeException - static css::uno::Reference< css::text::XTextContent > findBookmarkByPosition( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException ); + static css::uno::Reference< css::text::XTextContent > findBookmarkByPosition( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, const css::uno::Reference< css::text::XTextRange >& xTextRange ); }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBARANGEHELPER_HXX diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx index 74e0c6a0d1b0..c0de490dc483 100644 --- a/sw/source/ui/vba/vbareplacement.cxx +++ b/sw/source/ui/vba/vbareplacement.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaReplacement::SwVbaReplacement( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< util::XPropertyReplace >& xPropertyReplace ) throw ( uno::RuntimeException ) : +SwVbaReplacement::SwVbaReplacement( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< util::XPropertyReplace >& xPropertyReplace ) : SwVbaReplacement_BASE( rParent, rContext ), mxPropertyReplace( xPropertyReplace ) { } @@ -32,17 +32,17 @@ SwVbaReplacement::~SwVbaReplacement() { } -OUString SAL_CALL SwVbaReplacement::getText() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwVbaReplacement::getText() { return mxPropertyReplace->getReplaceString(); } -void SAL_CALL SwVbaReplacement::setText( const OUString& _text ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaReplacement::setText( const OUString& _text ) { mxPropertyReplace->setReplaceString( _text ); } -void SAL_CALL SwVbaReplacement::ClearFormatting( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaReplacement::ClearFormatting( ) { uno::Sequence< beans::PropertyValue > aPropValues; mxPropertyReplace->setReplaceAttributes( aPropValues ); diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx index f68f41fc609c..22f37910ed13 100644 --- a/sw/source/ui/vba/vbareplacement.hxx +++ b/sw/source/ui/vba/vbareplacement.hxx @@ -32,15 +32,15 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaReplacement( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::util::XPropertyReplace >& xPropertyReplace ) throw ( css::uno::RuntimeException ); + SwVbaReplacement( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::util::XPropertyReplace >& xPropertyReplace ); virtual ~SwVbaReplacement() override; // Attributes - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() override; + virtual void SAL_CALL setText( const OUString& _text ) override; //Methods - virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ClearFormatting() override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx index 34952f596e86..556a65bd18f7 100644 --- a/sw/source/ui/vba/vbarevision.cxx +++ b/sw/source/ui/vba/vbarevision.cxx @@ -28,7 +28,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaRevision::SwVbaRevision( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xRedlineProps ) throw ( uno::RuntimeException ) : SwVbaRevision_BASE( rParent, rContext ), mxModel( xModel ), mxRedlineProps( xRedlineProps ) +SwVbaRevision::SwVbaRevision( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xRedlineProps ) : SwVbaRevision_BASE( rParent, rContext ), mxModel( xModel ), mxRedlineProps( xRedlineProps ) { } @@ -36,7 +36,7 @@ SwVbaRevision::~SwVbaRevision() { } -sal_Int32 SwVbaRevision::GetPosition() throw (css::uno::RuntimeException) +sal_Int32 SwVbaRevision::GetPosition() { sal_Int32 nPos = -1; uno::Reference< document::XRedlinesSupplier > xRedlinesSupp( mxModel, uno::UNO_QUERY_THROW ); @@ -59,7 +59,7 @@ sal_Int32 SwVbaRevision::GetPosition() throw (css::uno::RuntimeException) } void SAL_CALL -SwVbaRevision::Accept() throw ( css::uno::RuntimeException, std::exception ) +SwVbaRevision::Accept() { SwDoc* pDoc = word::getDocShell( mxModel )->GetDoc(); if( pDoc ) @@ -67,7 +67,7 @@ SwVbaRevision::Accept() throw ( css::uno::RuntimeException, std::exception ) } void SAL_CALL -SwVbaRevision::Reject( ) throw ( css::uno::RuntimeException, std::exception ) +SwVbaRevision::Reject( ) { SwDoc* pDoc = word::getDocShell( mxModel )->GetDoc(); if( pDoc ) diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx index 8fb556510d8f..77561a42ddc0 100644 --- a/sw/source/ui/vba/vbarevision.hxx +++ b/sw/source/ui/vba/vbarevision.hxx @@ -32,16 +32,16 @@ private: private: /// @throws css::uno::RuntimeException - sal_Int32 GetPosition() throw (css::uno::RuntimeException); + sal_Int32 GetPosition(); public: /// @throws css::uno::RuntimeException - SwVbaRevision( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xRedlineProps ) throw ( css::uno::RuntimeException ); + SwVbaRevision( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xRedlineProps ); virtual ~SwVbaRevision() override; // Methods - virtual void SAL_CALL Accept( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Reject( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Accept( ) override; + virtual void SAL_CALL Reject( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 68b6c1560eca..661413f1ed20 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -34,11 +34,11 @@ class RedlinesEnumeration : public ::cppu::WeakImplHelper< container::XEnumerati RevisionMap::iterator mIt; public: explicit RedlinesEnumeration( const RevisionMap& sMap ) : mRevisionMap( sMap ), mIt( mRevisionMap.begin() ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( mIt != mRevisionMap.end() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -53,14 +53,14 @@ class RevisionCollectionHelper : public ::cppu::WeakImplHelper< container::XInde RevisionMap mRevisionMap; public: /// @throws css::uno::RuntimeException -RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw (uno::RuntimeException); +RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ); // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<beans::XPropertySet>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return ( !mRevisionMap.empty() ); } + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<beans::XPropertySet>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) override { return ( !mRevisionMap.empty() ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { return mRevisionMap.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return mRevisionMap.size(); } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -69,13 +69,13 @@ RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const u } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { return new RedlinesEnumeration( mRevisionMap ); } }; -RevisionCollectionHelper::RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw (uno::RuntimeException) +RevisionCollectionHelper::RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) { uno::Reference< text::XTextRangeCompare > xTRC( xTextRange->getText(), uno::UNO_QUERY_THROW ); uno::Reference< document::XRedlinesSupplier > xRedlinesSupp( xModel, uno::UNO_QUERY_THROW ); @@ -96,9 +96,9 @@ class RevisionsEnumeration : public EnumerationHelperImpl uno::Reference< frame::XModel > m_xModel; public: /// @throws uno::RuntimeException - RevisionsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {} + RevisionsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< beans::XPropertySet > xRevision( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XRevision > ( new SwVbaRevision( m_xParent, m_xContext, m_xModel, xRevision ) ) ); @@ -116,12 +116,12 @@ SwVbaRevisions::SwVbaRevisions( const uno::Reference< XHelperInterface >& xParen // XEnumerationAccess uno::Type -SwVbaRevisions::getElementType() throw (uno::RuntimeException) +SwVbaRevisions::getElementType() { return cppu::UnoType<word::XRevision>::get(); } uno::Reference< container::XEnumeration > -SwVbaRevisions::createEnumeration() throw (uno::RuntimeException) +SwVbaRevisions::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return new RevisionsEnumeration( this, mxContext, xEnumAccess->createEnumeration(), mxModel ); @@ -134,7 +134,7 @@ SwVbaRevisions::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XRevision > ( new SwVbaRevision( this, mxContext, mxModel, xRevision ) ) ); } -void SAL_CALL SwVbaRevisions::AcceptAll( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRevisions::AcceptAll( ) { // First we need to put all the redline into a vector, because if the redline is accepted, // it will auto delete in the document. @@ -154,7 +154,7 @@ void SAL_CALL SwVbaRevisions::AcceptAll( ) throw (css::uno::RuntimeException, s } } -void SAL_CALL SwVbaRevisions::RejectAll( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRevisions::RejectAll( ) { throw uno::RuntimeException(); } diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index ecadcd0caa6a..2dec38640cb3 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -37,12 +37,12 @@ public: SwVbaRevisions( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); // Methods - virtual void SAL_CALL AcceptAll( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL RejectAll( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL AcceptAll( ) override; + virtual void SAL_CALL RejectAll( ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaRevisions_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index 7e3716e12bf2..67f905a65719 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -31,7 +31,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaRow::SwVbaRow( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( uno::RuntimeException ) : +SwVbaRow::SwVbaRow( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nIndex ) : SwVbaRow_BASE( rParent, rContext ), mxTextTable( xTextTable ), mnIndex( nIndex ) { mxTableRows = mxTextTable->getRows(); @@ -42,7 +42,7 @@ SwVbaRow::~SwVbaRow() { } -uno::Any SAL_CALL SwVbaRow::getHeight() throw (css::uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaRow::getHeight() { if( getHeightRule() == word::WdRowHeightRule::wdRowHeightAuto ) return uno::makeAny( sal_Int32( word::WdConstants::wdUndefined ) ); @@ -52,7 +52,7 @@ uno::Any SAL_CALL SwVbaRow::getHeight() throw (css::uno::RuntimeException, std:: return uno::makeAny( (float)Millimeter::getInPoints( nHeight ) ); } -void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) { float height = 0; _height >>= height; @@ -61,26 +61,26 @@ void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) throw (css::uno::Ru mxRowProps->setPropertyValue("Height", uno::makeAny( nHeight ) ); } -::sal_Int32 SAL_CALL SwVbaRow::getHeightRule() throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaRow::getHeightRule() { bool isAutoHeight = false; mxRowProps->getPropertyValue("IsAutoHeight") >>= isAutoHeight; return isAutoHeight ? word::WdRowHeightRule::wdRowHeightAuto : word::WdRowHeightRule::wdRowHeightExactly; } -void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule ) { bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto ); mxRowProps->setPropertyValue("IsAutoHeight", uno::makeAny( isAutoHeight ) ); } void SAL_CALL -SwVbaRow::Select( ) throw ( uno::RuntimeException, std::exception ) +SwVbaRow::Select( ) { SelectRow( getCurrentWordDoc(mxContext), mxTextTable, mnIndex, mnIndex ); } -void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw ( uno::RuntimeException ) +void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) { OUStringBuffer aRangeName; aRangeName.append('A').append(sal_Int32( nStartRow + 1 ) ); @@ -99,7 +99,7 @@ void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const u xSelection->select( uno::makeAny( xSelRange ) ); } -void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule ) { setHeightRule( heightrule ); setHeight( uno::makeAny( height ) ); diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx index a529e5c123df..7c6e6f3ccf8b 100644 --- a/sw/source/ui/vba/vbarow.hxx +++ b/sw/source/ui/vba/vbarow.hxx @@ -36,21 +36,21 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaRow( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( css::uno::RuntimeException ); + SwVbaRow( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex ); virtual ~SwVbaRow() override; // Attributes - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getHeight() override; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) override; + virtual ::sal_Int32 SAL_CALL getHeightRule() override; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) override; // Methods - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Select( ) override; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) override; /// @throws css::uno::RuntimeException - static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw (css::uno::RuntimeException); + static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ); // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index 182ef99f65a9..9807c5e78c7d 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -44,12 +44,12 @@ public: { mxIndexAccess.set( mxTextTable->getRows(), uno::UNO_QUERY ); } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if( nIndex < mxIndexAccess->getCount() ) { @@ -59,13 +59,13 @@ public: } }; -SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableRows >& xTableRows ) throw (uno::RuntimeException) : SwVbaRows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableRows, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableRows( xTableRows ) +SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableRows >& xTableRows ) : SwVbaRows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableRows, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableRows( xTableRows ) { mnStartRowIndex = 0; mnEndRowIndex = m_xIndexAccess->getCount() - 1; } -SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableRows >& xTableRows, sal_Int32 nStarIndex, sal_Int32 nEndIndex ) throw (uno::RuntimeException) : SwVbaRows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableRows, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableRows( xTableRows ), mnStartRowIndex( nStarIndex ), mnEndRowIndex( nEndIndex ) +SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableRows >& xTableRows, sal_Int32 nStarIndex, sal_Int32 nEndIndex ) : SwVbaRows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableRows, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableRows( xTableRows ), mnStartRowIndex( nStarIndex ), mnEndRowIndex( nEndIndex ) { if( mnEndRowIndex < mnStartRowIndex ) throw uno::RuntimeException(); @@ -76,7 +76,7 @@ SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const u * is mapped to WdRowAlignment in Word * @return the alignment */ -::sal_Int32 SAL_CALL SwVbaRows::getAlignment() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaRows::getAlignment() { sal_Int16 nAlignment = text::HoriOrientation::LEFT; uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); @@ -102,7 +102,7 @@ SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const u return nRet; } -void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) { sal_Int16 nAlignment = text::HoriOrientation::LEFT; switch( _alignment ) @@ -126,7 +126,7 @@ void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) throw (uno::Runt xTableProps->setPropertyValue("HoriOrient", uno::makeAny( nAlignment ) ); } -uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() { bool bAllowBreak = false; uno::Reference< container::XIndexAccess > xRowsAccess( mxTableRows, uno::UNO_QUERY_THROW ); @@ -148,7 +148,7 @@ uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeExcep return uno::makeAny( bAllowBreak ); } -void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakacrosspages ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakacrosspages ) { bool bAllowBreak = false; _allowbreakacrosspages >>= bAllowBreak; @@ -160,7 +160,7 @@ void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakac } } -float SAL_CALL SwVbaRows::getSpaceBetweenColumns() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaRows::getSpaceBetweenColumns() { // just get the first spacing of the first cell uno::Reference< table::XCellRange > xCellRange( mxTextTable, uno::UNO_QUERY_THROW ); @@ -172,7 +172,7 @@ float SAL_CALL SwVbaRows::getSpaceBetweenColumns() throw (uno::RuntimeException, return static_cast< float >( Millimeter::getInPoints( nLeftBorderDistance + nRightBorderDistance ) ); } -void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns ) { sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _spacebetweencolumns ) / 2; uno::Reference< container::XIndexAccess > xColumnAccess( mxTextTable->getColumns(), uno::UNO_QUERY_THROW ); @@ -190,12 +190,12 @@ void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns ) th } } -void SAL_CALL SwVbaRows::Delete( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRows::Delete( ) { mxTableRows->removeByIndex( mnStartRowIndex, getCount() ); } -void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) { uno::Reference< word::XColumns > xColumns( new SwVbaColumns( getParent(), mxContext, mxTextTable, mxTextTable->getColumns() ) ); sal_Int32 nIndent = (sal_Int32)( LeftIndent ); @@ -228,7 +228,7 @@ void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle } } -void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeException) +void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) { uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); sal_Int32 nMargin = 0; @@ -237,7 +237,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE xTableProps->setPropertyValue("LeftMargin", uno::makeAny( nMargin ) ); } - void SwVbaRows::setIndentWithAdjustFirstColumn( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException) + void SwVbaRows::setIndentWithAdjustFirstColumn( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) { sal_Int32 nIndex = 1; uno::Reference< XCollection > xCol( xColumns, uno::UNO_QUERY_THROW ); @@ -251,7 +251,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE void SwVbaRows::setIndentWithAdjustProportional( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent -) throw (uno::RuntimeException) +) { // calculate the new width and get the proportion between old and new uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); @@ -283,7 +283,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE xTableProps->setPropertyValue("Width", uno::makeAny( nNewWidth ) ); } - void SwVbaRows::setIndentWithAdjustSameWidth( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException) + void SwVbaRows::setIndentWithAdjustSameWidth( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) { // calculate the new width and get the width of all columns uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW ); @@ -306,17 +306,17 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE xTableProps->setPropertyValue("Width", uno::makeAny( nNewWidth ) ); } -void SAL_CALL SwVbaRows::Select( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaRows::Select( ) { SwVbaRow::SelectRow( getCurrentWordDoc(mxContext), mxTextTable, mnStartRowIndex, mnEndRowIndex ); } -::sal_Int32 SAL_CALL SwVbaRows::getCount() throw (uno::RuntimeException) +::sal_Int32 SAL_CALL SwVbaRows::getCount() { return ( mnEndRowIndex - mnStartRowIndex + 1 ); } -uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) { sal_Int32 nIndex = 0; if( ( Index1 >>= nIndex ) ) @@ -332,12 +332,12 @@ uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not // XEnumerationAccess uno::Type -SwVbaRows::getElementType() throw (uno::RuntimeException) +SwVbaRows::getElementType() { return cppu::UnoType<word::XRow>::get(); } uno::Reference< container::XEnumeration > -SwVbaRows::createEnumeration() throw (uno::RuntimeException) +SwVbaRows::createEnumeration() { return new RowsEnumWrapper( this, mxContext, mxTextTable ); } diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx index 23d1f5765d99..96073d51b082 100644 --- a/sw/source/ui/vba/vbarows.hxx +++ b/sw/source/ui/vba/vbarows.hxx @@ -38,39 +38,39 @@ private: private: /// @throws css::uno::RuntimeException - void setIndentWithAdjustNone( sal_Int32 indent ) throw (css::uno::RuntimeException); + void setIndentWithAdjustNone( sal_Int32 indent ); /// @throws css::uno::RuntimeException - void setIndentWithAdjustFirstColumn( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent ) throw (css::uno::RuntimeException); + void setIndentWithAdjustFirstColumn( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent ); /// @throws css::uno::RuntimeException - void setIndentWithAdjustProportional( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent ) throw (css::uno::RuntimeException); + void setIndentWithAdjustProportional( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent ); /// @throws css::uno::RuntimeException - void setIndentWithAdjustSameWidth( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent ) throw (css::uno::RuntimeException); + void setIndentWithAdjustSameWidth( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent ); public: /// @throws css::uno::RuntimeException - SwVbaRows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableRows >& xTableRows ) throw ( css::uno::RuntimeException ); + SwVbaRows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableRows >& xTableRows ); /// @throws css::uno::RuntimeException - SwVbaRows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableRows >& xTableRows, sal_Int32 nStarIndex, sal_Int32 nEndIndex ) throw ( css::uno::RuntimeException ); + SwVbaRows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableRows >& xTableRows, sal_Int32 nStarIndex, sal_Int32 nEndIndex ); // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getAllowBreakAcrossPages() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAllowBreakAcrossPages( const css::uno::Any& _allowbreakacrosspages ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getSpaceBetweenColumns() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSpaceBetweenColumns( float _spacebetweencolumns ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getAlignment() override; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) override; + virtual css::uno::Any SAL_CALL getAllowBreakAcrossPages() override; + virtual void SAL_CALL setAllowBreakAcrossPages( const css::uno::Any& _allowbreakacrosspages ) override; + virtual float SAL_CALL getSpaceBetweenColumns() override; + virtual void SAL_CALL setSpaceBetweenColumns( float _spacebetweencolumns ) override; // Methods - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) override; + virtual void SAL_CALL Select( ) override; //XCollection - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaRows_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx index ff034e30e0f3..bce9b3769dc1 100644 --- a/sw/source/ui/vba/vbasection.cxx +++ b/sw/source/ui/vba/vbasection.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaSection::SwVbaSection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw ( uno::RuntimeException ) : +SwVbaSection::SwVbaSection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) : SwVbaSection_BASE( rParent, rContext ), mxModel( xModel ), mxPageProps( xProps ) { } @@ -34,16 +34,16 @@ SwVbaSection::~SwVbaSection() { } -sal_Bool SAL_CALL SwVbaSection::getProtectedForForms() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaSection::getProtectedForForms() { return false; } -void SAL_CALL SwVbaSection::setProtectedForForms( sal_Bool /*_protectedforforms*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSection::setProtectedForForms( sal_Bool /*_protectedforforms*/ ) { } -uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, true ) ); if ( index.hasValue() ) @@ -51,7 +51,7 @@ uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index ) throw (uno::Run return uno::makeAny( xCol ); } -uno::Any SAL_CALL SwVbaSection::Footers( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaSection::Footers( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, false ) ); if ( index.hasValue() ) @@ -60,7 +60,7 @@ uno::Any SAL_CALL SwVbaSection::Footers( const uno::Any& index ) throw (uno::Run } uno::Any SAL_CALL -SwVbaSection::PageSetup( ) throw (uno::RuntimeException, std::exception) +SwVbaSection::PageSetup( ) { return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) ); } diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx index d34da89637be..e06043ff0507 100644 --- a/sw/source/ui/vba/vbasection.hxx +++ b/sw/source/ui/vba/vbasection.hxx @@ -32,17 +32,17 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaSection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException ); + SwVbaSection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps ); virtual ~SwVbaSection() override; // Attributes - virtual sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setProtectedForForms( sal_Bool _protectedforforms ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getProtectedForForms() override; + virtual void SAL_CALL setProtectedForForms( sal_Bool _protectedforforms ) override; // Methods - virtual css::uno::Any SAL_CALL Headers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Footers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Headers( const css::uno::Any& index ) override; + virtual css::uno::Any SAL_CALL Footers( const css::uno::Any& index ) override; + virtual css::uno::Any SAL_CALL PageSetup( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index bf5847574e4e..74f5b7bb05a0 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -37,12 +37,12 @@ class SectionEnumeration : public ::cppu::WeakImplHelper< container::XEnumeratio public: explicit SectionEnumeration( const XSectionVec& rVec ) : mxSections( rVec ), mIt( mxSections.begin() ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( mIt != mxSections.end() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( hasMoreElements() ) return uno::makeAny( *mIt++ ); @@ -62,7 +62,7 @@ private: public: /// @throws uno::RuntimeException - SectionCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) + SectionCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) { uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); @@ -81,7 +81,7 @@ public: } /// @throws uno::RuntimeException - SectionCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw (uno::RuntimeException) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) + SectionCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) { // Hacky implementation of Range.Sections, only support 1 section uno::Reference< beans::XPropertySet > xRangeProps( xTextRange, uno::UNO_QUERY_THROW ); @@ -91,11 +91,11 @@ public: } // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount( ) override { return mxSections.size(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); @@ -103,16 +103,16 @@ public: uno::Reference< beans::XPropertySet > xPageProps( mxSections[ Index ], uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent, mxContext, mxModel, xPageProps ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<word::XSection>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { return new SectionEnumeration( mxSections ); } @@ -123,9 +123,9 @@ class SectionsEnumWrapper : public EnumerationHelperImpl uno::Reference< frame::XModel > mxModel; public: /// @throws uno::RuntimeException - SectionsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ){} + SectionsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ){} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< beans::XPropertySet > xPageProps( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XSection > ( new SwVbaSection( m_xParent, m_xContext, mxModel, xPageProps ) ) ); @@ -141,7 +141,7 @@ SwVbaSections::SwVbaSections( const uno::Reference< XHelperInterface >& xParent, } uno::Any SAL_CALL -SwVbaSections::PageSetup( ) throw (uno::RuntimeException, std::exception) +SwVbaSections::PageSetup( ) { if( m_xIndexAccess->getCount() ) { @@ -154,13 +154,13 @@ SwVbaSections::PageSetup( ) throw (uno::RuntimeException, std::exception) // XEnumerationAccess uno::Type SAL_CALL -SwVbaSections::getElementType() throw (uno::RuntimeException) +SwVbaSections::getElementType() { return cppu::UnoType<word::XSection>::get(); } uno::Reference< container::XEnumeration > SAL_CALL -SwVbaSections::createEnumeration() throw (uno::RuntimeException) +SwVbaSections::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return new SectionsEnumWrapper( this, mxContext, xEnumAccess->createEnumeration(), mxModel ); diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx index 46da02c1b281..e793ecbe7b7c 100644 --- a/sw/source/ui/vba/vbasections.hxx +++ b/sw/source/ui/vba/vbasections.hxx @@ -38,10 +38,10 @@ public: SwVbaSections( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; - virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL PageSetup( ) override; // SwVbaSections_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index bd942fa0d396..b5f4461d7819 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -69,7 +69,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaSelection::SwVbaSelection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& rModel ) throw ( uno::RuntimeException ) : SwVbaSelection_BASE( rParent, rContext ), mxModel( rModel ) +SwVbaSelection::SwVbaSelection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& rModel ) : SwVbaSelection_BASE( rParent, rContext ), mxModel( rModel ) { mxTextViewCursor = word::getXTextViewCursor( mxModel ); } @@ -78,7 +78,7 @@ SwVbaSelection::~SwVbaSelection() { } -uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( uno::RuntimeException ) +uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() { uno::Reference< text::XTextRange > xTextRange; uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel->getCurrentSelection(), uno::UNO_QUERY_THROW ); @@ -99,7 +99,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un } uno::Reference< word::XRange > SAL_CALL -SwVbaSelection::getRange() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::getRange() { uno::Reference< text::XTextRange > xTextRange = GetSelectedRange(); uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW ); @@ -107,26 +107,26 @@ SwVbaSelection::getRange() throw ( uno::RuntimeException, std::exception ) } OUString SAL_CALL -SwVbaSelection::getText() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::getText() { return getRange()->getText(); } void SAL_CALL -SwVbaSelection::setText( const OUString& rText ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::setText( const OUString& rText ) { getRange()->setText( rText ); } void SAL_CALL -SwVbaSelection::TypeText( const OUString& rText ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::TypeText( const OUString& rText ) { // FIXME: handle the property Options.ReplaceSelection, the default value is true setText( rText ); } void SAL_CALL -SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) { sal_Int32 nUnit = word::WdUnits::wdLine; sal_Int32 nExtend = word::WdMovementType::wdMove; @@ -161,7 +161,7 @@ SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw } void SAL_CALL -SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) { sal_Int32 nUnit = word::WdUnits::wdLine; sal_Int32 nExtend = word::WdMovementType::wdMove; @@ -196,7 +196,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( } void SAL_CALL -SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) { sal_Int32 nUnit = word::WdUnits::wdLine; sal_Int32 nCount = 0; @@ -225,7 +225,7 @@ SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( } void -SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend, word::E_DIRECTION eDirection ) throw ( css::script::BasicErrorException, uno::RuntimeException ) +SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend, word::E_DIRECTION eDirection ) { sal_Int32 nUnit = word::WdUnits::wdCharacter; sal_Int32 nCount = 1; @@ -350,7 +350,6 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: } void SwVbaSelection::NextCell(sal_Int32 nCount, word::E_DIRECTION eDirection) - throw (css::script::BasicErrorException, uno::RuntimeException) { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; @@ -401,7 +400,7 @@ void SwVbaSelection::NextCell(sal_Int32 nCount, word::E_DIRECTION eDirection) } void SAL_CALL -SwVbaSelection::MoveRight(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaSelection::MoveRight(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) { sal_Int32 nCount = 1; @@ -421,7 +420,7 @@ SwVbaSelection::MoveRight(const uno::Any& _unit, const uno::Any& _count, const u } void SAL_CALL -SwVbaSelection::MoveLeft(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaSelection::MoveLeft(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) { sal_Int32 nCount = 1; if( _count.hasValue() ) @@ -440,7 +439,7 @@ SwVbaSelection::MoveLeft(const uno::Any& _unit, const uno::Any& _count, const un } void SAL_CALL -SwVbaSelection::MoveDown(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaSelection::MoveDown(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) { sal_Int32 nCount = 1; @@ -460,7 +459,7 @@ SwVbaSelection::MoveDown(const uno::Any& _unit, const uno::Any& _count, const un } void SAL_CALL -SwVbaSelection::MoveUp(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaSelection::MoveUp(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) { sal_Int32 nCount = 1; @@ -480,7 +479,7 @@ SwVbaSelection::MoveUp(const uno::Any& _unit, const uno::Any& _count, const uno: } void SAL_CALL -SwVbaSelection::TypeParagraph() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::TypeParagraph() { // #FIXME: if the selection is an entire paragraph, it's replaced // by the new paragraph @@ -491,71 +490,70 @@ SwVbaSelection::TypeParagraph() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -SwVbaSelection::InsertParagraph() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::InsertParagraph() { // #FIXME: the selection should include the new paragraph. getRange()->InsertParagraph(); } void SAL_CALL -SwVbaSelection::InsertParagraphBefore() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::InsertParagraphBefore() { getRange()->InsertParagraphBefore(); } void SAL_CALL -SwVbaSelection::InsertParagraphAfter() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::InsertParagraphAfter() { getRange()->InsertParagraphAfter(); } uno::Reference< word::XParagraphFormat > SAL_CALL -SwVbaSelection::getParagraphFormat() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::getParagraphFormat() { return getRange()->getParagraphFormat(); } void SAL_CALL -SwVbaSelection::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& rParagraphFormat ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& rParagraphFormat ) { return getRange()->setParagraphFormat( rParagraphFormat ); } uno::Reference< word::XFind > SAL_CALL -SwVbaSelection::getFind() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::getFind() { uno::Reference< text::XTextRange > xTextRange = GetSelectedRange(); return uno::Reference< word::XFind >( new SwVbaFind( this, mxContext, mxModel, xTextRange ) ); } uno::Any SAL_CALL -SwVbaSelection::getStyle() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::getStyle() { return getRange()->getStyle(); } void SAL_CALL -SwVbaSelection::setStyle( const uno::Any& rStyle ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::setStyle( const uno::Any& rStyle ) { uno::Reference< beans::XPropertySet > xParaProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); return SwVbaStyle::setStyle( xParaProps, rStyle ); } uno::Reference< word::XFont > SAL_CALL -SwVbaSelection::getFont() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::getFont() { return getRange()->getFont(); } void SAL_CALL -SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::TypeBackspace() { OUString url = ".uno:SwBackspace"; dispatchRequests( mxModel,url ); } uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _what, const uno::Any& _which, const uno::Any& _count, const uno::Any& _name ) - throw (script::BasicErrorException, uno::RuntimeException, std::exception) { sal_Int32 nWhat = 0; if( !( _what >>= nWhat ) ) @@ -660,17 +658,17 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w return getRange(); } -::sal_Int32 SAL_CALL SwVbaSelection::getLanguageID() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaSelection::getLanguageID() { return getRange()->getLanguageID(); } -void SAL_CALL SwVbaSelection::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::setLanguageID( ::sal_Int32 _languageid ) { getRange()->setLanguageID( _languageid ); } -uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) { uno::Any result; switch( _type ) @@ -772,13 +770,13 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run return result; } -void SAL_CALL SwVbaSelection::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::InsertBreak( const uno::Any& _breakType ) { getRange()->InsertBreak( _breakType ); } uno::Any SAL_CALL -SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +SwVbaSelection::Tables( const uno::Any& aIndex ) { // Hacky implementation due to missing api ( and lack of knowledge ) // we can only support a selection that is a single table @@ -827,7 +825,7 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException, s } uno::Any SAL_CALL -SwVbaSelection::Fields( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaSelection::Fields( const uno::Any& index ) { uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, mxModel ) ); if ( index.hasValue() ) @@ -836,7 +834,7 @@ SwVbaSelection::Fields( const uno::Any& index ) throw (uno::RuntimeException, st } uno::Reference< word::XHeaderFooter > SAL_CALL -SwVbaSelection::getHeaderFooter() throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::getHeaderFooter() { if( HeaderFooterHelper::isHeaderFooter( mxModel ) ) { @@ -855,7 +853,7 @@ SwVbaSelection::getHeaderFooter() throw ( uno::RuntimeException, std::exception } uno::Any SAL_CALL -SwVbaSelection::ShapeRange( ) throw (uno::RuntimeException, std::exception) +SwVbaSelection::ShapeRange( ) { uno::Reference< drawing::XShapes > xShapes( mxModel->getCurrentSelection(), uno::UNO_QUERY ); if ( !xShapes.is() ) @@ -871,38 +869,38 @@ SwVbaSelection::ShapeRange( ) throw (uno::RuntimeException, std::exception) return uno::makeAny( uno::Reference< msforms::XShapeRange >( new ScVbaShapeRange( this, mxContext, xShapesAccess, xDrawPage, mxModel ) ) ); } -::sal_Int32 SAL_CALL SwVbaSelection::getStart() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaSelection::getStart() { return getRange()->getStart(); } -void SAL_CALL SwVbaSelection::setStart( ::sal_Int32 _start ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::setStart( ::sal_Int32 _start ) { getRange()->setStart( _start ); } -::sal_Int32 SAL_CALL SwVbaSelection::getEnd() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaSelection::getEnd() { return getRange()->getEnd(); } -void SAL_CALL SwVbaSelection::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::setEnd( ::sal_Int32 _end ) { getRange()->setEnd( _end ); } -void SAL_CALL SwVbaSelection::SelectRow() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::SelectRow() { uno::Reference< word::XRows > xRows( Rows( uno::Any() ), uno::UNO_QUERY_THROW ); xRows->Select(); } -void SAL_CALL SwVbaSelection::SelectColumn() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::SelectColumn() { uno::Reference< word::XColumns > xColumns( Columns( uno::Any() ), uno::UNO_QUERY_THROW ); xColumns->Select(); } -uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) { OUString sTLName; OUString sBRName; @@ -928,7 +926,7 @@ uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) throw (uno::Runt return uno::makeAny( xCol ); } -uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index ) { OUString sTLName; OUString sBRName; @@ -954,7 +952,7 @@ uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index ) throw (uno::R return uno::makeAny( xCol ); } -uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable() throw( uno::RuntimeException ) +uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable() { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; @@ -962,7 +960,7 @@ uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable() throw( uno::R return xTextTable; } -bool SwVbaSelection::IsInTable() throw( uno::RuntimeException ) +bool SwVbaSelection::IsInTable() { uno::Reference< text::XTextTable > xTextTable = GetXTextTable(); if( xTextTable.is() ) @@ -970,7 +968,7 @@ bool SwVbaSelection::IsInTable() throw( uno::RuntimeException ) return false; } -bool SwVbaSelection::HasSelection() throw( uno::RuntimeException ) +bool SwVbaSelection::HasSelection() { uno::Reference< text::XTextRange > xStart = mxTextViewCursor->getStart(); uno::Reference< text::XTextRange > xEnd = mxTextViewCursor->getEnd(); @@ -980,7 +978,7 @@ bool SwVbaSelection::HasSelection() throw( uno::RuntimeException ) return true; } -void SwVbaSelection::GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw( uno::RuntimeException ) +void SwVbaSelection::GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; @@ -1011,7 +1009,7 @@ void SwVbaSelection::GetSelectedCellRange( OUString& sTLName, OUString& sBRName } } -uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) { OUString sTLName; OUString sBRName; @@ -1042,25 +1040,25 @@ uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::Run return uno::makeAny( xCol ); } -void SAL_CALL SwVbaSelection::Copy( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::Copy( ) { OUString url = ".uno:Copy"; dispatchRequests( mxModel,url ); } -void SAL_CALL SwVbaSelection::CopyAsPicture( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::CopyAsPicture( ) { // seems not support in Writer Copy(); } -void SAL_CALL SwVbaSelection::Paste( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::Paste( ) { OUString url = ".uno:Paste"; dispatchRequests( mxModel,url ); } -void SAL_CALL SwVbaSelection::Collapse( const uno::Any& Direction ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::Collapse( const uno::Any& Direction ) { if( word::gotoSelectedObjectAnchor( mxModel ) ) return; @@ -1089,7 +1087,7 @@ void SAL_CALL SwVbaSelection::Collapse( const uno::Any& Direction ) throw (uno:: } } -void SAL_CALL SwVbaSelection::WholeStory( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaSelection::WholeStory( ) { uno::Reference< text::XText > xText = word::getCurrentXText( mxModel ); // FIXME: for i#7747,if the first line is a table, it fails to select all the contents in the story. @@ -1114,13 +1112,12 @@ void SAL_CALL SwVbaSelection::WholeStory( ) throw (uno::RuntimeException, std:: mxTextViewCursor->gotoRange( xEnd, true ); } -sal_Bool SAL_CALL SwVbaSelection::InRange( const uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaSelection::InRange( const uno::Reference< ::ooo::vba::word::XRange >& Range ) { return getRange()->InRange( Range ); } void SAL_CALL SwVbaSelection::SplitTable() - throw (uno::RuntimeException, std::exception) { if( !IsInTable() ) throw uno::RuntimeException(); @@ -1137,7 +1134,7 @@ void SAL_CALL SwVbaSelection::SplitTable() } uno::Any SAL_CALL -SwVbaSelection::Paragraphs( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +SwVbaSelection::Paragraphs( const uno::Any& aIndex ) { // Hacky implementation due to missing api ( and lack of knowledge ) // we can only support a selection that is a single paragraph diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index a9727ac3e7fd..fc995c150921 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -42,79 +42,75 @@ private: private: /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - void NextCell( sal_Int32 nCount, ooo::vba::word::E_DIRECTION eDirection ) - throw (css::script::BasicErrorException, css::uno::RuntimeException); + void NextCell( sal_Int32 nCount, ooo::vba::word::E_DIRECTION eDirection ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::text::XTextRange > GetSelectedRange() throw ( css::uno::RuntimeException ); + css::uno::Reference< css::text::XTextRange > GetSelectedRange(); /// @throws css::uno::RuntimeException - void GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw ( css::uno::RuntimeException ); + void GetSelectedCellRange( OUString& sTLName, OUString& sBRName ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::text::XTextTable > GetXTextTable() throw ( css::uno::RuntimeException ); + css::uno::Reference< css::text::XTextTable > GetXTextTable(); /// @throws css::uno::RuntimeException - bool IsInTable() throw ( css::uno::RuntimeException ); + bool IsInTable(); /// @throws css::uno::RuntimeException - bool HasSelection() throw ( css::uno::RuntimeException ); + bool HasSelection(); public: /// @throws css::uno::RuntimeException - SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException ); + SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ); virtual ~SwVbaSelection() override; // Attribute - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL TypeBackspace() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name ) - throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL ShapeRange( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SelectRow() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SelectColumn() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Cells( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Copy( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL CopyAsPicture( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Paste( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL WholeStory( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SplitTable() - throw (css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() override; + virtual void SAL_CALL setText( const OUString& rText ) override; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() override; + virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) override; + virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) override; + virtual void SAL_CALL TypeText( const OUString& rText ) override; + virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) override; + virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) override; + virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) override; + virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) override; + virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) override; + virtual void SAL_CALL TypeParagraph() override; + virtual void SAL_CALL InsertParagraph() override; + virtual void SAL_CALL InsertParagraphBefore() override; + virtual void SAL_CALL InsertParagraphAfter() override; + virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() override; + virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) override; + virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() override; + virtual css::uno::Any SAL_CALL getStyle() override; + virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) override; + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() override; + virtual void SAL_CALL TypeBackspace() override; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name ) override; + virtual ::sal_Int32 SAL_CALL getLanguageID( ) override; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) override; + virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) override; + virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) override; + virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) override; + virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() override; + virtual css::uno::Any SAL_CALL ShapeRange( ) override; + virtual ::sal_Int32 SAL_CALL getStart() override; + virtual void SAL_CALL setStart( ::sal_Int32 _start ) override; + virtual ::sal_Int32 SAL_CALL getEnd() override; + virtual void SAL_CALL setEnd( ::sal_Int32 _end ) override; + virtual void SAL_CALL SelectRow() override; + virtual void SAL_CALL SelectColumn() override; + virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Cells( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL Copy( ) override; + virtual void SAL_CALL CopyAsPicture( ) override; + virtual void SAL_CALL Paste( ) override; + virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) override; + virtual void SAL_CALL WholeStory( ) override; + virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) override; + virtual void SAL_CALL SplitTable() override; + virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index ad9c8de36811..663f0be39a43 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -31,47 +31,47 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel>& xModel, const uno::Reference< beans::XPropertySet >& _xPropertySet ) throw ( script::BasicErrorException, uno::RuntimeException ) : SwVbaStyle_BASE( xParent, xContext ) , mxModel( xModel ), mxStyleProps( _xPropertySet ) +SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel>& xModel, const uno::Reference< beans::XPropertySet >& _xPropertySet ) : SwVbaStyle_BASE( xParent, xContext ) , mxModel( xModel ), mxStyleProps( _xPropertySet ) { mxStyle.set( _xPropertySet, uno::UNO_QUERY_THROW ); } void SAL_CALL -SwVbaStyle::setName( const OUString& Name ) throw (uno::RuntimeException, std::exception) +SwVbaStyle::setName( const OUString& Name ) { mxStyle->setName(Name); } OUString SAL_CALL -SwVbaStyle::getName() throw (uno::RuntimeException, std::exception) +SwVbaStyle::getName() { return mxStyle->getName(); } -sal_Int32 SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps ) throw (uno::RuntimeException, std::exception) +sal_Int32 SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps ) { lang::Locale aLocale; xTCProps->getPropertyValue("CharLocale") >>= aLocale; return LanguageTag::convertToLanguageType( aLocale, false); } -void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (uno::RuntimeException) +void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) { lang::Locale aLocale = LanguageTag( static_cast<LanguageType>(_languageid) ).getLocale(); xTCProps->setPropertyValue("CharLocale", uno::makeAny( aLocale ) ) ; } -::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() { return getLanguageID( mxStyleProps ); } -void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) { setLanguageID( mxStyleProps, _languageid ); } -::sal_Int32 SAL_CALL SwVbaStyle::getType() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaStyle::getType() { sal_Int32 nType = word::WdStyleType::wdStyleTypeParagraph; uno::Reference< lang::XServiceInfo > xServiceInfo( mxStyle, uno::UNO_QUERY_THROW ); @@ -85,13 +85,13 @@ void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::R } uno::Reference< word::XFont > SAL_CALL -SwVbaStyle::getFont() throw ( uno::RuntimeException, std::exception ) +SwVbaStyle::getFont() { VbaPalette aColors; return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), mxStyleProps ); } -void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Any& rStyle )throw (uno::RuntimeException) +void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Any& rStyle ) { OUString sStyle; uno::Reference< word::XStyle > xStyle; @@ -113,19 +113,19 @@ void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaPro throw uno::RuntimeException(); } -OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SwVbaStyle::getNameLocal() { OUString sNameLocal; mxStyleProps->getPropertyValue("DisplayName") >>= sNameLocal; return sNameLocal; } -void SAL_CALL SwVbaStyle::setNameLocal( const OUString& _namelocal ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaStyle::setNameLocal( const OUString& _namelocal ) { mxStyleProps->setPropertyValue("DisplayName", uno::makeAny( _namelocal ) ); } -uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat() throw (uno::RuntimeException, std::exception) +uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat() { if( word::WdStyleType::wdStyleTypeParagraph == getType() ) { @@ -138,19 +138,19 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat } } -sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate() { bool isAutoUpdate = false; mxStyleProps->getPropertyValue("IsAutoUpdate") >>= isAutoUpdate; return isAutoUpdate; } -void SAL_CALL SwVbaStyle::setAutomaticallyUpdate( sal_Bool _automaticallyupdate ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaStyle::setAutomaticallyUpdate( sal_Bool _automaticallyupdate ) { mxStyleProps->setPropertyValue("IsAutoUpdate", uno::makeAny( _automaticallyupdate ) ); } -uno::Any SAL_CALL SwVbaStyle::getBaseStyle() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaStyle::getBaseStyle() { // ParentStyle OUString sBaseStyle; @@ -166,7 +166,7 @@ uno::Any SAL_CALL SwVbaStyle::getBaseStyle() throw (uno::RuntimeException, std:: } } -void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) { uno::Reference< word::XStyle > xStyle; _basestyle >>= xStyle; @@ -181,7 +181,7 @@ void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno: } } -uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() { //FollowStyle OUString sFollowStyle; @@ -197,7 +197,7 @@ uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() throw (uno::RuntimeExcepti } } -void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphstyle ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphstyle ) { uno::Reference< word::XStyle > xStyle; _nextparagraphstyle >>= xStyle; @@ -212,7 +212,7 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs } } -::sal_Int32 SAL_CALL SwVbaStyle::getListLevelNumber() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaStyle::getListLevelNumber() { sal_Int16 nNumberingLevel = 0; mxStyleProps->getPropertyValue("NumberingLevel") >>= nNumberingLevel; diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index 61675c23895f..334fd7525fc8 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -38,35 +38,35 @@ private: public: /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - SwVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + SwVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ); /// @throws css::uno::RuntimeException - static void setStyle( const css::uno::Reference< css::beans::XPropertySet >& xParaProps, const css::uno::Any& xStyle ) throw (css::uno::RuntimeException); + static void setStyle( const css::uno::Reference< css::beans::XPropertySet >& xParaProps, const css::uno::Any& xStyle ); /// @throws css::uno::RuntimeException - static sal_Int32 getLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps ) throw (css::uno::RuntimeException, std::exception); + static sal_Int32 getLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps ); /// @throws css::uno::RuntimeException - static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException); + static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutomaticallyUpdate( sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getBaseStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBaseStyle( const css::uno::Any& _basestyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getNextParagraphStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNextParagraphStyle( const css::uno::Any& _nextparagraphstyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getListLevelNumber() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& Name ) override; + virtual ::sal_Int32 SAL_CALL getLanguageID( ) override; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) override; + virtual ::sal_Int32 SAL_CALL getType() override; + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() override; + virtual OUString SAL_CALL getNameLocal() override; + virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) override; + virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() override; + virtual sal_Bool SAL_CALL getAutomaticallyUpdate() override; + virtual void SAL_CALL setAutomaticallyUpdate( sal_Bool _automaticallyupdate ) override; + virtual css::uno::Any SAL_CALL getBaseStyle() override; + virtual void SAL_CALL setBaseStyle( const css::uno::Any& _basestyle ) override; + virtual css::uno::Any SAL_CALL getNextParagraphStyle() override; + virtual void SAL_CALL setNextParagraphStyle( const css::uno::Any& _nextparagraphstyle ) override; + virtual ::sal_Int32 SAL_CALL getListLevelNumber() override; //XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Name"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) override { return OUString("Name"); } // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index b50a247407d5..8d51c715dde4 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -174,20 +174,20 @@ public: mxParaStyles.set( xStyleFamilies->getByName("ParagraphStyles"), uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<style::XStyle>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return getCount() > 0; } + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<style::XStyle>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) override { return getCount() > 0; } // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return cachePos; } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { return mxParaStyles->getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { // search in the MSOStyleName table first for( const MSOStyleNameTable* pTable = aMSOStyleNameTable; pTable->pMSOStyleName != nullptr; pTable++ ) @@ -227,12 +227,12 @@ public: } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { uno::Reference< container::XIndexAccess > xIndexAccess( mxParaStyles, uno::UNO_QUERY_THROW ); return xIndexAccess->getCount(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -241,7 +241,7 @@ public: return xIndexAccess->getByIndex( Index ); } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { throw uno::RuntimeException("Not implemented" ); } @@ -253,12 +253,12 @@ class StylesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit StylesEnumWrapper( SwVbaStyles* _pStyles ) : pStyles( _pStyles ), nIndex( 1 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex <= pStyles->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex <= pStyles->getCount() ) return pStyles->Item( uno::makeAny( nIndex++ ), uno::Any() ); @@ -267,7 +267,6 @@ public: }; SwVbaStyles::SwVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) - throw ( script::BasicErrorException, uno::RuntimeException ) : SwVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new StyleCollectionHelper( xModel ) ) ), mxModel( xModel ) { mxMSF.set( mxModel, uno::UNO_QUERY_THROW ); @@ -281,20 +280,19 @@ SwVbaStyles::createCollectionObject(const uno::Any& aObject) } uno::Type SAL_CALL -SwVbaStyles::getElementType() throw (uno::RuntimeException) +SwVbaStyles::getElementType() { return cppu::UnoType<word::XStyle>::get(); } uno::Reference< container::XEnumeration > SAL_CALL -SwVbaStyles::createEnumeration() throw (uno::RuntimeException) +SwVbaStyles::createEnumeration() { return new StylesEnumWrapper( this ); } uno::Any SAL_CALL SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) - throw (lang::IndexOutOfBoundsException, script::BasicErrorException, uno::RuntimeException) { //handle WdBuiltinStyle sal_Int32 nIndex = 0; diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx index ec78f17326a0..390225cd08c4 100644 --- a/sw/source/ui/vba/vbastyles.hxx +++ b/sw/source/ui/vba/vbastyles.hxx @@ -31,15 +31,12 @@ class SwVbaStyles: public SwVbaStyles_BASE public: /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - SwVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) - throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + SwVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); - virtual css::uno::Any SAL_CALL Item(const css::uno::Any& Index1, const css::uno::Any& Index2) - throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException, - css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL Item(const css::uno::Any& Index1, const css::uno::Any& Index2) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; virtual css::uno::Any createCollectionObject(const css::uno::Any&) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index ffa0cb239d5b..f02ea0c243ba 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -176,7 +176,7 @@ SwVbaSystem::~SwVbaSystem() } sal_Int32 SAL_CALL -SwVbaSystem::getCursor() throw (uno::RuntimeException, std::exception) +SwVbaSystem::getCursor() { PointerStyle nPointerStyle = getPointerStyle( getCurrentWordDoc(mxContext) ); @@ -196,7 +196,7 @@ SwVbaSystem::getCursor() throw (uno::RuntimeException, std::exception) } void SAL_CALL -SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException, std::exception) +SwVbaSystem::setCursor( sal_Int32 _cursor ) { try { @@ -240,7 +240,7 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException, std::e } uno::Any SAL_CALL -SwVbaSystem::PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( uno::RuntimeException, std::exception ) +SwVbaSystem::PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) { // FIXME: need to detect whether it is a relative file path // we need to detect if this is a URL, if not then assume it's a file path diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx index ae41b838cbdf..9c5921f3de16 100644 --- a/sw/source/ui/vba/vbasystem.hxx +++ b/sw/source/ui/vba/vbasystem.hxx @@ -51,9 +51,9 @@ public: virtual ~SwVbaSystem() override; // XSystem - virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCursor() override; + virtual void SAL_CALL setCursor( sal_Int32 _cursor ) override; + virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx index 64fa044f7fcb..488ba6583a1d 100644 --- a/sw/source/ui/vba/vbatable.cxx +++ b/sw/source/ui/vba/vbatable.cxx @@ -34,19 +34,19 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaTable::SwVbaTable( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rDocument, const uno::Reference< text::XTextTable >& xTextTable) throw ( uno::RuntimeException ) : SwVbaTable_BASE( rParent, rContext ), mxTextDocument( rDocument ) +SwVbaTable::SwVbaTable( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rDocument, const uno::Reference< text::XTextTable >& xTextTable) : SwVbaTable_BASE( rParent, rContext ), mxTextDocument( rDocument ) { mxTextTable.set( xTextTable, uno::UNO_QUERY_THROW ); } uno::Reference< word::XRange > SAL_CALL -SwVbaTable::Range( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaTable::Range( ) { return new SwVbaRange( mxParent, mxContext, mxTextDocument, mxTextTable->getAnchor() ); } void SAL_CALL -SwVbaTable::Select( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaTable::Select( ) { uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< frame::XController > xController = xModel->getCurrentController(); @@ -64,21 +64,21 @@ SwVbaTable::Select( ) throw (script::BasicErrorException, uno::RuntimeException } void SAL_CALL -SwVbaTable::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaTable::Delete( ) { uno::Reference< table::XTableRows > xRows( mxTextTable->getRows() ); xRows->removeByIndex( 0, xRows->getCount() ); } OUString SAL_CALL -SwVbaTable::getName() throw (uno::RuntimeException, std::exception) +SwVbaTable::getName() { uno::Reference< container::XNamed > xNamed( mxTextTable, uno::UNO_QUERY_THROW ); return xNamed->getName(); } uno::Any SAL_CALL -SwVbaTable::Borders( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaTable::Borders( const uno::Any& index ) { uno::Reference< table::XCellRange > aCellRange( mxTextTable, uno::UNO_QUERY_THROW ); VbaPalette aPalette; @@ -89,7 +89,7 @@ SwVbaTable::Borders( const uno::Any& index ) throw (uno::RuntimeException, std:: } uno::Any SAL_CALL -SwVbaTable::Rows( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaTable::Rows( const uno::Any& index ) { uno::Reference< table::XTableRows > xTableRows( mxTextTable->getRows(), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xCol( new SwVbaRows( this, mxContext, mxTextTable, xTableRows ) ); @@ -99,7 +99,7 @@ SwVbaTable::Rows( const uno::Any& index ) throw (uno::RuntimeException, std::exc } uno::Any SAL_CALL -SwVbaTable::Columns( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaTable::Columns( const uno::Any& index ) { uno::Reference< table::XTableColumns > xTableColumns( mxTextTable->getColumns(), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xCol( new SwVbaColumns( this, mxContext, mxTextTable, xTableColumns ) ); diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index ecfae7a37367..37bdd332f810 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -33,14 +33,14 @@ class SwVbaTable : public SwVbaTable_BASE css::uno::Reference< css::text::XTextTable > mxTextTable; public: /// @throws css::uno::RuntimeException - SwVbaTable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextTable >& xTextTable) throw ( css::uno::RuntimeException); - virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + SwVbaTable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextTable >& xTextTable); + virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) override; + virtual void SAL_CALL Select( ) override; + virtual void SAL_CALL Delete( ) override; + virtual OUString SAL_CALL getName( ) override; + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index 19d333b660e9..db7d62caddfb 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -26,12 +26,12 @@ using namespace ::ooo::vba; #define UNO_TABLE_COLUMN_SUM 10000 -SwVbaTableHelper::SwVbaTableHelper( const uno::Reference< text::XTextTable >& xTextTable ) throw (uno::RuntimeException) : mxTextTable( xTextTable ) +SwVbaTableHelper::SwVbaTableHelper( const uno::Reference< text::XTextTable >& xTextTable ) : mxTextTable( xTextTable ) { pTable = GetSwTable( mxTextTable ); } -SwTable* SwVbaTableHelper::GetSwTable( const uno::Reference< text::XTextTable >& xTextTable ) throw (uno::RuntimeException) +SwTable* SwVbaTableHelper::GetSwTable( const uno::Reference< text::XTextTable >& xTextTable ) { uno::Reference< lang::XUnoTunnel > xTunnel( xTextTable, uno::UNO_QUERY_THROW ); SwXTextTable* pXTextTable = reinterpret_cast< SwXTextTable * >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SwXTextTable::getUnoTunnelId()))); @@ -46,7 +46,7 @@ SwTable* SwVbaTableHelper::GetSwTable( const uno::Reference< text::XTextTable >& return pTable; } -sal_Int32 SwVbaTableHelper::getTabColumnsCount( sal_Int32 nRowIndex ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTabColumnsCount( sal_Int32 nRowIndex ) { sal_Int32 nRet = 0; if(!pTable->IsTableComplex()) @@ -58,7 +58,7 @@ sal_Int32 SwVbaTableHelper::getTabColumnsCount( sal_Int32 nRowIndex ) throw (uno return nRet; } -sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( ) { sal_Int32 nRet = 0; sal_Int32 nRowCount = pTable->GetTabLines().size(); @@ -71,7 +71,7 @@ sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( ) throw (uno::RuntimeExceptio return nRet; } -sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& rCellName ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& rCellName ) { sal_Int32 nRet = 0; SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTableBox( rCellName )); @@ -85,7 +85,7 @@ sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& rCellName ) throw (u return nRet; } -sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& rCellName ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& rCellName ) { const SwTableBox* pBox = pTable->GetTableBox( rCellName ); if( !pBox ) @@ -114,7 +114,7 @@ OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol ) return sRet; } -sal_Int32 SwVbaTableHelper::getTableWidth( ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTableWidth( ) { sal_Int32 nWidth = 0; bool isWidthRelatvie = false; @@ -131,7 +131,7 @@ sal_Int32 SwVbaTableHelper::getTableWidth( ) throw (uno::RuntimeException) return nWidth; } -SwTableBox* SwVbaTableHelper::GetTabBox( sal_Int32 nCol, sal_Int32 nRow ) throw (css::uno::RuntimeException) +SwTableBox* SwVbaTableHelper::GetTabBox( sal_Int32 nCol, sal_Int32 nRow ) { SwTableLines& rLines = pTable->GetTabLines(); sal_Int32 nRowCount = rLines.size(); @@ -182,7 +182,7 @@ sal_Int32 SwVbaTableHelper::GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum) return i - 1; } -sal_Int32 SwVbaTableHelper::GetColWidth( sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::GetColWidth( sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly ) { SwTableBox* pStart = GetTabBox( nCol, nRow ); SwTabCols aCols; @@ -194,7 +194,7 @@ sal_Int32 SwVbaTableHelper::GetColWidth( sal_Int32 nCol, sal_Int32 nRow, bool bC return ( sal_Int32 )Millimeter::getInPoints( static_cast<int>(dAbsWidth) ); } -sal_Int32 SwVbaTableHelper::GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) { SwTwips nWidth = 0; @@ -230,7 +230,7 @@ sal_Int32 SwVbaTableHelper::GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) thro return nWidth; } -void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly ) throw (css::uno::RuntimeException, std::exception) +void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly ) { double dAbsWidth = Millimeter::getInHundredthsOfOneMillimeter( _width ); sal_Int32 nTableWidth = getTableWidth( ); diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx index 4888785edda0..42aeaaabe1bd 100644 --- a/sw/source/ui/vba/vbatablehelper.hxx +++ b/sw/source/ui/vba/vbatablehelper.hxx @@ -32,34 +32,34 @@ private: private: /// @throws css::uno::RuntimeException - SwTableBox* GetTabBox( sal_Int32 nCol, sal_Int32 nRow ) throw (css::uno::RuntimeException); + SwTableBox* GetTabBox( sal_Int32 nCol, sal_Int32 nRow ); void InitTabCols( SwTabCols& rCols, const SwTableBox *pStart, bool bCurRowOnly ); static sal_Int32 GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum); static sal_Int32 GetColCount( SwTabCols& rCols ); /// @throws css::uno::RuntimeException - static sal_Int32 GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) throw (css::uno::RuntimeException); + static sal_Int32 GetColWidth( SwTabCols& rCols, sal_Int32 nNum ); public: /// @throws css::uno::RuntimeException - explicit SwVbaTableHelper( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException); + explicit SwVbaTableHelper( const css::uno::Reference< css::text::XTextTable >& xTextTable ); /// @throws css::uno::RuntimeException - sal_Int32 getTabColumnsCount( sal_Int32 nRowIndex ) throw (css::uno::RuntimeException); + sal_Int32 getTabColumnsCount( sal_Int32 nRowIndex ); /// @throws css::uno::RuntimeException - sal_Int32 getTabColumnsMaxCount( ) throw (css::uno::RuntimeException); + sal_Int32 getTabColumnsMaxCount( ); /// @throws css::uno::RuntimeException - sal_Int32 getTabRowIndex( const OUString& sCellName ) throw (css::uno::RuntimeException); + sal_Int32 getTabRowIndex( const OUString& sCellName ); /// @throws css::uno::RuntimeException - sal_Int32 getTabColIndex( const OUString& sCellName ) throw (css::uno::RuntimeException); + sal_Int32 getTabColIndex( const OUString& sCellName ); /// @throws css::uno::RuntimeException - sal_Int32 getTableWidth( ) throw (css::uno::RuntimeException); + sal_Int32 getTableWidth( ); /// @throws css::uno::RuntimeException - sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false ) throw (css::uno::RuntimeException); + sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false ); /// @throws css::uno::RuntimeException - void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false ) throw (css::uno::RuntimeException, std::exception); + void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly = false ); /// @throws css::uno::RuntimeException - static SwTable* GetSwTable( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException); + static SwTable* GetSwTable( const css::uno::Reference< css::text::XTextTable >& xTextTable ); static OUString getColumnStr( sal_Int32 nCol ); }; diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx index 34c177b10b07..778c8cfdf5d6 100644 --- a/sw/source/ui/vba/vbatableofcontents.cxx +++ b/sw/source/ui/vba/vbatableofcontents.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaTableOfContents::SwVbaTableOfContents( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xDoc, const uno::Reference< text::XDocumentIndex >& xDocumentIndex ) throw ( uno::RuntimeException ) : +SwVbaTableOfContents::SwVbaTableOfContents( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xDoc, const uno::Reference< text::XDocumentIndex >& xDocumentIndex ) : SwVbaTableOfContents_BASE( rParent, rContext ), mxTextDocument( xDoc ), mxDocumentIndex( xDocumentIndex ) { mxTocProps.set( mxDocumentIndex, uno::UNO_QUERY_THROW ); @@ -35,60 +35,60 @@ SwVbaTableOfContents::~SwVbaTableOfContents() { } -::sal_Int32 SAL_CALL SwVbaTableOfContents::getLowerHeadingLevel() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaTableOfContents::getLowerHeadingLevel() { sal_Int16 nLevel = 0; mxTocProps->getPropertyValue("Level") >>= nLevel; return nLevel; } -void SAL_CALL SwVbaTableOfContents::setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaTableOfContents::setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) { mxTocProps->setPropertyValue("Level", uno::makeAny( sal_Int8( _lowerheadinglevel ) ) ); } -::sal_Int32 SAL_CALL SwVbaTableOfContents::getTabLeader() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaTableOfContents::getTabLeader() { // not support in Writer return word::WdTabLeader::wdTabLeaderDots; } -void SAL_CALL SwVbaTableOfContents::setTabLeader( ::sal_Int32 /*_tableader*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaTableOfContents::setTabLeader( ::sal_Int32 /*_tableader*/ ) { // not support in Writer } -sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields() { bool bUseFields = false; mxTocProps->getPropertyValue("CreateFromMarks") >>= bUseFields; return bUseFields; } -void SAL_CALL SwVbaTableOfContents::setUseFields( sal_Bool _useFields ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaTableOfContents::setUseFields( sal_Bool _useFields ) { mxTocProps->setPropertyValue("CreateFromMarks", uno::makeAny( _useFields ) ); } -sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() { bool bUseOutlineLevels = false; mxTocProps->getPropertyValue("CreateFromOutline") >>= bUseOutlineLevels; return bUseOutlineLevels; } -void SAL_CALL SwVbaTableOfContents::setUseOutlineLevels( sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwVbaTableOfContents::setUseOutlineLevels( sal_Bool _useOutlineLevels ) { mxTocProps->setPropertyValue("CreateFromOutline", uno::makeAny( _useOutlineLevels ) ); } -void SAL_CALL SwVbaTableOfContents::Delete( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaTableOfContents::Delete( ) { uno::Reference< text::XTextContent > xTextContent( mxDocumentIndex, uno::UNO_QUERY_THROW ); mxTextDocument->getText()->removeTextContent( xTextContent ); } -void SAL_CALL SwVbaTableOfContents::Update( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaTableOfContents::Update( ) { mxDocumentIndex->update(); } diff --git a/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx index 11071043193c..effdd6c930fb 100644 --- a/sw/source/ui/vba/vbatableofcontents.hxx +++ b/sw/source/ui/vba/vbatableofcontents.hxx @@ -35,22 +35,22 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaTableOfContents( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDoc, const css::uno::Reference< css::text::XDocumentIndex >& xDocumentIndex ) throw ( css::uno::RuntimeException ); + SwVbaTableOfContents( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDoc, const css::uno::Reference< css::text::XDocumentIndex >& xDocumentIndex ); virtual ~SwVbaTableOfContents() override; // Attributes - virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getTabLeader() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTabLeader( ::sal_Int32 _tableader ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getUseFields() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setUseFields( sal_Bool _useFields ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setUseOutlineLevels( sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() override; + virtual void SAL_CALL setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) override; + virtual ::sal_Int32 SAL_CALL getTabLeader() override; + virtual void SAL_CALL setTabLeader( ::sal_Int32 _tableader ) override; + virtual sal_Bool SAL_CALL getUseFields() override; + virtual void SAL_CALL setUseFields( sal_Bool _useFields ) override; + virtual sal_Bool SAL_CALL getUseOutlineLevels() override; + virtual void SAL_CALL setUseOutlineLevels( sal_Bool _useOutlineLevels ) override; // Methods - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Update( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL Update( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 3c0e8343f3c7..545f99fc4c1b 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -83,11 +83,11 @@ public: cachePos = mxTables.begin(); } // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount( ) override { return mxTables.size(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -95,17 +95,17 @@ public: return uno::makeAny( xTable ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<text::XTextTable>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return getCount() > 0 ; } + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<text::XTextTable>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) override { return getCount() > 0 ; } // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override { if ( !hasByName(aName) ) throw container::NoSuchElementException(); uno::Reference< text::XTextTable > xTable( *cachePos, uno::UNO_QUERY_THROW ); return uno::makeAny( xTable ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { uno::Sequence< OUString > sNames( mxTables.size() ); OUString* pString = sNames.getArray(); @@ -118,7 +118,7 @@ public: } return sNames; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { cachePos = mxTables.begin(); XTextTableVec::iterator it_end = mxTables.end(); @@ -143,11 +143,11 @@ public: TableEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxParent( xParent ), mxContext( xContext ), mxDocument( xDocument ), mxIndexAccess( xIndexAccess ), mnCurIndex(0) { } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( mnCurIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -161,7 +161,7 @@ SwVbaTables::SwVbaTables( const uno::Reference< XHelperInterface >& xParent, con } uno::Reference< word::XTable > SAL_CALL -SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ ) { sal_Int32 nCols = 0; sal_Int32 nRows = 0; @@ -195,7 +195,7 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N } uno::Reference< container::XEnumeration > SAL_CALL -SwVbaTables::createEnumeration() throw (uno::RuntimeException) +SwVbaTables::createEnumeration() { return new TableEnumerationImpl( mxParent, mxContext, mxDocument, m_xIndexAccess ); } @@ -216,7 +216,7 @@ SwVbaTables::getServiceImplName() // XEnumerationAccess uno::Type SAL_CALL -SwVbaTables::getElementType() throw (uno::RuntimeException) +SwVbaTables::getElementType() { return cppu::UnoType<word::XTable>::get(); } diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index 45aba199a4ef..ae7de0b00cb5 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -31,10 +31,10 @@ class SwVbaTables : public SwVbaTables_BASE public: SwVbaTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XTables - virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index e069402d6aef..e1fac5afca27 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -35,12 +35,12 @@ public: explicit TablesOfContentsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if( nIndex < mxIndexAccess->getCount() ) { @@ -61,7 +61,7 @@ private: public: /// @throws uno::RuntimeException - TableOfContentsCollectionHelper( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDoc ) throw ( uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ), mxTextDocument( xDoc ) + TableOfContentsCollectionHelper( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDoc ): mxParent( xParent ), mxContext( xContext ), mxTextDocument( xDoc ) { uno::Reference< text::XDocumentIndexesSupplier > xDocIndexSupp( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xDocIndexes = xDocIndexSupp->getDocumentIndexes(); @@ -76,11 +76,11 @@ public: } } - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount( ) override { return maToc.size(); } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -88,27 +88,27 @@ public: uno::Reference< text::XDocumentIndex > xToc( maToc[Index], uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XTableOfContents >( new SwVbaTableOfContents( mxParent, mxContext, mxTextDocument, xToc ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<word::XTableOfContents>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { return new TablesOfContentsEnumWrapper( this ); } }; -SwVbaTablesOfContents::SwVbaTablesOfContents( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDoc ) throw (uno::RuntimeException) : SwVbaTablesOfContents_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new TableOfContentsCollectionHelper( xParent, xContext, xDoc ) ) ), mxTextDocument( xDoc ) +SwVbaTablesOfContents::SwVbaTablesOfContents( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDoc ) : SwVbaTablesOfContents_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new TableOfContentsCollectionHelper( xParent, xContext, xDoc ) ) ), mxTextDocument( xDoc ) { } uno::Reference< word::XTableOfContents > SAL_CALL -SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const uno::Any& /*UseHeadingStyles*/, const uno::Any& /*UpperHeadingLevel*/, const uno::Any& LowerHeadingLevel, const uno::Any& UseFields, const uno::Any& /*TableID*/, const uno::Any& /*RightAlignPageNumbers*/, const uno::Any& /*IncludePageNumbers*/, const uno::Any& /*AddedStyles*/, const uno::Any& /*UseHyperlinks*/, const uno::Any& /*HidePageNumbersInWeb*/, const uno::Any& /*UseOutlineLevels*/ ) throw (uno::RuntimeException, std::exception) +SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const uno::Any& /*UseHeadingStyles*/, const uno::Any& /*UpperHeadingLevel*/, const uno::Any& LowerHeadingLevel, const uno::Any& UseFields, const uno::Any& /*TableID*/, const uno::Any& /*RightAlignPageNumbers*/, const uno::Any& /*IncludePageNumbers*/, const uno::Any& /*AddedStyles*/, const uno::Any& /*UseHyperlinks*/, const uno::Any& /*HidePageNumbersInWeb*/, const uno::Any& /*UseOutlineLevels*/ ) { uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance("com.sun.star.text.ContentIndex"), uno::UNO_QUERY_THROW ); @@ -147,12 +147,12 @@ SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const u // XEnumerationAccess uno::Type -SwVbaTablesOfContents::getElementType() throw (uno::RuntimeException) +SwVbaTablesOfContents::getElementType() { return cppu::UnoType<word::XTableOfContents>::get(); } uno::Reference< container::XEnumeration > -SwVbaTablesOfContents::createEnumeration() throw (uno::RuntimeException) +SwVbaTablesOfContents::createEnumeration() { return new TablesOfContentsEnumWrapper( m_xIndexAccess ); } diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx index 297fe8aa0e7b..1a8199fa990a 100644 --- a/sw/source/ui/vba/vbatablesofcontents.hxx +++ b/sw/source/ui/vba/vbatablesofcontents.hxx @@ -35,14 +35,14 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaTablesOfContents( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDoc ) throw ( css::uno::RuntimeException ); + SwVbaTablesOfContents( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDoc ); // Methods - virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaTablesOfContents_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx index c0c57afddf24..bce16115a332 100644 --- a/sw/source/ui/vba/vbatabstop.cxx +++ b/sw/source/ui/vba/vbatabstop.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaTabStop::SwVbaTabStop( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ) throw ( uno::RuntimeException ) : SwVbaTabStop_BASE( rParent, rContext ) +SwVbaTabStop::SwVbaTabStop( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ) : SwVbaTabStop_BASE( rParent, rContext ) { } diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index 9e009e9adf8e..de956205db96 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -28,7 +28,7 @@ class SwVbaTabStop : public SwVbaTabStop_BASE { public: /// @throws css::uno::RuntimeException - SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ) throw ( css::uno::RuntimeException ); + SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ); virtual ~SwVbaTabStop() override; // XHelperInterface diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index 75b05f87927e..c69a503a8e8b 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -30,7 +30,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; /// @throws uno::RuntimeException -static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< beans::XPropertySet >& xParaProps ) throw (uno::RuntimeException) +static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< beans::XPropertySet >& xParaProps ) { uno::Sequence< style::TabStop > aSeq; xParaProps->getPropertyValue("ParaTabStops") >>= aSeq; @@ -38,7 +38,7 @@ static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< be } /// @throws uno::RuntimeException -static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq ) throw (uno::RuntimeException) +static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq ) { xParaProps->setPropertyValue("ParaTabStops", uno::makeAny( aSeq ) ); } @@ -52,12 +52,12 @@ public: explicit TabStopsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 ) { } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < mxIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if( nIndex < mxIndexAccess->getCount() ) { @@ -77,42 +77,42 @@ private: public: /// @throws css::uno::RuntimeException - TabStopCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) throw ( css::uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ) + TabStopCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ): mxParent( xParent ), mxContext( xContext ) { mnTabStops = lcl_getTabStops( xParaProps ).getLength(); } - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount( ) override { return mnTabStops; } - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); return uno::makeAny( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext ) ) ); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<word::XTabStop>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) override { return new TabStopsEnumWrapper( this ); } }; -SwVbaTabStops::SwVbaTabStops( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& xParaProps ) throw (uno::RuntimeException) : SwVbaTabStops_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new TabStopCollectionHelper( xParent, xContext, xParaProps ) ) ), mxParaProps( xParaProps ) +SwVbaTabStops::SwVbaTabStops( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& xParaProps ) : SwVbaTabStops_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new TabStopCollectionHelper( xParent, xContext, xParaProps ) ) ), mxParaProps( xParaProps ) { } -uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, const uno::Any& Alignment, const uno::Any& Leader ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, const uno::Any& Alignment, const uno::Any& Leader ) { sal_Int32 nPosition = Millimeter::getInHundredthsOfOneMillimeter( Position ); @@ -227,7 +227,7 @@ uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, co return uno::Reference< word::XTabStop >( new SwVbaTabStop( this, mxContext ) ); } -void SAL_CALL SwVbaTabStops::ClearAll() throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaTabStops::ClearAll() { uno::Sequence< style::TabStop > aSeq; lcl_setTabStops( mxParaProps, aSeq ); @@ -235,12 +235,12 @@ void SAL_CALL SwVbaTabStops::ClearAll() throw (uno::RuntimeException, std::excep // XEnumerationAccess uno::Type -SwVbaTabStops::getElementType() throw (uno::RuntimeException) +SwVbaTabStops::getElementType() { return cppu::UnoType<word::XTabStop>::get(); } uno::Reference< container::XEnumeration > -SwVbaTabStops::createEnumeration() throw (uno::RuntimeException) +SwVbaTabStops::createEnumeration() { return new TabStopsEnumWrapper( m_xIndexAccess ); } diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx index c5b8994dfd05..5bb1d439cccd 100644 --- a/sw/source/ui/vba/vbatabstops.hxx +++ b/sw/source/ui/vba/vbatabstops.hxx @@ -35,18 +35,15 @@ private: public: /// @throws css::uno::RuntimeException - SwVbaTabStops( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) throw ( css::uno::RuntimeException ); + SwVbaTabStops( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ); // Methods - virtual css::uno::Reference< ::ooo::vba::word::XTabStop > SAL_CALL Add( float Position, const css::uno::Any& Alignment, const css::uno::Any& Leader ) - throw (css::script::BasicErrorException, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL ClearAll( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ::ooo::vba::word::XTabStop > SAL_CALL Add( float Position, const css::uno::Any& Alignment, const css::uno::Any& Leader ) override; + virtual void SAL_CALL ClearAll( ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaTabStops_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index a23735a9c8ec..0a2452f9bb4a 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -56,7 +56,7 @@ SwVbaTemplate::~SwVbaTemplate() } OUString -SwVbaTemplate::getName() throw ( css::uno::RuntimeException, std::exception ) +SwVbaTemplate::getName() { OUString sName; if( !msFullUrl.isEmpty() ) @@ -68,7 +68,7 @@ SwVbaTemplate::getName() throw ( css::uno::RuntimeException, std::exception ) } OUString -SwVbaTemplate::getPath() throw ( css::uno::RuntimeException, std::exception ) +SwVbaTemplate::getPath() { OUString sPath; if( !msFullUrl.isEmpty() ) @@ -82,7 +82,7 @@ SwVbaTemplate::getPath() throw ( css::uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeException, std::exception) +SwVbaTemplate::AutoTextEntries( const uno::Any& index ) { uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); uno::Reference< text::XAutoTextContainer2 > xAutoTextContainer = text::AutoTextContainer::create( xContext ); diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index ae6eb822a65e..5765c06a8ee5 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -34,9 +34,9 @@ public: virtual ~SwVbaTemplate() override; // XTemplate - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual OUString SAL_CALL getPath() override; + virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx index 7aab993d4ebb..76033d2a9d83 100644 --- a/sw/source/ui/vba/vbavariable.cxx +++ b/sw/source/ui/vba/vbavariable.cxx @@ -26,7 +26,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; SwVbaVariable::SwVbaVariable( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, - const uno::Reference< beans::XPropertyAccess >& rUserDefined, const OUString& rVariableName ) throw ( uno::RuntimeException ) : + const uno::Reference< beans::XPropertyAccess >& rUserDefined, const OUString& rVariableName ) : SwVbaVariable_BASE( rParent, rContext ), mxUserDefined( rUserDefined ), maVariableName( rVariableName ) { } @@ -36,26 +36,26 @@ SwVbaVariable::~SwVbaVariable() } OUString SAL_CALL -SwVbaVariable::getName() throw ( css::uno::RuntimeException, std::exception ) +SwVbaVariable::getName() { return maVariableName; } void SAL_CALL -SwVbaVariable::setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ) +SwVbaVariable::setName( const OUString& ) { throw uno::RuntimeException(" Fail to set name" ); } uno::Any SAL_CALL -SwVbaVariable::getValue() throw ( css::uno::RuntimeException, std::exception ) +SwVbaVariable::getValue() { uno::Reference< beans::XPropertySet > xProp( mxUserDefined, uno::UNO_QUERY_THROW ); return xProp->getPropertyValue( maVariableName ); } void SAL_CALL -SwVbaVariable::setValue( const uno::Any& rValue ) throw ( css::uno::RuntimeException, std::exception ) +SwVbaVariable::setValue( const uno::Any& rValue ) { // FIXME: fail to set the value if the new type of value is different from the original one. uno::Reference< beans::XPropertySet > xProp( mxUserDefined, uno::UNO_QUERY_THROW ); @@ -63,7 +63,7 @@ SwVbaVariable::setValue( const uno::Any& rValue ) throw ( css::uno::RuntimeExcep } sal_Int32 SAL_CALL -SwVbaVariable::getIndex() throw ( css::uno::RuntimeException, std::exception ) +SwVbaVariable::getIndex() { const uno::Sequence< beans::PropertyValue > props = mxUserDefined->getPropertyValues(); for (sal_Int32 i = 0; i < props.getLength(); ++i) diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx index a354ae5bbf38..a278ed16d2b6 100644 --- a/sw/source/ui/vba/vbavariable.hxx +++ b/sw/source/ui/vba/vbavariable.hxx @@ -34,15 +34,15 @@ private: public: /// @throws css::uno::RuntimeException SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const OUString& rName ) throw ( css::uno::RuntimeException ); + const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const OUString& rName ); virtual ~SwVbaVariable() override; // XVariable - virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& ) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& rValue ) override; + virtual sal_Int32 SAL_CALL getIndex() override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index 2556cc401de3..d0bfe6bf9d23 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; /// @throws uno::RuntimeException -uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertyAccess >& xUserDefined ) throw ( uno::RuntimeException ) +uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertyAccess >& xUserDefined ) { // FIXME: the performance is poor? XNamedObjectCollectionHelper< word::XVariable >::XNamedVec aVariables; @@ -44,12 +44,12 @@ SwVbaVariables::SwVbaVariables( const uno::Reference< XHelperInterface >& xParen } // XEnumerationAccess uno::Type -SwVbaVariables::getElementType() throw (uno::RuntimeException) +SwVbaVariables::getElementType() { return cppu::UnoType<word::XVariable>::get(); } uno::Reference< container::XEnumeration > -SwVbaVariables::createEnumeration() throw (uno::RuntimeException) +SwVbaVariables::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return xEnumerationAccess->createEnumeration(); @@ -62,7 +62,7 @@ SwVbaVariables::createCollectionObject( const css::uno::Any& aSource ) } uno::Any SAL_CALL -SwVbaVariables::Add( const OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException, std::exception) +SwVbaVariables::Add( const OUString& rName, const uno::Any& rValue ) { uno::Any aValue; if( rValue.hasValue() ) diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx index 6a5652562658..aa2901d0e479 100644 --- a/sw/source/ui/vba/vbavariables.hxx +++ b/sw/source/ui/vba/vbavariables.hxx @@ -37,8 +37,8 @@ public: SwVbaVariables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // SwVbaVariables_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; @@ -46,7 +46,7 @@ public: virtual css::uno::Sequence<OUString> getServiceNames() override; // XVariables - virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) override; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAVARIABLES_HXX diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index c8c9524de83c..cbf1e7b95587 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star; static const sal_Int32 DEFAULT_BODY_DISTANCE = 500; SwVbaView::SwVbaView( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, - const uno::Reference< frame::XModel >& rModel ) throw ( uno::RuntimeException ) : + const uno::Reference< frame::XModel >& rModel ) : SwVbaView_BASE( rParent, rContext ), mxModel( rModel ) { uno::Reference< frame::XController > xController = mxModel->getCurrentController(); @@ -65,7 +65,7 @@ SwVbaView::~SwVbaView() } ::sal_Int32 SAL_CALL -SwVbaView::getSeekView() throw (css::uno::RuntimeException, std::exception) +SwVbaView::getSeekView() { // FIXME: if the view cursor is in table, field, section and frame // handle if the cursor is in table @@ -116,7 +116,7 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception) +SwVbaView::setSeekView( ::sal_Int32 _seekview ) { // FIXME: save the current cursor position, if the cursor is in the main // document, so we can jump back to this position, if the macro sets @@ -179,19 +179,19 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio } ::sal_Int32 SAL_CALL -SwVbaView::getSplitSpecial() throw (css::uno::RuntimeException, std::exception) +SwVbaView::getSplitSpecial() { return word::WdSpecialPane::wdPaneNone; } void SAL_CALL -SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::RuntimeException, std::exception) +SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) { // not support in Writer } sal_Bool SAL_CALL -SwVbaView::getTableGridLines() throw (css::uno::RuntimeException, std::exception) +SwVbaView::getTableGridLines() { bool bShowTableGridLine = false; mxViewSettings->getPropertyValue("ShowTableBoundaries") >>= bShowTableGridLine; @@ -199,13 +199,13 @@ SwVbaView::getTableGridLines() throw (css::uno::RuntimeException, std::exception } void SAL_CALL -SwVbaView::setTableGridLines( sal_Bool _tablegridlines ) throw (css::uno::RuntimeException, std::exception) +SwVbaView::setTableGridLines( sal_Bool _tablegridlines ) { mxViewSettings->setPropertyValue("ShowTableBoundaries", uno::makeAny( _tablegridlines ) ); } ::sal_Int32 SAL_CALL -SwVbaView::getType() throw (css::uno::RuntimeException, std::exception) +SwVbaView::getType() { // FIXME: handle wdPrintPreview type bool bOnlineLayout = false; @@ -214,7 +214,7 @@ SwVbaView::getType() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) +SwVbaView::setType( ::sal_Int32 _type ) { // FIXME: handle wdPrintPreview type switch( _type ) @@ -241,7 +241,7 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std:: } } -uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) throw (uno::RuntimeException, script::BasicErrorException, std::exception) +uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) { mxModel->lockControllers(); diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx index a69735d22e4f..bee0c957948b 100644 --- a/sw/source/ui/vba/vbaview.hxx +++ b/sw/source/ui/vba/vbaview.hxx @@ -37,23 +37,23 @@ private: /// @throws css::uno::RuntimeException /// @throws css::script::BasicErrorException - css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception); + css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ); public: /// @throws css::uno::RuntimeException SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException ); + const css::uno::Reference< css::frame::XModel >& rModel ); virtual ~SwVbaView() override; // XView - virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTableGridLines( sal_Bool _tablegridlines ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getSeekView() override; + virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) override; + virtual ::sal_Int32 SAL_CALL getSplitSpecial() override; + virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) override; + virtual sal_Bool SAL_CALL getTableGridLines() override; + virtual void SAL_CALL setTableGridLines( sal_Bool _tablegridlines ) override; + virtual ::sal_Int32 SAL_CALL getType() override; + virtual void SAL_CALL setType( ::sal_Int32 _type ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx index 270abb71eb19..5f5749d0f5c4 100644 --- a/sw/source/ui/vba/vbawindow.cxx +++ b/sw/source/ui/vba/vbawindow.cxx @@ -37,13 +37,13 @@ SwVbaWindow::SwVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, - const uno::Reference< frame::XController >& xController ) throw (uno::RuntimeException) : + const uno::Reference< frame::XController >& xController ) : WindowImpl_BASE( xParent, xContext, xModel, xController ) { } void -SwVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception) +SwVbaWindow::Activate() { rtl::Reference<SwVbaDocument> document( new SwVbaDocument(uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel) ); @@ -51,7 +51,7 @@ SwVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception) } void -SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument ) throw (uno::RuntimeException, std::exception) +SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument ) { // FIXME: it is incorrect when there are more than 1 windows rtl::Reference<SwVbaDocument> document( new SwVbaDocument(uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel) ); @@ -60,12 +60,12 @@ SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument ) } uno::Any SAL_CALL -SwVbaWindow::getView() throw (uno::RuntimeException, std::exception) +SwVbaWindow::getView() { return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, m_xModel ) ) ); } -void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) { sal_Int32 nType = 0; if( _view >>= nType ) @@ -76,7 +76,7 @@ void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) throw (uno::RuntimeE } uno::Any SAL_CALL -SwVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception) +SwVbaWindow::getWindowState() { sal_Int32 nwindowState = word::WdWindowState::wdWindowStateNormal; SwView* pView = word::getView( m_xModel ); @@ -93,7 +93,7 @@ SwVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception) } void SAL_CALL -SwVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeException, std::exception) +SwVbaWindow::setWindowState( const uno::Any& _windowstate ) { sal_Int32 nwindowState = word::WdWindowState::wdWindowStateMaximize; _windowstate >>= nwindowState; @@ -114,7 +114,7 @@ SwVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE } uno::Any SAL_CALL -SwVbaWindow::Panes( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +SwVbaWindow::Panes( const uno::Any& aIndex ) { uno::Reference< XCollection > xPanes( new SwVbaPanes( this, mxContext, m_xModel ) ); if( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) @@ -124,7 +124,7 @@ SwVbaWindow::Panes( const uno::Any& aIndex ) throw (uno::RuntimeException, std:: } uno::Any SAL_CALL -SwVbaWindow::ActivePane() throw (uno::RuntimeException, std::exception) +SwVbaWindow::ActivePane() { return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this, mxContext, m_xModel ) ) ); } diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx index 5163f86ba275..e5f7296a8ba5 100644 --- a/sw/source/ui/vba/vbawindow.hxx +++ b/sw/source/ui/vba/vbawindow.hxx @@ -35,19 +35,18 @@ public: const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel, - const css::uno::Reference< css::frame::XController >& xController ) - throw (css::uno::RuntimeException); + const css::uno::Reference< css::frame::XController >& xController ); // Attributes - virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getView() override; + virtual void SAL_CALL setView( const css::uno::Any& _view ) override; + virtual css::uno::Any SAL_CALL getWindowState() override; + virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) override; // Methods - virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Activate( ) override; + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) override; + virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL ActivePane() override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index 2d411778d446..c585b7455a5a 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -37,7 +37,7 @@ SwVbaWrapFormat::SwVbaWrapFormat( uno::Sequence< uno::Any > const& aArgs, uno::R m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW ); } -void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) +void SwVbaWrapFormat::makeWrap() { text::WrapTextMode eTextMode = text::WrapTextMode_NONE; if( mnSide == word::WdWrapSideType::wdWrapLeft ) @@ -86,7 +86,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) m_xPropertySet->setPropertyValue("TextWrap", uno::makeAny( eTextMode ) ); } -::sal_Int32 SAL_CALL SwVbaWrapFormat::getType() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaWrapFormat::getType() { sal_Int32 nType = word::WdWrapType::wdWrapSquare; text::WrapTextMode eTextMode; @@ -128,13 +128,13 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) return nType; } -void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) { mnWrapFormatType = _type; makeWrap(); } -::sal_Int32 SAL_CALL SwVbaWrapFormat::getSide() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SwVbaWrapFormat::getSide() { sal_Int32 nSide = word::WdWrapSideType::wdWrapBoth; text::WrapTextMode eTextMode; @@ -159,61 +159,61 @@ void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) throw (uno::RuntimeE return nSide; } -void SAL_CALL SwVbaWrapFormat::setSide( ::sal_Int32 _side ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaWrapFormat::setSide( ::sal_Int32 _side ) { mnSide = _side; makeWrap(); } -float SwVbaWrapFormat::getDistance( const OUString& sName ) throw (uno::RuntimeException) +float SwVbaWrapFormat::getDistance( const OUString& sName ) { sal_Int32 nDistance = 0; m_xPropertySet->getPropertyValue( sName ) >>= nDistance; return static_cast< float >( Millimeter::getInPoints( nDistance ) ); } -void SwVbaWrapFormat::setDistance( const OUString& sName, float _distance ) throw (uno::RuntimeException) +void SwVbaWrapFormat::setDistance( const OUString& sName, float _distance ) { sal_Int32 nDistance = Millimeter::getInHundredthsOfOneMillimeter( _distance ); m_xPropertySet->setPropertyValue( sName, uno::makeAny( nDistance ) ); } -float SAL_CALL SwVbaWrapFormat::getDistanceTop() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaWrapFormat::getDistanceTop() { return getDistance( "TopMargin" ); } -void SAL_CALL SwVbaWrapFormat::setDistanceTop( float _distancetop ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaWrapFormat::setDistanceTop( float _distancetop ) { setDistance( "TopMargin", _distancetop ); } -float SAL_CALL SwVbaWrapFormat::getDistanceBottom() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaWrapFormat::getDistanceBottom() { return getDistance( "BottomMargin" ); } -void SAL_CALL SwVbaWrapFormat::setDistanceBottom( float _distancebottom ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaWrapFormat::setDistanceBottom( float _distancebottom ) { setDistance( "BottomMargin", _distancebottom ); } -float SAL_CALL SwVbaWrapFormat::getDistanceLeft() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaWrapFormat::getDistanceLeft() { return getDistance( "LeftMargin" ); } -void SAL_CALL SwVbaWrapFormat::setDistanceLeft( float _distanceleft ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaWrapFormat::setDistanceLeft( float _distanceleft ) { setDistance( "LeftMargin", _distanceleft ); } -float SAL_CALL SwVbaWrapFormat::getDistanceRight() throw (uno::RuntimeException, std::exception) +float SAL_CALL SwVbaWrapFormat::getDistanceRight() { return getDistance( "RightMargin" ); } -void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) { setDistance( "RightMargin", _distanceright ); } diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx index 5008197d7d55..ef28118ed956 100644 --- a/sw/source/ui/vba/vbawrapformat.hxx +++ b/sw/source/ui/vba/vbawrapformat.hxx @@ -35,27 +35,27 @@ private: private: /// @throws css::uno::RuntimeException - void makeWrap() throw (css::uno::RuntimeException); + void makeWrap(); /// @throws css::uno::RuntimeException - float getDistance( const OUString& sName ) throw (css::uno::RuntimeException); + float getDistance( const OUString& sName ); /// @throws css::uno::RuntimeException - void setDistance( const OUString& sName, float _distance ) throw (css::uno::RuntimeException); + void setDistance( const OUString& sName, float _distance ); public: SwVbaWrapFormat( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getSide() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSide( ::sal_Int32 _side ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getDistanceTop() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDistanceTop( float _distancetop ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getDistanceBottom() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDistanceBottom( float _distancebottom ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getDistanceLeft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDistanceLeft( float _distanceleft ) throw (css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getType() override; + virtual void SAL_CALL setType( ::sal_Int32 _type ) override; + virtual ::sal_Int32 SAL_CALL getSide() override; + virtual void SAL_CALL setSide( ::sal_Int32 _side ) override; + virtual float SAL_CALL getDistanceTop() override; + virtual void SAL_CALL setDistanceTop( float _distancetop ) override; + virtual float SAL_CALL getDistanceBottom() override; + virtual void SAL_CALL setDistanceBottom( float _distancebottom ) override; + virtual float SAL_CALL getDistanceLeft() override; + virtual void SAL_CALL setDistanceLeft( float _distanceleft ) override; + virtual float SAL_CALL getDistanceRight() override; + virtual void SAL_CALL setDistanceRight( float _distanceright ) override; virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index 63582f924907..0588bba7bb12 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -57,7 +57,7 @@ SwView* getView( const uno::Reference< frame::XModel>& xModel ) return pDocShell? pDocShell->GetView() : nullptr; } -uno::Reference< text::XTextViewCursor > getXTextViewCursor( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +uno::Reference< text::XTextViewCursor > getXTextViewCursor( const uno::Reference< frame::XModel >& xModel ) { uno::Reference< frame::XController > xController = xModel->getCurrentController(); uno::Reference< text::XTextViewCursorSupplier > xTextViewCursorSupp( xController, uno::UNO_QUERY_THROW ); @@ -65,13 +65,13 @@ uno::Reference< text::XTextViewCursor > getXTextViewCursor( const uno::Reference return xTextViewCursor; } -uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel ) { uno::Reference< beans::XPropertySet > xCursorProps( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); return getCurrentPageStyle( xModel, xCursorProps ); } -uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException) +uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) { OUString aPageStyleName; xProps->getPropertyValue("PageStyleName") >>= aPageStyleName; @@ -83,14 +83,14 @@ uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame return xStyle; } -sal_Int32 getPageCount( const uno::Reference< frame::XModel>& xModel ) throw (uno::RuntimeException) +sal_Int32 getPageCount( const uno::Reference< frame::XModel>& xModel ) { SwDocShell* pDocShell = getDocShell( xModel ); SwViewShell* pViewSh = pDocShell ? pDocShell->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() : nullptr; return pViewSh ? pViewSh->GetPageCount() : 0; } -uno::Reference< style::XStyle > getDefaultParagraphStyle( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +uno::Reference< style::XStyle > getDefaultParagraphStyle( const uno::Reference< frame::XModel >& xModel ) { uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); @@ -100,7 +100,7 @@ uno::Reference< style::XStyle > getDefaultParagraphStyle( const uno::Reference< return xStyle; } -uno::Reference< text::XTextRange > getFirstObjectPosition( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException) +uno::Reference< text::XTextRange > getFirstObjectPosition( const uno::Reference< text::XText >& xText ) { // if the first object is table, get the position of first cell uno::Reference< text::XTextRange > xTextRange; @@ -121,7 +121,7 @@ uno::Reference< text::XTextRange > getFirstObjectPosition( const uno::Reference< return xTextRange; } -uno::Reference< text::XText > getCurrentXText( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) +uno::Reference< text::XText > getCurrentXText( const uno::Reference< frame::XModel >& xModel ) { uno::Reference< text::XTextRange > xTextRange; uno::Reference< text::XTextContent > xTextContent( xModel->getCurrentSelection(), uno::UNO_QUERY ); @@ -162,7 +162,7 @@ uno::Reference< text::XText > getCurrentXText( const uno::Reference< frame::XMod return xText; } -bool gotoSelectedObjectAnchor( const uno::Reference< frame::XModel>& xModel ) throw (uno::RuntimeException) +bool gotoSelectedObjectAnchor( const uno::Reference< frame::XModel>& xModel ) { bool isObjectSelected = false; uno::Reference< text::XTextContent > xTextContent( xModel->getCurrentSelection(), uno::UNO_QUERY ); diff --git a/sw/source/ui/vba/wordvbahelper.hxx b/sw/source/ui/vba/wordvbahelper.hxx index b66b310f154e..b859285ae1f1 100644 --- a/sw/source/ui/vba/wordvbahelper.hxx +++ b/sw/source/ui/vba/wordvbahelper.hxx @@ -39,21 +39,21 @@ namespace ooo SwDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel ); SwView* getView( const css::uno::Reference< css::frame::XModel>& xModel ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::text::XTextViewCursor > getXTextViewCursor( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + css::uno::Reference< css::text::XTextViewCursor > getXTextViewCursor( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel>& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException); + css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel>& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps ); /// @throws css::uno::RuntimeException - sal_Int32 getPageCount( const css::uno::Reference< css::frame::XModel>& xModel ) throw (css::uno::RuntimeException); + sal_Int32 getPageCount( const css::uno::Reference< css::frame::XModel>& xModel ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::style::XStyle > getDefaultParagraphStyle( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); + css::uno::Reference< css::style::XStyle > getDefaultParagraphStyle( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException); + css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::text::XText > getCurrentXText( const css::uno::Reference< css::frame::XModel>& xModel ) throw (css::uno::RuntimeException); + css::uno::Reference< css::text::XText > getCurrentXText( const css::uno::Reference< css::frame::XModel>& xModel ); /// @throws css::uno::RuntimeException - bool gotoSelectedObjectAnchor( const css::uno::Reference< css::frame::XModel>& xModel ) throw (css::uno::RuntimeException); + bool gotoSelectedObjectAnchor( const css::uno::Reference< css::frame::XModel>& xModel ); enum E_DIRECTION { diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx index 2464878b136b..538f74933b45 100644 --- a/sw/source/uibase/config/StoredChapterNumbering.cxx +++ b/sw/source/uibase/config/StoredChapterNumbering.cxx @@ -71,8 +71,7 @@ public: } // XNamed - virtual OUString SAL_CALL getName() - throw (uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getName() override { SolarMutexGuard g; SwNumRulesWithName const* pRules(m_rNumRules.GetRules(m_nIndex)); @@ -83,8 +82,7 @@ public: return pRules->GetName(); } - virtual void SAL_CALL setName(OUString const& rName) - throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL setName(OUString const& rName) override { SolarMutexGuard g; SwNumRulesWithName *const pRules(GetOrCreateRules()); @@ -92,28 +90,23 @@ public: } // XElementAccess - virtual uno::Type SAL_CALL getElementType() - throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType() override { return ::cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } - virtual ::sal_Bool SAL_CALL hasElements() - throw (uno::RuntimeException, std::exception) override + virtual ::sal_Bool SAL_CALL hasElements() override { return true; } // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() - throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount() override { return MAXLEVEL; } - virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override { if (nIndex < 0 || MAXLEVEL <= nIndex) throw lang::IndexOutOfBoundsException(); @@ -141,10 +134,7 @@ public: // XIndexReplace virtual void SAL_CALL replaceByIndex( - sal_Int32 nIndex, uno::Any const& rElement) - throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, - std::exception) override + sal_Int32 nIndex, uno::Any const& rElement) override { if (nIndex < 0 || MAXLEVEL <= nIndex) throw lang::IndexOutOfBoundsException(); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index e372b8ee971d..7808ab038c37 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -206,7 +206,7 @@ class SwDBManager::ConnectionDisposedListener_Impl private: SwDBManager * m_pDBManager; - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const lang::EventObject& Source ) override; public: explicit ConnectionDisposedListener_Impl(SwDBManager& rMgr); @@ -224,10 +224,10 @@ class SwDataSourceRemovedListener : public cppu::WeakImplHelper<sdb::XDatabaseRe public: explicit SwDataSourceRemovedListener(SwDBManager& rDBManager); virtual ~SwDataSourceRemovedListener() override; - virtual void SAL_CALL registeredDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL changedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing(const lang::EventObject& rObject) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registeredDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) override; + virtual void SAL_CALL revokedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) override; + virtual void SAL_CALL changedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) override; + virtual void SAL_CALL disposing(const lang::EventObject& rObject) override; void Dispose(); }; @@ -245,11 +245,11 @@ SwDataSourceRemovedListener::~SwDataSourceRemovedListener() m_xDatabaseContext->removeDatabaseRegistrationsListener(this); } -void SAL_CALL SwDataSourceRemovedListener::registeredDatabaseLocation(const sdb::DatabaseRegistrationEvent& /*rEvent*/) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwDataSourceRemovedListener::registeredDatabaseLocation(const sdb::DatabaseRegistrationEvent& /*rEvent*/) { } -void SAL_CALL SwDataSourceRemovedListener::revokedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwDataSourceRemovedListener::revokedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) { if (!m_pDBManager || m_pDBManager->getEmbeddedName().isEmpty()) return; @@ -277,13 +277,13 @@ void SAL_CALL SwDataSourceRemovedListener::revokedDatabaseLocation(const sdb::Da m_pDBManager->setEmbeddedName(OUString(), *pDocShell); } -void SAL_CALL SwDataSourceRemovedListener::changedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwDataSourceRemovedListener::changedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) { if (rEvent.OldLocation != rEvent.NewLocation) revokedDatabaseLocation(rEvent); } -void SwDataSourceRemovedListener::disposing(const lang::EventObject& /*rObject*/) throw (uno::RuntimeException, std::exception) +void SwDataSourceRemovedListener::disposing(const lang::EventObject& /*rObject*/) { m_xDatabaseContext.clear(); } @@ -3068,7 +3068,6 @@ SwDBManager::ConnectionDisposedListener_Impl::ConnectionDisposedListener_Impl(Sw } void SwDBManager::ConnectionDisposedListener_Impl::disposing( const lang::EventObject& rSource ) - throw (uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 5691f3deef31..2d7a4760121d 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -68,10 +68,10 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper < XContainerListener > } virtual ~SwDBTreeList_Impl() override; - virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) override; + virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) override; + virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; bool HasContext(); SwWrtShell* GetWrtShell() { return m_pWrtShell;} @@ -94,24 +94,24 @@ SwDBTreeList_Impl::~SwDBTreeList_Impl() } } -void SwDBTreeList_Impl::elementInserted( const ContainerEvent& ) throw (RuntimeException, std::exception) +void SwDBTreeList_Impl::elementInserted( const ContainerEvent& ) { // information not needed } -void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& rEvent ) throw (RuntimeException, std::exception) +void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& rEvent ) { SolarMutexGuard aGuard; OUString sSource; rEvent.Accessor >>= sSource; } -void SwDBTreeList_Impl::disposing( const EventObject& ) throw (RuntimeException, std::exception) +void SwDBTreeList_Impl::disposing( const EventObject& ) { m_xDatabaseContext = nullptr; } -void SwDBTreeList_Impl::elementReplaced( const ContainerEvent& rEvent ) throw (RuntimeException, std::exception) +void SwDBTreeList_Impl::elementReplaced( const ContainerEvent& rEvent ) { elementRemoved(rEvent); } diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 2ba1b834fa9b..dc4c2a210583 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -604,12 +604,12 @@ SwAuthenticator::~SwAuthenticator() { } -OUString SwAuthenticator::getUserName( ) throw (RuntimeException, std::exception) +OUString SwAuthenticator::getUserName( ) { return m_aUserName; } -OUString SwAuthenticator::getPassword( ) throw (RuntimeException, std::exception) +OUString SwAuthenticator::getPassword( ) { if(!m_aUserName.isEmpty() && m_aPassword.isEmpty() && m_pParentWindow) { @@ -635,7 +635,6 @@ SwConnectionContext::~SwConnectionContext() } uno::Any SwConnectionContext::getValueByName( const OUString& rName ) - throw (uno::RuntimeException, std::exception) { uno::Any aRet; if( rName == "ServerName" ) @@ -652,17 +651,14 @@ SwConnectionListener::~SwConnectionListener() } void SwConnectionListener::connected(const lang::EventObject& /*aEvent*/) - throw (uno::RuntimeException, std::exception) { } void SwConnectionListener::disconnected(const lang::EventObject& /*aEvent*/) - throw (uno::RuntimeException, std::exception) { } void SwConnectionListener::disposing(const lang::EventObject& /*aEvent*/) - throw(uno::RuntimeException, std::exception) { } @@ -689,8 +685,6 @@ SwMailTransferable::~SwMailTransferable() } uno::Any SwMailTransferable::getTransferData( const datatransfer::DataFlavor& /*aFlavor*/ ) - throw (datatransfer::UnsupportedFlavorException, - io::IOException, uno::RuntimeException, std::exception) { uno::Any aRet; if( m_bIsBody ) @@ -714,7 +708,6 @@ uno::Any SwMailTransferable::getTransferData( const datatransfer::DataFlavor& /* } uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFlavors( ) - throw (uno::RuntimeException, std::exception) { uno::Sequence< datatransfer::DataFlavor > aRet(1); aRet[0].MimeType = m_aMimeType; @@ -732,24 +725,20 @@ uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFla sal_Bool SwMailTransferable::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) - throw (uno::RuntimeException, std::exception) { return (aFlavor.MimeType == m_aMimeType); } -uno::Reference< beans::XPropertySetInfo > SwMailTransferable::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > SwMailTransferable::getPropertySetInfo( ) { return uno::Reference< beans::XPropertySetInfo >(); } void SwMailTransferable::setPropertyValue( const OUString& , const uno::Any& ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { } uno::Any SwMailTransferable::getPropertyValue( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRet; if ( rPropertyName == "URL" ) @@ -759,28 +748,24 @@ uno::Any SwMailTransferable::getPropertyValue( const OUString& rPropertyName ) void SwMailTransferable::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SwMailTransferable::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SwMailTransferable::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SwMailTransferable::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } @@ -793,93 +778,88 @@ SwMailMessage::~SwMailMessage() { } -OUString SwMailMessage::getSenderName() throw (uno::RuntimeException, std::exception) +OUString SwMailMessage::getSenderName() { return m_sSenderName; } -OUString SwMailMessage::getSenderAddress() throw (uno::RuntimeException, std::exception) +OUString SwMailMessage::getSenderAddress() { return m_sSenderAddress; } -OUString SwMailMessage::getReplyToAddress() throw (uno::RuntimeException, std::exception) +OUString SwMailMessage::getReplyToAddress() { return m_sReplyToAddress; } -void SwMailMessage::setReplyToAddress( const OUString& _replytoaddress ) throw (uno::RuntimeException, std::exception) +void SwMailMessage::setReplyToAddress( const OUString& _replytoaddress ) { m_sReplyToAddress = _replytoaddress; } -OUString SwMailMessage::getSubject() throw (uno::RuntimeException, std::exception) +OUString SwMailMessage::getSubject() { return m_sSubject; } -void SwMailMessage::setSubject( const OUString& _subject ) throw (uno::RuntimeException, std::exception) +void SwMailMessage::setSubject( const OUString& _subject ) { m_sSubject = _subject; } -uno::Reference< datatransfer::XTransferable > SwMailMessage::getBody() throw (uno::RuntimeException, std::exception) +uno::Reference< datatransfer::XTransferable > SwMailMessage::getBody() { return m_xBody; } void SwMailMessage::setBody( const uno::Reference< datatransfer::XTransferable >& rBody ) - throw (uno::RuntimeException, std::exception) { m_xBody = rBody; } void SwMailMessage::addRecipient( const OUString& rRecipientAddress ) - throw (uno::RuntimeException, std::exception) { m_aRecipients.realloc(m_aRecipients.getLength() + 1); m_aRecipients[m_aRecipients.getLength() - 1] = rRecipientAddress; } void SwMailMessage::addCcRecipient( const OUString& rRecipientAddress ) - throw (uno::RuntimeException, std::exception) { m_aCcRecipients.realloc(m_aCcRecipients.getLength() + 1); m_aCcRecipients[m_aCcRecipients.getLength() - 1] = rRecipientAddress; } -void SwMailMessage::addBccRecipient( const OUString& rRecipientAddress ) throw (uno::RuntimeException, std::exception) +void SwMailMessage::addBccRecipient( const OUString& rRecipientAddress ) { m_aBccRecipients.realloc(m_aBccRecipients.getLength() + 1); m_aBccRecipients[m_aBccRecipients.getLength() - 1] = rRecipientAddress; } -uno::Sequence< OUString > SwMailMessage::getRecipients( ) throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SwMailMessage::getRecipients( ) { return m_aRecipients; } -uno::Sequence< OUString > SwMailMessage::getCcRecipients( ) throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SwMailMessage::getCcRecipients( ) { return m_aCcRecipients; } -uno::Sequence< OUString > SwMailMessage::getBccRecipients( ) throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SwMailMessage::getBccRecipients( ) { return m_aBccRecipients; } void SwMailMessage::addAttachment( const mail::MailAttachment& rMailAttachment ) - throw (uno::RuntimeException, std::exception) { m_aAttachments.realloc(m_aAttachments.getLength() + 1); m_aAttachments[m_aAttachments.getLength() - 1] = rMailAttachment; } uno::Sequence< mail::MailAttachment > SwMailMessage::getAttachments( ) - throw (uno::RuntimeException, std::exception) { return m_aAttachments; } diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 52317b1cdca6..97df0257a200 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -51,7 +51,7 @@ public: } // XInterface - virtual uno::Any SAL_CALL queryInterface(const uno::Type& aType) throw (uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL queryInterface(const uno::Type& aType) override { uno::Any a(ToolboxController::queryInterface(aType)); if (a.hasValue()) @@ -71,30 +71,30 @@ public: } // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("lo.writer.MMCurrentEntryController"); } - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override { return cppu::supportsService(this, rServiceName); } - virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { uno::Sequence<OUString> aServices { "com.sun.star.frame.ToolbarController" }; return aServices; } // XComponent - virtual void SAL_CALL dispose() throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; // XToolbarController - virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) override; + virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) override; // XStatusListener - virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) override; }; /// Controller for .uno:MailMergeExcludeEntry toolbar checkbox: creates the checkbox & handles the value. @@ -112,7 +112,7 @@ public: } // XInterface - virtual uno::Any SAL_CALL queryInterface(const uno::Type& aType) throw (uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL queryInterface(const uno::Type& aType) override { uno::Any a(ToolboxController::queryInterface(aType)); if (a.hasValue()) @@ -132,33 +132,33 @@ public: } // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("lo.writer.MMExcludeEntryController"); } - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override { return cppu::supportsService(this, rServiceName); } - virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { uno::Sequence<OUString> aServices { "com.sun.star.frame.ToolbarController" }; return aServices; } // XComponent - virtual void SAL_CALL dispose() throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; // XToolbarController - virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) override; + virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) override; // XStatusListener - virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) override; }; -void MMCurrentEntryController::dispose() throw (uno::RuntimeException, std::exception) +void MMCurrentEntryController::dispose() { SolarMutexGuard aSolarMutexGuard; @@ -166,7 +166,7 @@ void MMCurrentEntryController::dispose() throw (uno::RuntimeException, std::exce m_pCurrentEdit.disposeAndClear(); } -uno::Reference<awt::XWindow> MMCurrentEntryController::createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) +uno::Reference<awt::XWindow> MMCurrentEntryController::createItemWindow(const uno::Reference<awt::XWindow>& rParent) { VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow(rParent); ToolBox* pToolbar = dynamic_cast<ToolBox*>(pParent.get()); @@ -203,7 +203,7 @@ IMPL_LINK(MMCurrentEntryController, CurrentEditUpdatedHdl, Edit&, rEdit, void) } }; -void MMCurrentEntryController::statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception) +void MMCurrentEntryController::statusChanged(const frame::FeatureStateEvent& rEvent) { if (!m_pCurrentEdit) return; @@ -229,7 +229,7 @@ void MMCurrentEntryController::statusChanged(const frame::FeatureStateEvent& rEv } } -void MMExcludeEntryController::dispose() throw (uno::RuntimeException, std::exception) +void MMExcludeEntryController::dispose() { SolarMutexGuard aSolarMutexGuard; @@ -237,7 +237,7 @@ void MMExcludeEntryController::dispose() throw (uno::RuntimeException, std::exce m_pExcludeCheckbox.disposeAndClear(); } -uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) +uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const uno::Reference<awt::XWindow>& rParent) { VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow(rParent); ToolBox* pToolbar = dynamic_cast<ToolBox*>(pParent.get()); @@ -265,7 +265,7 @@ IMPL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, CheckBox&, rCheckbox, voi xConfigItem->ExcludeRecord(xConfigItem->GetResultSetPosition(), rCheckbox.IsChecked()); }; -void MMExcludeEntryController::statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception) +void MMExcludeEntryController::statusChanged(const frame::FeatureStateEvent& rEvent) { if (!m_pExcludeCheckbox) return; diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index e005507a50a3..054f5f4ff8b3 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -1639,28 +1639,26 @@ public: { } - virtual void SAL_CALL selectionChanged(const EventObject& /*rEvent*/) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL selectionChanged(const EventObject& /*rEvent*/) override { } - virtual void SAL_CALL disposing(const EventObject&) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const EventObject&) override { m_rParent.stopDBChangeListening(); } - virtual void SAL_CALL dispatch(const css::util::URL& rURL, const css::uno::Sequence< css::beans::PropertyValue >& /*rArgs*/) - throw (css::uno::RuntimeException, - std::exception) override + virtual void SAL_CALL dispatch(const css::util::URL& rURL, const css::uno::Sequence< css::beans::PropertyValue >& /*rArgs*/) override { if (rURL.Complete.equalsAscii(SwXDispatch::GetDBChangeURL())) m_rParent.updateCurrentDBDataFromDocument(); } - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL&) throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL&) override { } - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL&) throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL&) override { } }; diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 8636db60d9ce..f7bc082018d2 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -3605,7 +3605,7 @@ const Sequence< sal_Int8 >& SwTransferable::getUnoTunnelId() return theSwTransferableUnoTunnelId::get().getSeq(); } -sal_Int64 SwTransferable::getSomething( const Sequence< sal_Int8 >& rId ) throw( RuntimeException, std::exception ) +sal_Int64 SwTransferable::getSomething( const Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; if( ( rId.getLength() == 16 ) && diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index 5fe11aacab67..16589d5f1f99 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -131,20 +131,16 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent virtual ~SidebarTextControlAccessibleContext() override; virtual sal_Int32 SAL_CALL - getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + getAccessibleChild( sal_Int32 i ) override; virtual void SAL_CALL addAccessibleEventListener ( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) override; virtual void SAL_CALL removeAccessibleEventListener ( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) override; protected: virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; @@ -180,7 +176,6 @@ void SidebarTextControlAccessibleContext::defunc() } sal_Int32 SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( maMutex ); @@ -195,7 +190,6 @@ sal_Int32 SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChildCount( } css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChild( sal_Int32 i ) - throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( maMutex ); @@ -211,7 +205,6 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTextContr void SAL_CALL SidebarTextControlAccessibleContext::addAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( maMutex ); @@ -223,7 +216,6 @@ void SAL_CALL SidebarTextControlAccessibleContext::addAccessibleEventListener ( void SAL_CALL SidebarTextControlAccessibleContext::removeAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( maMutex ); diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx index db28a18023da..1edda6d00bb2 100644 --- a/sw/source/uibase/docvw/SidebarWinAcc.cxx +++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx @@ -51,7 +51,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent } virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() throw (css::uno::RuntimeException, std::exception) override + getAccessibleParent() override { osl::MutexGuard aGuard(maMutex); @@ -66,7 +66,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent return xAccParent; } - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 0033a5a357e7..44dce31a8ddf 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -217,16 +217,14 @@ public: private: virtual ~ChangesListener() override {} - virtual void SAL_CALL disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(css::lang::EventObject const &) override { osl::MutexGuard g(editor_.mutex_); editor_.m_xNotifier.clear(); } virtual void SAL_CALL propertiesChange( - css::uno::Sequence< css::beans::PropertyChangeEvent > const &) - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence< css::beans::PropertyChangeEvent > const &) override { SolarMutexGuard g; editor_.SetFont(); diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx index 21ebc03e611a..4c32cc0b588b 100644 --- a/sw/source/uibase/inc/SwXFilterOptions.hxx +++ b/sw/source/uibase/inc/SwXFilterOptions.hxx @@ -50,39 +50,26 @@ public: // XPropertyAccess virtual css::uno::Sequence< css::beans::PropertyValue > - SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertyValues() override; virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< - css::beans::PropertyValue >& aProps ) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::PropertyValue >& aProps ) override; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) override; + virtual sal_Int16 SAL_CALL execute() override; // XImporter virtual void SAL_CALL setTargetDocument( const css::uno::Reference< - css::lang::XComponent >& xDoc ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + css::lang::XComponent >& xDoc ) override; // XExporter virtual void SAL_CALL setSourceDocument( const css::uno::Reference< - css::lang::XComponent >& xDoc ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + css::lang::XComponent >& xDoc ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index 223171de1f0d..263e77fac52f 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -154,8 +154,8 @@ public: {} virtual ~SwAuthenticator() override; - virtual OUString SAL_CALL getUserName() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getPassword() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getUserName() override; + virtual OUString SAL_CALL getPassword() override; }; @@ -169,8 +169,7 @@ public: SwConnectionContext(const OUString& rMailServer, sal_Int16 nPort, const OUString& rConnectionType); virtual ~SwConnectionContext() override; - virtual css::uno::Any SAL_CALL getValueByName(const OUString& Name) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValueByName(const OUString& Name) override; }; class SwMutexBase @@ -191,14 +190,11 @@ public: {} virtual ~SwConnectionListener() override; - virtual void SAL_CALL connected(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL connected(const css::lang::EventObject& aEvent) override; - virtual void SAL_CALL disconnected(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disconnected(const css::lang::EventObject& aEvent) override; - virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override; }; class SW_DLLPUBLIC SwMailTransferable : @@ -215,42 +211,24 @@ class SW_DLLPUBLIC SwMailTransferable : SwMailTransferable(const OUString& rURL, const OUString& rName, const OUString& rMimeType); SwMailTransferable(const OUString& rBody, const OUString& rMimeType); virtual ~SwMailTransferable() override; - virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& aFlavor) - throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& aFlavor) override; - virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& aFlavor) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() override; + virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& aFlavor) override; //XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) override; + + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override; virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, - const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + 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) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + 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) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + 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) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override; }; @@ -276,37 +254,25 @@ public: virtual ~SwMailMessage() override; // attributes - virtual OUString SAL_CALL getSenderName() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSenderAddress() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getReplyToAddress() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSubject() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSubject(const OUString& _subject) - throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getBody() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBody(const css::uno::Reference<css::datatransfer::XTransferable>& _body) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSenderName() override; + virtual OUString SAL_CALL getSenderAddress() override; + virtual OUString SAL_CALL getReplyToAddress() override; + virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) override; + virtual OUString SAL_CALL getSubject() override; + virtual void SAL_CALL setSubject(const OUString& _subject) override; + + virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getBody() override; + virtual void SAL_CALL setBody(const css::uno::Reference<css::datatransfer::XTransferable>& _body) override; // methods - virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getRecipients() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getCcRecipients() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getBccRecipients() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addAttachment(const css::mail::MailAttachment& aMailAttachment) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<css::mail::MailAttachment> SAL_CALL getAttachments() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) override; + virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) override; + virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) override; + virtual css::uno::Sequence<OUString> SAL_CALL getRecipients() override; + virtual css::uno::Sequence<OUString> SAL_CALL getCcRecipients() override; + virtual css::uno::Sequence<OUString> SAL_CALL getBccRecipients() override; + virtual void SAL_CALL addAttachment(const css::mail::MailAttachment& aMailAttachment) override; + virtual css::uno::Sequence<css::mail::MailAttachment> SAL_CALL getAttachments() override; void SetSenderName(const OUString& rSenderName) { m_sSenderName = rSenderName; diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index 64a90c5dfd5e..2cc079f7048d 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -207,7 +207,7 @@ public: void Invalidate() {m_pWrtShell = nullptr;} static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; }; #endif diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index 903af9a20f29..88330c0362aa 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -56,7 +56,7 @@ public: // XEventListener virtual void SAL_CALL disposing( - const css::lang::EventObject& rEventObject ) throw(css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEventObject ) override; void ViewDestroyed() { pView = nullptr; } }; @@ -68,13 +68,10 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper< SwView* pView; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) override; // XClipboardListener - virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& rEventObject ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& rEventObject ) override; public: SwClipboardChangeListener( SwView& rView ) : pView( &rView ) {} diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx index 00d6bb0de895..8011c612885f 100644 --- a/sw/source/uibase/inc/unoatxt.hxx +++ b/sw/source/uibase/inc/unoatxt.hxx @@ -49,11 +49,6 @@ class SwXBodyText; typedef tools::SvRef<SwDocShell> SwDocShellRef; #endif -/// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > - SAL_CALL SwXAutoTextContainer_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & ) throw ( css::uno::Exception ); - class SwXAutoTextContainer : public cppu::WeakImplHelper < css::text::XAutoTextContainer2, @@ -69,26 +64,26 @@ public: SwXAutoTextContainer(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XAutoTextContainer - virtual css::uno::Reference< css::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) override; + virtual void SAL_CALL removeByName(const OUString& aGroupName) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -116,44 +111,44 @@ public: static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XAutoTextGroup - virtual css::uno::Sequence< OUString > SAL_CALL getTitles() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const css::uno::Reference< css::text::XTextRange > & xTextRange) throw( css::container::ElementExistException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getTitles() override; + virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) override; + virtual css::uno::Reference< css::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const css::uno::Reference< css::text::XTextRange > & xTextRange) override; + virtual void SAL_CALL removeByName(const OUString& aEntryName) override; //XNamed - virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& Name_) override; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XNameAccess - virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override; //XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; void Invalidate(); }; @@ -212,33 +207,33 @@ public: static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; //XText - virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL insertString(const css::uno::Reference< css::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL insertControlCharacter(const css::uno::Reference< css::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL insertTextContent(const css::uno::Reference< css::text::XTextRange > & xRange, const css::uno::Reference< css::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeTextContent(const css::uno::Reference< css::text::XTextContent > & xContent) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) override; + virtual void SAL_CALL insertString(const css::uno::Reference< css::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) override; + virtual void SAL_CALL insertControlCharacter(const css::uno::Reference< css::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) override; + virtual void SAL_CALL insertTextContent(const css::uno::Reference< css::text::XTextRange > & xRange, const css::uno::Reference< css::text::XTextContent > & xContent, sal_Bool bAbsorb) override; + virtual void SAL_CALL removeTextContent(const css::uno::Reference< css::text::XTextContent > & xContent) override; //XTextRange - virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() throw( css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getString() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setString(const OUString& aString) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString(const OUString& aString) override; //XAutoTextEntry - virtual void SAL_CALL applyTo(const css::uno::Reference< css::text::XTextRange > & xRange)throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL applyTo(const css::uno::Reference< css::text::XTextRange > & xRange) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XEventsSupplier - virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; void Invalidate() {pGlossaries = nullptr;} const SwGlossaries* GetGlossaries() { return pGlossaries; } @@ -261,27 +256,19 @@ public: virtual ~SwAutoTextEventDescriptor() override; - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; protected: virtual void replaceByName( const sal_uInt16 nEvent, /// item ID of event const SvxMacro& rMacro) /// event (will be copied) - throw( - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; + override; virtual void getByName( SvxMacro& rMacro, /// macro to be filled const sal_uInt16 nEvent ) /// item ID of event - throw( - css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; + override; }; #endif diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx index 4f4e7cf43ac4..c603f499fd4c 100644 --- a/sw/source/uibase/inc/unodispatch.hxx +++ b/sw/source/uibase/inc/unodispatch.hxx @@ -68,24 +68,24 @@ public: virtual ~SwXDispatchProviderInterceptor() override; //XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) override; //XDispatchProviderInterceptor - virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewDispatchProvider ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSupplier ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) override; + virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewDispatchProvider ) override; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) override; + virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSupplier ) 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; //XUnoTunnel static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; // XInterceptorInfo - virtual css::uno::Sequence<OUString> SAL_CALL getInterceptedURLs() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getInterceptedURLs() override; // view destroyed void Invalidate(); @@ -111,17 +111,15 @@ public: SwXDispatch(SwView& rView); virtual ~SwXDispatch() override; - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) override; //XSelectionChangeListener - virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override; //XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; static const sal_Char* GetDBChangeURL(); }; diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx index 8cdd7d1a50e9..243d226105b3 100644 --- a/sw/source/uibase/inc/unomailmerge.hxx +++ b/sw/source/uibase/inc/unomailmerge.hxx @@ -137,37 +137,33 @@ public: void LaunchMailMergeEvent( const css::text::MailMergeEvent &rData ) const; // XJob - virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments ) - throw (css::lang::IllegalArgumentException, - css::uno::Exception, - css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments ) override; // XCancellable - virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XMailMergeBroadcaster - virtual void SAL_CALL addMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) override; + virtual void SAL_CALL removeMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) 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; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; #endif diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx index e140078fc188..ad83a01700c2 100644 --- a/sw/source/uibase/inc/unomod.hxx +++ b/sw/source/uibase/inc/unomod.hxx @@ -53,20 +53,15 @@ public: SwXModule(); //XViewSettings - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getViewSettings() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getViewSettings() override; //XPrintSettings - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getPrintSettings() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getPrintSettings() override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; enum SwXPrintSettingsType @@ -84,32 +79,14 @@ protected: SwPrintData * mpPrtOpt; SwDoc *mpDoc; - virtual void _preSetValues () - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; - virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override; - virtual void _postSetValues () - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; - - virtual void _preGetValues () - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; - - virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override; - virtual void _postGetValues () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override; + virtual void _preSetValues () override; + virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) override; + virtual void _postSetValues () override; + + virtual void _preGetValues () override; + + virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) override; + virtual void _postGetValues () override; virtual ~SwXPrintSettings() throw() override; @@ -117,12 +94,9 @@ public: SwXPrintSettings( SwXPrintSettingsType eType, SwDoc * pDoc = nullptr ); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class SwXViewSettings : public comphelper::ChainableHelperNoState @@ -140,38 +114,13 @@ protected: FieldUnit eVRulerUnit; bool mbApplyVRulerMetric; - virtual void _preSetValues () - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; - virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual void _postSetValues() - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; - - virtual void _preGetValues () - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; - virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; - virtual void _postGetValues () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override; + virtual void _preSetValues () override; + virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) override; + virtual void _postSetValues() override; + + virtual void _preGetValues () override; + virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) override; + virtual void _postGetValues () override; virtual ~SwXViewSettings() throw() override; @@ -179,9 +128,9 @@ public: SwXViewSettings(SwView* pView); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; bool IsValid() const {return bObjectValid;} void Invalidate() {bObjectValid = false;} diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx index 6c57dc52f445..fe2d2676cc6d 100644 --- a/sw/source/uibase/inc/unotxvw.hxx +++ b/sw/source/uibase/inc/unotxvw.hxx @@ -76,74 +76,59 @@ protected: public: SwXTextView(SwView* pSwView); - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw() override; virtual void SAL_CALL release( ) throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; //XSelectionSupplier - virtual css::uno::Any SAL_CALL getSelection() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL select(const css::uno::Any& rInterface) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getSelection() override; + virtual sal_Bool SAL_CALL select(const css::uno::Any& rInterface) override; + virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) override; + virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) override; // XFormLayerAccess - virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFormDesignMode( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) override; + virtual sal_Bool SAL_CALL isFormDesignMode( ) override; + virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) override; // XControlAccess - virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl(const css::uno::Reference< css::awt::XControlModel > & Model) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl(const css::uno::Reference< css::awt::XControlModel > & Model) override; //XTextViewCursorSupplier - virtual css::uno::Reference< css::text::XTextViewCursor > SAL_CALL getViewCursor() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextViewCursor > SAL_CALL getViewCursor() override; //XViewSettings - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getViewSettings() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getViewSettings() override; //XRubySelection virtual css::uno::Sequence< - css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic ) - throw (css::uno::RuntimeException, - std::exception) override; + css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic ) override; virtual void SAL_CALL setRubyList( const css::uno::Sequence< - css::uno::Sequence< css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic ) - throw (css::uno::RuntimeException, - std::exception) override; + css::uno::Sequence< css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //XTransferableSupplier - virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getTransferable( ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw (css::datatransfer::UnsupportedFlavorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getTransferable( ) override; + virtual void SAL_CALL insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) override; void NotifySelChanged(); void NotifyDBChanged(); @@ -181,146 +166,75 @@ public: DECLARE_XINTERFACE() //XTextViewCursor - virtual sal_Bool SAL_CALL isVisible() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::awt::Point SAL_CALL getPosition() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isVisible() override; + virtual void SAL_CALL setVisible(sal_Bool bVisible) override; + virtual css::awt::Point SAL_CALL getPosition() override; //XTextCursor - neu - virtual void SAL_CALL collapseToStart() - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL collapseToEnd() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL isCollapsed() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL gotoStart( sal_Bool bExpand ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL gotoRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Bool bExpand ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL collapseToStart() override; + virtual void SAL_CALL collapseToEnd() override; + virtual sal_Bool SAL_CALL isCollapsed() override; + virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) override; + virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) override; + virtual void SAL_CALL gotoStart( sal_Bool bExpand ) override; + virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) override; + virtual void SAL_CALL gotoRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Bool bExpand ) override; //XPageCursor - virtual sal_Bool SAL_CALL jumpToFirstPage() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL jumpToLastPage() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL jumpToNextPage() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int16 SAL_CALL getPage() - throw (css::uno::RuntimeException, - std::exception) override; + virtual sal_Bool SAL_CALL jumpToFirstPage() override; + virtual sal_Bool SAL_CALL jumpToLastPage() override; + virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) override; + virtual sal_Bool SAL_CALL jumpToNextPage() override; + virtual sal_Bool SAL_CALL jumpToPreviousPage() override; + virtual sal_Bool SAL_CALL jumpToEndOfPage() override; + virtual sal_Bool SAL_CALL jumpToStartOfPage() override; + virtual sal_Int16 SAL_CALL getPage() override; //XTextRange - virtual css::uno::Reference< css::text::XText > SAL_CALL getText() - throw (css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() - throw (css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() - throw (css::uno::RuntimeException, - std::exception) override; - virtual OUString SAL_CALL getString() - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL setString(const OUString& aString) - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString(const OUString& aString) override; //XScreenCursor - virtual sal_Bool SAL_CALL screenDown() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL screenUp() - throw (css::uno::RuntimeException, - std::exception) override; + virtual sal_Bool SAL_CALL screenDown() override; + virtual sal_Bool SAL_CALL screenUp() override; //XViewCursor - virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand) - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand) - throw (css::uno::RuntimeException, - std::exception) override; + virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand) override; + virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand) override; //XLineCursor - virtual sal_Bool SAL_CALL isAtStartOfLine() - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL isAtEndOfLine() - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand) - throw (css::uno::RuntimeException, - std::exception) override; + virtual sal_Bool SAL_CALL isAtStartOfLine() override; + virtual sal_Bool SAL_CALL isAtEndOfLine() override; + virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) override; + virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; void Invalidate(){m_pView = nullptr;} diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index 3a33252d7703..7c5e289b3d5a 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -64,22 +64,15 @@ public: // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( const OUString& rsResourceURL, - const css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw( - css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; - - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override; + + OUString SAL_CALL getImplementationName() override { return OUString("org.apache.openoffice.comp.sw.sidebar.SwPanelFactory"); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; } }; @@ -91,10 +84,6 @@ SwPanelFactory::SwPanelFactory() Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( const OUString& rsResourceURL, const css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw( - container::NoSuchElementException, - lang::IllegalArgumentException, - RuntimeException, std::exception) { Reference<ui::XUIElement> xElement; diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx index 0c2af38b7679..22fd72773409 100644 --- a/sw/source/uibase/uiview/uivwimp.cxx +++ b/sw/source/uibase/uiview/uivwimp.cxx @@ -254,7 +254,7 @@ SwScannerEventListener::~SwScannerEventListener() { } -void SAL_CALL SwScannerEventListener::disposing( const EventObject& rEventObject) throw(uno::RuntimeException, std::exception) +void SAL_CALL SwScannerEventListener::disposing( const EventObject& rEventObject) { #if defined(_WIN32) || defined UNX SolarMutexGuard aGuard; @@ -268,12 +268,10 @@ SwClipboardChangeListener::~SwClipboardChangeListener() } void SAL_CALL SwClipboardChangeListener::disposing( const EventObject& /*rEventObject*/ ) - throw ( RuntimeException, std::exception ) { } void SAL_CALL SwClipboardChangeListener::changedContents( const css::datatransfer::clipboard::ClipboardEvent& rEventObject ) - throw (RuntimeException, std::exception) { const SolarMutexGuard aGuard; diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index e49d11965418..3e529602ff59 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -258,7 +258,6 @@ SwXDocumentSettings::~SwXDocumentSettings() } Any SAL_CALL SwXDocumentSettings::queryInterface( const Type& rType ) - throw(RuntimeException, std::exception) { return ::cppu::queryInterface ( rType, // OWeakObject interfaces @@ -283,7 +282,6 @@ void SwXDocumentSettings::release () } uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -302,13 +300,11 @@ uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes( ) } uno::Sequence< sal_Int8 > SAL_CALL SwXDocumentSettings::getImplementationId( ) - throw (RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } void SwXDocumentSettings::_preSetValues () - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { mpDocSh = mpModel->GetDocShell(); if (nullptr == mpDocSh) @@ -320,7 +316,6 @@ void SwXDocumentSettings::_preSetValues () } void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if (rInfo.mnAttributes & PropertyAttribute::READONLY) throw PropertyVetoException ("Property is read-only: " + rInfo.maName, static_cast < cppu::OWeakObject * > ( nullptr ) ); @@ -868,7 +863,6 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf } void SwXDocumentSettings::_postSetValues () - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { // set printer only once, namely here! if( mpPrinter != nullptr ) @@ -890,7 +884,6 @@ void SwXDocumentSettings::_postSetValues () } void SwXDocumentSettings::_preGetValues () - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { mpDocSh = mpModel->GetDocShell(); if (nullptr == mpDocSh) @@ -901,8 +894,6 @@ void SwXDocumentSettings::_preGetValues () } void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) { switch( rInfo.mnHandle ) { @@ -1282,7 +1273,6 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf } void SwXDocumentSettings::_postGetValues () - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { mpDocSh = nullptr; mpDoc = nullptr; @@ -1290,19 +1280,16 @@ void SwXDocumentSettings::_postGetValues () // XServiceInfo OUString SAL_CALL SwXDocumentSettings::getImplementationName( ) - throw(RuntimeException, std::exception) { return OUString("com.sun.star.comp.Writer.DocumentSettings"); } sal_Bool SAL_CALL SwXDocumentSettings::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL SwXDocumentSettings::getSupportedServiceNames( ) - throw(RuntimeException, std::exception) { Sequence< OUString > aSeq( 3 ); aSeq[0] = "com.sun.star.document.Settings"; diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx index e816b2cb0868..e42ec574ee3d 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.hxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx @@ -47,23 +47,13 @@ protected: * _postSetValues */ VclPtr<SfxPrinter> mpPrinter; - virtual void _preSetValues () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override; - virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual void _postSetValues () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override; + virtual void _preSetValues () override; + virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) override; + virtual void _postSetValues () override; - virtual void _preGetValues () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override; - virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; - virtual void _postGetValues () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override; + virtual void _preGetValues () override; + virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) override; + virtual void _postGetValues () override; protected: virtual ~SwXDocumentSettings() throw() override; @@ -71,24 +61,20 @@ public: SwXDocumentSettings( SwXTextDocument* pModel ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw () override; virtual void SAL_CALL release( ) throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; }; #endif diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index f14ee60c28dc..512163200986 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -50,7 +50,7 @@ SwXFilterOptions::~SwXFilterOptions() { } -uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() throw (uno::RuntimeException, std::exception) +uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() { uno::Sequence<beans::PropertyValue> aRet(1); beans::PropertyValue* pArray = aRet.getArray(); @@ -62,8 +62,6 @@ uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() thro } void SwXFilterOptions::setPropertyValues( const uno::Sequence<beans::PropertyValue >& aProps ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - IllegalArgumentException, WrappedTargetException, uno::RuntimeException, std::exception) { const beans::PropertyValue* pPropArray = aProps.getConstArray(); long nPropCount = aProps.getLength(); @@ -82,11 +80,10 @@ void SwXFilterOptions::setPropertyValues( const uno::Sequence<beans::PropertyV } void SwXFilterOptions::setTitle( const OUString& /*rTitle*/ ) - throw (uno::RuntimeException, std::exception) { } -sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::exception) +sal_Int16 SwXFilterOptions::execute() { sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL; @@ -124,32 +121,28 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::excepti } void SwXFilterOptions::setTargetDocument( const uno::Reference< XComponent >& xDoc ) - throw (IllegalArgumentException, uno::RuntimeException, std::exception) { bExport = false; xModel = xDoc; } void SwXFilterOptions::setSourceDocument( const uno::Reference<XComponent >& xDoc ) - throw (IllegalArgumentException,uno::RuntimeException, std::exception) { bExport = true; xModel = xDoc; } -OUString SwXFilterOptions::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SwXFilterOptions::getImplementationName() { return OUString("com.sun.star.comp.Writer.FilterOptionsDialog"); } sal_Bool SwXFilterOptions::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SwXFilterOptions::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { OUString sService("com.sun.star.ui.dialogs.FilterOptionsDialog"); return uno::Sequence< OUString> (&sService, 1); diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx index a5bfc3fdb000..279a9eedf7f9 100644 --- a/sw/source/uibase/uno/dlelstnr.cxx +++ b/sw/source/uibase/uno/dlelstnr.cxx @@ -72,7 +72,6 @@ SwLinguServiceEventListener::~SwLinguServiceEventListener() void SAL_CALL SwLinguServiceEventListener::processLinguServiceEvent( const LinguServiceEvent& rLngSvcEvent ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -102,7 +101,6 @@ void SAL_CALL SwLinguServiceEventListener::processLinguServiceEvent( void SAL_CALL SwLinguServiceEventListener::disposing( const EventObject& rEventObj ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -114,13 +112,11 @@ void SAL_CALL SwLinguServiceEventListener::disposing( void SAL_CALL SwLinguServiceEventListener::queryTermination( const EventObject& /*rEventObj*/ ) - throw(TerminationVetoException, RuntimeException, std::exception) { } void SAL_CALL SwLinguServiceEventListener::notifyTermination( const EventObject& rEventObj ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 3b19d0f2175d..00c0dc9c0ca6 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -68,7 +68,7 @@ SwXAutoTextContainer::~SwXAutoTextContainer() } -sal_Int32 SwXAutoTextContainer::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXAutoTextContainer::getCount() { OSL_ENSURE(pGlossaries->GetGroupCnt() < static_cast<size_t>(SAL_MAX_INT32), "SwXAutoTextContainer::getCount: too many items"); @@ -76,7 +76,6 @@ sal_Int32 SwXAutoTextContainer::getCount() throw( uno::RuntimeException, std::ex } uno::Any SwXAutoTextContainer::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; const size_t nCount = pGlossaries->GetGroupCnt(); @@ -85,20 +84,19 @@ uno::Any SwXAutoTextContainer::getByIndex(sal_Int32 nIndex) return getByName(pGlossaries->GetGroupName( static_cast<size_t>(nIndex) )); } -uno::Type SwXAutoTextContainer::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SwXAutoTextContainer::getElementType() { return cppu::UnoType<text::XAutoTextGroup>::get(); } -sal_Bool SwXAutoTextContainer::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXAutoTextContainer::hasElements() { // At least standard should always exists! return true; } uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -113,7 +111,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName) return makeAny( xGroup ); } -uno::Sequence< OUString > SwXAutoTextContainer::getElementNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXAutoTextContainer::getElementNames() { SolarMutexGuard aGuard; const size_t nCount = pGlossaries->GetGroupCnt(); @@ -133,7 +131,6 @@ uno::Sequence< OUString > SwXAutoTextContainer::getElementNames() throw( uno::Ru } // Finds group names with or without path index. sal_Bool SwXAutoTextContainer::hasByName(const OUString& Name) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; OUString sGroupName( pGlossaries->GetCompleteGroupName( Name ) ); @@ -144,7 +141,6 @@ sal_Bool SwXAutoTextContainer::hasByName(const OUString& Name) uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName( const OUString& aGroupName) - throw( lang::IllegalArgumentException, container::ElementExistException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(hasByName(aGroupName)) @@ -185,7 +181,6 @@ uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName( } void SwXAutoTextContainer::removeByName(const OUString& aGroupName) - throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; // At first find the name with path extension @@ -195,17 +190,17 @@ void SwXAutoTextContainer::removeByName(const OUString& aGroupName) pGlossaries->DelGroupDoc(sGroupName); } -OUString SwXAutoTextContainer::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXAutoTextContainer::getImplementationName() { return OUString("SwXAutoTextContainer" ); } -sal_Bool SwXAutoTextContainer::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXAutoTextContainer::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXAutoTextContainer::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXAutoTextContainer::getSupportedServiceNames() { OUString sService("com.sun.star.text.AutoTextContainer"); const uno::Sequence< OUString > aSeq( &sService, 1 ); @@ -223,7 +218,6 @@ const uno::Sequence< sal_Int8 > & SwXAutoTextGroup::getUnoTunnelId() } sal_Int64 SAL_CALL SwXAutoTextGroup::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -249,7 +243,7 @@ SwXAutoTextGroup::~SwXAutoTextGroup() { } -uno::Sequence< OUString > SwXAutoTextGroup::getTitles() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXAutoTextGroup::getTitles() { SolarMutexGuard aGuard; std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr); @@ -267,8 +261,6 @@ uno::Sequence< OUString > SwXAutoTextGroup::getTitles() throw( uno::RuntimeExcep void SwXAutoTextGroup::renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) - throw( lang::IllegalArgumentException, container::ElementExistException, io::IOException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // throw exception only if the programmatic name is to be changed into an existing name @@ -338,7 +330,6 @@ static bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTe uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const OUString& aName, const OUString& aTitle, const uno::Reference< text::XTextRange > & xTextRange) - throw( container::ElementExistException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(hasByName(aName)) @@ -435,7 +426,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const return xEntry; } -void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) +void SwXAutoTextGroup::removeByName(const OUString& aEntryName) { SolarMutexGuard aGuard; std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr); @@ -449,13 +440,13 @@ void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container throw container::NoSuchElementException(); } -OUString SwXAutoTextGroup::getName() throw( uno::RuntimeException, std::exception ) +OUString SwXAutoTextGroup::getName() { SolarMutexGuard aGuard; return sName; } -void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeException, std::exception ) +void SwXAutoTextGroup::setName(const OUString& rName) { SolarMutexGuard aGuard; if( !pGlossaries ) @@ -497,7 +488,7 @@ void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeExcepti pGlossaries = pTempGlossaries; } -sal_Int32 SwXAutoTextGroup::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXAutoTextGroup::getCount() { SolarMutexGuard aGuard; std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr); @@ -507,7 +498,6 @@ sal_Int32 SwXAutoTextGroup::getCount() throw( uno::RuntimeException, std::except } uno::Any SwXAutoTextGroup::getByIndex(sal_Int32 nIndex) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr); @@ -519,13 +509,13 @@ uno::Any SwXAutoTextGroup::getByIndex(sal_Int32 nIndex) return getByName(pGlosGroup->GetShortName(static_cast<sal_uInt16>(nIndex))); } -uno::Type SwXAutoTextGroup::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SwXAutoTextGroup::getElementType() { return cppu::UnoType<text::XAutoTextEntry>::get(); } -sal_Bool SwXAutoTextGroup::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXAutoTextGroup::hasElements() { SolarMutexGuard aGuard; std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr); @@ -536,7 +526,6 @@ sal_Bool SwXAutoTextGroup::hasElements() throw( uno::RuntimeException, std::exce } uno::Any SwXAutoTextGroup::getByName(const OUString& _rName) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< text::XAutoTextEntry > xEntry = pGlossaries->GetAutoTextEntry( m_sGroupName, sName, _rName ); @@ -546,7 +535,6 @@ uno::Any SwXAutoTextGroup::getByName(const OUString& _rName) } uno::Sequence< OUString > SwXAutoTextGroup::getElementNames() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr); @@ -563,7 +551,6 @@ uno::Sequence< OUString > SwXAutoTextGroup::getElementNames() } sal_Bool SwXAutoTextGroup::hasByName(const OUString& rName) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; bool bRet = false; @@ -585,7 +572,6 @@ sal_Bool SwXAutoTextGroup::hasByName(const OUString& rName) } uno::Reference< beans::XPropertySetInfo > SwXAutoTextGroup::getPropertySetInfo() - throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > xRet = pPropSet->getPropertySetInfo(); return xRet; @@ -593,8 +579,6 @@ uno::Reference< beans::XPropertySetInfo > SwXAutoTextGroup::getPropertySetInfo( void SwXAutoTextGroup::setPropertyValue( const OUString& rPropertyName, const uno::Any& aValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName ); @@ -623,7 +607,6 @@ void SwXAutoTextGroup::setPropertyValue( } uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName); @@ -649,25 +632,21 @@ uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName) void SwXAutoTextGroup::addPropertyChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { } void SwXAutoTextGroup::removePropertyChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { } void SwXAutoTextGroup::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { } void SwXAutoTextGroup::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { } @@ -678,17 +657,17 @@ void SwXAutoTextGroup::Invalidate() m_sGroupName.clear(); } -OUString SwXAutoTextGroup::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXAutoTextGroup::getImplementationName() { return OUString("SwXAutoTextGroup"); } -sal_Bool SwXAutoTextGroup::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXAutoTextGroup::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXAutoTextGroup::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXAutoTextGroup::getSupportedServiceNames() { uno::Sequence<OUString> aRet { "com.sun.star.text.AutoTextGroup" }; return aRet; @@ -705,7 +684,6 @@ const uno::Sequence< sal_Int8 > & SwXAutoTextEntry::getUnoTunnelId() } sal_Int64 SAL_CALL SwXAutoTextEntry::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -799,7 +777,7 @@ void SwXAutoTextEntry::disposing() implFlushDocument(true); } -uno::Reference< text::XTextCursor > SwXAutoTextEntry::createTextCursor() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextCursor > SwXAutoTextEntry::createTextCursor() { SolarMutexGuard aGuard; EnsureBodyText(); @@ -807,14 +785,14 @@ uno::Reference< text::XTextCursor > SwXAutoTextEntry::createTextCursor() throw( } uno::Reference< text::XTextCursor > SwXAutoTextEntry::createTextCursorByRange( - const uno::Reference< text::XTextRange > & aTextPosition) throw( uno::RuntimeException, std::exception ) + const uno::Reference< text::XTextRange > & aTextPosition) { SolarMutexGuard aGuard; EnsureBodyText(); return mxBodyText->createTextCursorByRange ( aTextPosition ); } -void SwXAutoTextEntry::insertString(const uno::Reference< text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( uno::RuntimeException, std::exception ) +void SwXAutoTextEntry::insertString(const uno::Reference< text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) { SolarMutexGuard aGuard; EnsureBodyText(); @@ -823,7 +801,6 @@ void SwXAutoTextEntry::insertString(const uno::Reference< text::XTextRange > & x void SwXAutoTextEntry::insertControlCharacter(const uno::Reference< text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; EnsureBodyText(); @@ -833,7 +810,6 @@ void SwXAutoTextEntry::insertControlCharacter(const uno::Reference< text::XTextR void SwXAutoTextEntry::insertTextContent( const uno::Reference< text::XTextRange > & xRange, const uno::Reference< text::XTextContent > & xContent, sal_Bool bAbsorb) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; EnsureBodyText(); @@ -842,49 +818,48 @@ void SwXAutoTextEntry::insertTextContent( void SwXAutoTextEntry::removeTextContent( const uno::Reference< text::XTextContent > & xContent) - throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; EnsureBodyText(); mxBodyText->removeTextContent ( xContent ); } -uno::Reference< text::XText > SwXAutoTextEntry::getText() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XText > SwXAutoTextEntry::getText() { SolarMutexGuard aGuard; uno::Reference< text::XText > xRet = static_cast<text::XText*>(this); return xRet; } -uno::Reference< text::XTextRange > SwXAutoTextEntry::getStart() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXAutoTextEntry::getStart() { SolarMutexGuard aGuard; EnsureBodyText(); return mxBodyText->getStart(); } -uno::Reference< text::XTextRange > SwXAutoTextEntry::getEnd() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXAutoTextEntry::getEnd() { SolarMutexGuard aGuard; EnsureBodyText(); return mxBodyText->getEnd(); } -OUString SwXAutoTextEntry::getString() throw( uno::RuntimeException, std::exception ) +OUString SwXAutoTextEntry::getString() { SolarMutexGuard aGuard; EnsureBodyText(); return mxBodyText->getString(); } -void SwXAutoTextEntry::setString(const OUString& aString) throw( uno::RuntimeException, std::exception ) +void SwXAutoTextEntry::setString(const OUString& aString) { SolarMutexGuard aGuard; EnsureBodyText(); mxBodyText->setString( aString ); } -void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextRange)throw( uno::RuntimeException, std::exception ) +void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextRange) { SolarMutexGuard aGuard; @@ -956,24 +931,23 @@ void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextR throw uno::RuntimeException(); } -OUString SwXAutoTextEntry::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SwXAutoTextEntry::getImplementationName() { return OUString("SwXAutoTextEntry"); } -sal_Bool SwXAutoTextEntry::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXAutoTextEntry::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXAutoTextEntry::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXAutoTextEntry::getSupportedServiceNames() { uno::Sequence<OUString> aRet { "com.sun.star.text.AutoTextEntry" }; return aRet; } uno::Reference< container::XNameReplace > SwXAutoTextEntry::getEvents() - throw( uno::RuntimeException, std::exception ) { return new SwAutoTextEventDescriptor( *this ); } @@ -999,7 +973,6 @@ SwAutoTextEventDescriptor::~SwAutoTextEventDescriptor() } OUString SwAutoTextEventDescriptor::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return sSwAutoTextEventDescriptor; } @@ -1007,11 +980,6 @@ OUString SwAutoTextEventDescriptor::getImplementationName() void SwAutoTextEventDescriptor::replaceByName( const sal_uInt16 nEvent, const SvxMacro& rMacro) - throw( - lang::IllegalArgumentException, - container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException) { OSL_ENSURE( nullptr != rAutoTextEntry.GetGlossaries(), "Strangely enough, the AutoText vanished!" ); @@ -1045,10 +1013,6 @@ void SwAutoTextEventDescriptor::replaceByName( void SwAutoTextEventDescriptor::getByName( SvxMacro& rMacro, const sal_uInt16 nEvent ) - throw( - container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException) { OSL_ENSURE( nullptr != rAutoTextEntry.GetGlossaries(), "no AutoText" ); OSL_ENSURE( (nEvent == SW_EVENT_END_INS_GLOSSARY) || diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx index 7da8b90a90d5..8fc82355fed5 100644 --- a/sw/source/uibase/uno/unodispatch.cxx +++ b/sw/source/uibase/uno/unodispatch.cxx @@ -63,7 +63,6 @@ SwXDispatchProviderInterceptor::~SwXDispatchProviderInterceptor() uno::Reference< frame::XDispatch > SwXDispatchProviderInterceptor::queryDispatch( const util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(uno::RuntimeException, std::exception) { DispatchMutexLock_Impl aLock(*this); uno::Reference< frame::XDispatch> xResult; @@ -88,7 +87,7 @@ uno::Reference< frame::XDispatch > SwXDispatchProviderInterceptor::queryDispatch return xResult; } -uno::Sequence<OUString> SAL_CALL SwXDispatchProviderInterceptor::getInterceptedURLs() throw (uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL SwXDispatchProviderInterceptor::getInterceptedURLs() { uno::Sequence<OUString> aRet = { @@ -99,7 +98,7 @@ uno::Sequence<OUString> SAL_CALL SwXDispatchProviderInterceptor::getInterceptedU } uno::Sequence< uno::Reference< frame::XDispatch > > SwXDispatchProviderInterceptor::queryDispatches( - const uno::Sequence< frame::DispatchDescriptor >& aDescripts ) throw(uno::RuntimeException, std::exception) + const uno::Sequence< frame::DispatchDescriptor >& aDescripts ) { DispatchMutexLock_Impl aLock(*this); uno::Sequence< uno::Reference< frame::XDispatch> > aReturn(aDescripts.getLength()); @@ -114,35 +113,32 @@ uno::Sequence< uno::Reference< frame::XDispatch > > SwXDispatchProviderIntercept } uno::Reference< frame::XDispatchProvider > SwXDispatchProviderInterceptor::getSlaveDispatchProvider( ) - throw(uno::RuntimeException, std::exception) { DispatchMutexLock_Impl aLock(*this); return m_xSlaveDispatcher; } void SwXDispatchProviderInterceptor::setSlaveDispatchProvider( - const uno::Reference< frame::XDispatchProvider >& xNewDispatchProvider ) throw(uno::RuntimeException, std::exception) + const uno::Reference< frame::XDispatchProvider >& xNewDispatchProvider ) { DispatchMutexLock_Impl aLock(*this); m_xSlaveDispatcher = xNewDispatchProvider; } uno::Reference< frame::XDispatchProvider > SwXDispatchProviderInterceptor::getMasterDispatchProvider( ) - throw(uno::RuntimeException, std::exception) { DispatchMutexLock_Impl aLock(*this); return m_xMasterDispatcher; } void SwXDispatchProviderInterceptor::setMasterDispatchProvider( - const uno::Reference< frame::XDispatchProvider >& xNewSupplier ) throw(uno::RuntimeException, std::exception) + const uno::Reference< frame::XDispatchProvider >& xNewSupplier ) { DispatchMutexLock_Impl aLock(*this); m_xMasterDispatcher = xNewSupplier; } void SwXDispatchProviderInterceptor::disposing( const lang::EventObject& ) - throw(uno::RuntimeException, std::exception) { DispatchMutexLock_Impl aLock(*this); if (m_xIntercepted.is()) @@ -168,7 +164,6 @@ const uno::Sequence< sal_Int8 > & SwXDispatchProviderInterceptor::getUnoTunnelId sal_Int64 SwXDispatchProviderInterceptor::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) - throw(uno::RuntimeException, std::exception) { if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -213,7 +208,6 @@ SwXDispatch::~SwXDispatch() void SwXDispatch::dispatch(const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs) - throw (uno::RuntimeException, std::exception) { if(!m_pView) throw uno::RuntimeException(); @@ -280,7 +274,7 @@ void SwXDispatch::dispatch(const util::URL& aURL, } void SwXDispatch::addStatusListener( - const uno::Reference< frame::XStatusListener >& xControl, const util::URL& aURL ) throw(uno::RuntimeException, std::exception) + const uno::Reference< frame::XStatusListener >& xControl, const util::URL& aURL ) { if(!m_pView) throw uno::RuntimeException(); @@ -328,7 +322,7 @@ void SwXDispatch::addStatusListener( } void SwXDispatch::removeStatusListener( - const uno::Reference< frame::XStatusListener >& xControl, const util::URL& ) throw(uno::RuntimeException, std::exception) + const uno::Reference< frame::XStatusListener >& xControl, const util::URL& ) { StatusListenerList::iterator aListIter = m_aListenerList.begin(); for(aListIter = m_aListenerList.begin(); aListIter != m_aListenerList.end(); ++aListIter) @@ -349,7 +343,7 @@ void SwXDispatch::removeStatusListener( } } -void SwXDispatch::selectionChanged( const lang::EventObject& ) throw(uno::RuntimeException, std::exception) +void SwXDispatch::selectionChanged( const lang::EventObject& ) { ShellModes eMode = m_pView->GetShellMode(); bool bEnable = SHELL_MODE_TEXT == eMode || @@ -375,7 +369,7 @@ void SwXDispatch::selectionChanged( const lang::EventObject& ) throw(uno::Runti } } -void SwXDispatch::disposing( const lang::EventObject& rSource ) throw(uno::RuntimeException, std::exception) +void SwXDispatch::disposing( const lang::EventObject& rSource ) { uno::Reference<view::XSelectionSupplier> xSupplier(rSource.Source, uno::UNO_QUERY); uno::Reference<view::XSelectionChangeListener> xThis = this; diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx index 929ebcc94944..0beff83088fd 100644 --- a/sw/source/uibase/uno/unodoc.cxx +++ b/sw/source/uibase/uno/unodoc.cxx @@ -46,7 +46,6 @@ OUString SAL_CALL SwTextDocument_getImplementationName() throw() uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory >&, SfxModelFlags _nCreationFlags ) - throw( uno::Exception ) { SolarMutexGuard aGuard; SwGlobals::ensure(); diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index e482fc224f61..93499c7267f1 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -132,7 +132,6 @@ static bool LoadFromURL_impl( SfxObjectShellRef &rxDocSh, const OUString &rURL, bool bClose ) - throw (RuntimeException) { // try to open the document readonly and hidden Reference< frame::XModel > xTmpModel; @@ -202,11 +201,11 @@ namespace virtual ~DelayedFileDeletion( ) override; // XCloseListener - virtual void SAL_CALL queryClosing( const EventObject& _rSource, sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception) override; - virtual void SAL_CALL notifyClosing( const EventObject& _rSource ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL queryClosing( const EventObject& _rSource, sal_Bool _bGetsOwnership ) override; + virtual void SAL_CALL notifyClosing( const EventObject& _rSource ) override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; private: void implTakeOwnership( ); @@ -297,7 +296,7 @@ namespace m_aDeleteTimer.Start( ); } - void SAL_CALL DelayedFileDeletion::queryClosing( const EventObject& , sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception) + void SAL_CALL DelayedFileDeletion::queryClosing( const EventObject& , sal_Bool _bGetsOwnership ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( _bGetsOwnership ) @@ -308,7 +307,7 @@ namespace throw util::CloseVetoException( ); } - void SAL_CALL DelayedFileDeletion::notifyClosing( const EventObject& ) throw (RuntimeException, std::exception) + void SAL_CALL DelayedFileDeletion::notifyClosing( const EventObject& ) { OSL_FAIL("DelayedFileDeletion::notifyClosing: how this?" ); // this should not happen: @@ -316,7 +315,7 @@ namespace // Or, we ourself close the document, then we should not be a listener anymore } - void SAL_CALL DelayedFileDeletion::disposing( const EventObject& ) throw (RuntimeException, std::exception) + void SAL_CALL DelayedFileDeletion::disposing( const EventObject& ) { OSL_FAIL("DelayedFileDeletion::disposing: how this?" ); // this should not happen: @@ -432,8 +431,6 @@ private: uno::Any SAL_CALL SwXMailMerge::execute( const uno::Sequence< beans::NamedValue >& rArguments ) - throw (IllegalArgumentException, Exception, - RuntimeException, std::exception) { SolarMutexGuard aGuard; MailMergeExecuteFinalizer aFinalizer(this); @@ -832,7 +829,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( return makeAny( true ); } -void SAL_CALL SwXMailMerge::cancel() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SwXMailMerge::cancel() { // Cancel may be called from a second thread, so this protects from m_pMgr /// cleanup in the execute function. @@ -869,7 +866,6 @@ void SwXMailMerge::launchEvent( const PropertyChangeEvent &rEvt ) const } uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMailMerge::getPropertySetInfo( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; static Reference< XPropertySetInfo > aRef = m_pPropSet->getPropertySetInfo(); @@ -878,7 +874,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMailMerge::getPropertySetI void SAL_CALL SwXMailMerge::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) - throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1032,7 +1027,6 @@ void SAL_CALL SwXMailMerge::setPropertyValue( uno::Any SAL_CALL SwXMailMerge::getPropertyValue( const OUString& rPropertyName ) - throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1087,7 +1081,6 @@ uno::Any SAL_CALL SwXMailMerge::getPropertyValue( void SAL_CALL SwXMailMerge::addPropertyChangeListener( const OUString& rPropertyName, const uno::Reference< beans::XPropertyChangeListener >& rListener ) - throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!m_bDisposing && rListener.is()) @@ -1103,7 +1096,6 @@ void SAL_CALL SwXMailMerge::addPropertyChangeListener( void SAL_CALL SwXMailMerge::removePropertyChangeListener( const OUString& rPropertyName, const uno::Reference< beans::XPropertyChangeListener >& rListener ) - throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!m_bDisposing && rListener.is()) @@ -1119,7 +1111,6 @@ void SAL_CALL SwXMailMerge::removePropertyChangeListener( void SAL_CALL SwXMailMerge::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*rListener*/ ) - throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // no vetoable property, thus no support for vetoable change listeners OSL_FAIL("not implemented"); @@ -1128,14 +1119,12 @@ void SAL_CALL SwXMailMerge::addVetoableChangeListener( void SAL_CALL SwXMailMerge::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*rListener*/ ) - throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // no vetoable property, thus no support for vetoable change listeners OSL_FAIL("not implemented"); } void SAL_CALL SwXMailMerge::dispose() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1152,7 +1141,6 @@ void SAL_CALL SwXMailMerge::dispose() void SAL_CALL SwXMailMerge::addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!m_bDisposing && rxListener.is()) @@ -1161,7 +1149,6 @@ void SAL_CALL SwXMailMerge::addEventListener( void SAL_CALL SwXMailMerge::removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!m_bDisposing && rxListener.is()) @@ -1170,7 +1157,6 @@ void SAL_CALL SwXMailMerge::removeEventListener( void SAL_CALL SwXMailMerge::addMailMergeEventListener( const uno::Reference< XMailMergeListener >& rxListener ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!m_bDisposing && rxListener.is()) @@ -1179,7 +1165,6 @@ void SAL_CALL SwXMailMerge::addMailMergeEventListener( void SAL_CALL SwXMailMerge::removeMailMergeEventListener( const uno::Reference< XMailMergeListener >& rxListener ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!m_bDisposing && rxListener.is()) @@ -1187,19 +1172,16 @@ void SAL_CALL SwXMailMerge::removeMailMergeEventListener( } OUString SAL_CALL SwXMailMerge::getImplementationName() - throw(RuntimeException, std::exception) { return OUString( "SwXMailMerge" ); } sal_Bool SAL_CALL SwXMailMerge::supportsService( const OUString& rServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SwXMailMerge::getSupportedServiceNames() - throw(RuntimeException, std::exception) { uno::Sequence< OUString > aNames(2); OUString *pName = aNames.getArray(); diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index f3ae86406b88..46321258981e 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -203,7 +203,7 @@ SwXModule::~SwXModule() { } -Reference< XPropertySet > SwXModule::getViewSettings() throw( uno::RuntimeException, std::exception ) +Reference< XPropertySet > SwXModule::getViewSettings() { SolarMutexGuard aGuard; if(!mxViewSettings.is()) @@ -214,7 +214,7 @@ Reference< XPropertySet > SwXModule::getViewSettings() throw( uno::RuntimeExcep return mxViewSettings; } -Reference< XPropertySet > SwXModule::getPrintSettings() throw( uno::RuntimeException, std::exception ) +Reference< XPropertySet > SwXModule::getPrintSettings() { SolarMutexGuard aGuard; if(!mxPrintSettings.is()) @@ -225,17 +225,17 @@ Reference< XPropertySet > SwXModule::getPrintSettings() throw( uno::RuntimeExce return mxPrintSettings; } -OUString SwXModule::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXModule::getImplementationName() { return OUString( "SwXModule" ); } -sal_Bool SwXModule::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXModule::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXModule::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXModule::getSupportedServiceNames() { OUString sService( "com.sun.star.text.GlobalSettings"); const Sequence< OUString > aSeq( &sService, 1 ); @@ -256,9 +256,6 @@ SwXPrintSettings::~SwXPrintSettings() } void SwXPrintSettings::_preSetValues () - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException) { switch (meType) { @@ -279,8 +276,6 @@ void SwXPrintSettings::_preSetValues () } void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue ) - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException) { bool bVal; @@ -408,17 +403,11 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, } void SwXPrintSettings::_postSetValues() - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException) { mpPrtOpt = nullptr; } void SwXPrintSettings::_preGetValues() - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException) { switch (meType) { @@ -439,7 +428,6 @@ void SwXPrintSettings::_preGetValues() } void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue ) - throw(UnknownPropertyException, WrappedTargetException ) { switch( rInfo.mnHandle ) { @@ -513,22 +501,21 @@ void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, } void SwXPrintSettings::_postGetValues () - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) { mpPrtOpt = nullptr; } -OUString SwXPrintSettings::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXPrintSettings::getImplementationName() { return OUString("SwXPrintSettings"); } -sal_Bool SwXPrintSettings::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXPrintSettings::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXPrintSettings::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXPrintSettings::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.PrintSettings" }; return aRet; @@ -559,9 +546,6 @@ SwXViewSettings::~SwXViewSettings() } void SwXViewSettings::_preSetValues () - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException) { const SwViewOption* pVOpt = nullptr; if(pView) @@ -580,9 +564,6 @@ void SwXViewSettings::_preSetValues () } void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue ) - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException, std::exception) { // the API flag should not be set to the application's view settings switch( rInfo.mnHandle ) @@ -784,9 +765,6 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c } void SwXViewSettings::_postSetValues() - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException ) { if( pView ) { @@ -815,9 +793,6 @@ void SwXViewSettings::_postSetValues() } void SwXViewSettings::_preGetValues () - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException) { if(pView) { @@ -830,7 +805,6 @@ void SwXViewSettings::_preGetValues () } void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue ) - throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { bool bBool = true; bool bBoolVal = false; @@ -974,22 +948,21 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u } void SwXViewSettings::_postGetValues () - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) { mpConstViewOption = nullptr; } -OUString SwXViewSettings::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXViewSettings::getImplementationName() { return OUString("SwXViewSettings"); } -sal_Bool SwXViewSettings::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXViewSettings::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXViewSettings::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXViewSettings::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.text.ViewSettings" }; return aRet; diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx index da6f74cf3a8c..900e54b17ae3 100644 --- a/sw/source/uibase/uno/unomodule.cxx +++ b/sw/source/uibase/uno/unomodule.cxx @@ -46,14 +46,13 @@ uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw( uno::Reference< uno::XInterface > SAL_CALL SwUnoModule_createInstance( const uno::Reference< lang::XMultiServiceFactory > & ) - throw (css::uno::Exception) { SolarMutexGuard aGuard; return uno::Reference< uno::XInterface >( dynamic_cast< frame::XDispatch * >(new SwUnoModule), uno::UNO_QUERY ); } // XNotifyingDispatch -void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference< frame::XDispatchResultListener >& xListener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference< frame::XDispatchResultListener >& xListener ) { // there is no guarantee, that we are holded alive during this method! // May the outside dispatch container will be updated by a CONTEXT_CHANGED @@ -86,7 +85,7 @@ void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, cons } // XDispatch -void SAL_CALL SwUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SwUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs ) { dispatchWithNotification(aURL, aArgs, uno::Reference< frame::XDispatchResultListener >()); } @@ -94,18 +93,17 @@ void SAL_CALL SwUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< void SAL_CALL SwUnoModule::addStatusListener( const uno::Reference< frame::XStatusListener > & /*xControl*/, const util::URL& /*aURL*/) - throw( uno::RuntimeException, std::exception ) { } void SAL_CALL SwUnoModule::removeStatusListener( const uno::Reference< frame::XStatusListener > & /*xControl*/, - const util::URL& /*aURL*/) throw( uno::RuntimeException, std::exception ) + const util::URL& /*aURL*/) { } uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SwUnoModule::queryDispatches( - const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( uno::RuntimeException, std::exception ) + const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) { sal_Int32 nCount = seqDescripts.getLength(); uno::Sequence< uno::Reference< frame::XDispatch > > lDispatcher( nCount ); @@ -123,7 +121,7 @@ uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SwUnoModule::queryD // XDispatchProvider uno::Reference< frame::XDispatch > SAL_CALL SwUnoModule::queryDispatch( const util::URL& aURL, const OUString& /*sTargetFrameName*/, - sal_Int32 /*eSearchFlags*/ ) throw( uno::RuntimeException, std::exception ) + sal_Int32 /*eSearchFlags*/ ) { uno::Reference< frame::XDispatch > xReturn; @@ -137,17 +135,17 @@ uno::Reference< frame::XDispatch > SAL_CALL SwUnoModule::queryDispatch( } // XServiceInfo -OUString SAL_CALL SwUnoModule::getImplementationName( ) throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SwUnoModule::getImplementationName( ) { return SwUnoModule_getImplementationName(); } -sal_Bool SAL_CALL SwUnoModule::supportsService( const OUString& sServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwUnoModule::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } -uno::Sequence< OUString > SAL_CALL SwUnoModule::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SwUnoModule::getSupportedServiceNames( ) { return SwUnoModule_getSupportedServiceNames(); } diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx index 58316b1835d7..5a371d65665b 100644 --- a/sw/source/uibase/uno/unomodule.hxx +++ b/sw/source/uibase/uno/unomodule.hxx @@ -54,22 +54,22 @@ public: SwUnoModule() {} // XNotifyingDispatch - virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override; + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) override; + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) override; // XDispatchProvider - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) override ; virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , const OUString & sTargetFrameName, - sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) override ; + sal_Int32 eSearchFlags ) override ; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; #endif diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index a1ca0a03b4c2..81519d940c3c 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -273,7 +273,6 @@ const Sequence< sal_Int8 > & SwXTextDocument::getUnoTunnelId() } sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rId ) - throw(RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -301,7 +300,7 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI return (xNumTunnel.is()) ? xNumTunnel->getSomething(rId) : 0; } -Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(RuntimeException, std::exception) +Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) { Any aRet = SwXTextDocumentBaseClass::queryInterface(rType); if ( !aRet.hasValue() ) @@ -344,12 +343,12 @@ void SAL_CALL SwXTextDocument::release()throw() SfxBaseModel::release(); } -Reference< XAdapter > SwXTextDocument::queryAdapter( ) throw(RuntimeException, std::exception) +Reference< XAdapter > SwXTextDocument::queryAdapter( ) { return SfxBaseModel::queryAdapter(); } -Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() throw(RuntimeException, std::exception) +Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() { Sequence< uno::Type > aBaseTypes = SfxBaseModel::getTypes(); Sequence< uno::Type > aTextTypes = SwXTextDocumentBaseClass::getTypes(); @@ -493,7 +492,7 @@ void SwXTextDocument::GetNumberFormatter() } } -Reference< XText > SwXTextDocument::getText() throw( RuntimeException, std::exception ) +Reference< XText > SwXTextDocument::getText() { SolarMutexGuard aGuard; if(!IsValid()) @@ -506,14 +505,14 @@ Reference< XText > SwXTextDocument::getText() throw( RuntimeException, std::exc return xBodyText; } -void SwXTextDocument::reformat() throw( RuntimeException, std::exception ) +void SwXTextDocument::reformat() { SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); } -void SwXTextDocument::lockControllers() throw( RuntimeException, std::exception ) +void SwXTextDocument::lockControllers() { SolarMutexGuard aGuard; if(IsValid()) @@ -525,7 +524,7 @@ void SwXTextDocument::lockControllers() throw( RuntimeException, std::exception throw RuntimeException(); } -void SwXTextDocument::unlockControllers() throw( RuntimeException, std::exception ) +void SwXTextDocument::unlockControllers() { SolarMutexGuard aGuard; if(!aActionArr.empty()) @@ -538,24 +537,23 @@ void SwXTextDocument::unlockControllers() throw( RuntimeException, std::exceptio throw RuntimeException(); } -sal_Bool SwXTextDocument::hasControllersLocked() throw( RuntimeException, std::exception ) +sal_Bool SwXTextDocument::hasControllersLocked() { SolarMutexGuard aGuard; return !aActionArr.empty(); } -Reference< frame::XController > SwXTextDocument::getCurrentController() throw( RuntimeException, std::exception ) +Reference< frame::XController > SwXTextDocument::getCurrentController() { return SfxBaseModel::getCurrentController(); } void SwXTextDocument::setCurrentController(const Reference< frame::XController > & xController) - throw( NoSuchElementException, RuntimeException, std::exception ) { SfxBaseModel::setCurrentController(xController); } -Reference< XInterface > SwXTextDocument::getCurrentSelection() throw( RuntimeException, std::exception ) +Reference< XInterface > SwXTextDocument::getCurrentSelection() { SolarMutexGuard aGuard; Reference< XInterface > xRef; @@ -576,37 +574,36 @@ Reference< XInterface > SwXTextDocument::getCurrentSelection() throw( RuntimeEx } sal_Bool SwXTextDocument::attachResource(const OUString& aURL, const Sequence< beans::PropertyValue >& aArgs) - throw( RuntimeException, std::exception ) { return SfxBaseModel::attachResource(aURL, aArgs); } -OUString SwXTextDocument::getURL() throw( RuntimeException, std::exception ) +OUString SwXTextDocument::getURL() { return SfxBaseModel::getURL(); } -Sequence< beans::PropertyValue > SwXTextDocument::getArgs() throw( RuntimeException, std::exception ) +Sequence< beans::PropertyValue > SwXTextDocument::getArgs() { return SfxBaseModel::getArgs(); } -void SwXTextDocument::connectController(const Reference< frame::XController > & xController) throw( RuntimeException, std::exception ) +void SwXTextDocument::connectController(const Reference< frame::XController > & xController) { SfxBaseModel::connectController(xController); } -void SwXTextDocument::disconnectController(const Reference< frame::XController > & xController) throw( RuntimeException, std::exception ) +void SwXTextDocument::disconnectController(const Reference< frame::XController > & xController) { SfxBaseModel::disconnectController(xController); } -void SwXTextDocument::dispose() throw( RuntimeException, std::exception ) +void SwXTextDocument::dispose() { SfxBaseModel::dispose(); } -void SwXTextDocument::close( sal_Bool bDeliverOwnership ) throw( util::CloseVetoException, RuntimeException, std::exception ) +void SwXTextDocument::close( sal_Bool bDeliverOwnership ) { SolarMutexGuard aGuard; if(IsValid() && m_pHiddenViewFrame) @@ -614,18 +611,17 @@ void SwXTextDocument::close( sal_Bool bDeliverOwnership ) throw( util::CloseVeto SfxBaseModel::close(bDeliverOwnership); } -void SwXTextDocument::addEventListener(const Reference< lang::XEventListener > & aListener) throw( RuntimeException, std::exception ) +void SwXTextDocument::addEventListener(const Reference< lang::XEventListener > & aListener) { SfxBaseModel::addEventListener(aListener); } -void SwXTextDocument::removeEventListener(const Reference< lang::XEventListener > & aListener) throw( RuntimeException, std::exception ) +void SwXTextDocument::removeEventListener(const Reference< lang::XEventListener > & aListener) { SfxBaseModel::removeEventListener(aListener); } Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(IsValid()) @@ -641,7 +637,6 @@ Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties() } Reference< XIndexReplace > SwXTextDocument::getChapterNumberingRules() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -653,7 +648,7 @@ Reference< XIndexReplace > SwXTextDocument::getChapterNumberingRules() return mxXChapterNumbering; } -Reference< XIndexAccess > SwXTextDocument::getNumberingRules() throw( RuntimeException, std::exception ) +Reference< XIndexAccess > SwXTextDocument::getNumberingRules() { SolarMutexGuard aGuard; if(!IsValid()) @@ -665,7 +660,7 @@ Reference< XIndexAccess > SwXTextDocument::getNumberingRules() throw( RuntimeEx return mxXNumberingRules; } -Reference< XIndexAccess > SwXTextDocument::getFootnotes() throw( RuntimeException, std::exception ) +Reference< XIndexAccess > SwXTextDocument::getFootnotes() { SolarMutexGuard aGuard; if(!IsValid()) @@ -678,7 +673,7 @@ Reference< XIndexAccess > SwXTextDocument::getFootnotes() throw( RuntimeExcepti } Reference< XPropertySet > SAL_CALL - SwXTextDocument::getFootnoteSettings() throw( RuntimeException, std::exception ) + SwXTextDocument::getFootnoteSettings() { SolarMutexGuard aGuard; if(!IsValid()) @@ -690,7 +685,7 @@ Reference< XPropertySet > SAL_CALL return mxXFootnoteSettings; } -Reference< XIndexAccess > SwXTextDocument::getEndnotes() throw( RuntimeException, std::exception ) +Reference< XIndexAccess > SwXTextDocument::getEndnotes() { SolarMutexGuard aGuard; if(!IsValid()) @@ -702,7 +697,7 @@ Reference< XIndexAccess > SwXTextDocument::getEndnotes() throw( RuntimeExceptio return mxXEndnotes; } -Reference< XPropertySet > SwXTextDocument::getEndnoteSettings() throw( RuntimeException, std::exception ) +Reference< XPropertySet > SwXTextDocument::getEndnoteSettings() { SolarMutexGuard aGuard; if(!IsValid()) @@ -715,7 +710,6 @@ Reference< XPropertySet > SwXTextDocument::getEndnoteSettings() throw( RuntimeE } Reference< util::XReplaceDescriptor > SwXTextDocument::createReplaceDescriptor() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; Reference< util::XReplaceDescriptor > xRet = new SwXTextSearch; @@ -736,7 +730,6 @@ SwUnoCursor* SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & x } sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > & xDesc) - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; Reference< XUnoTunnel > xDescTunnel(xDesc, UNO_QUERY); @@ -809,7 +802,6 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > } Reference< util::XSearchDescriptor > SwXTextDocument::createSearchDescriptor() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; Reference< util::XSearchDescriptor > xRet = new SwXTextSearch; @@ -941,7 +933,6 @@ SwUnoCursor* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > Reference< XIndexAccess > SwXTextDocument::findAll(const Reference< util::XSearchDescriptor > & xDesc) - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; Reference< XInterface > xTmp; @@ -956,7 +947,6 @@ Reference< XIndexAccess > } Reference< XInterface > SwXTextDocument::findFirst(const Reference< util::XSearchDescriptor > & xDesc) - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; Reference< XInterface > xTmp; @@ -978,7 +968,6 @@ Reference< XInterface > SwXTextDocument::findFirst(const Reference< util::XSear Reference< XInterface > SwXTextDocument::findNext(const Reference< XInterface > & xStartAt, const Reference< util::XSearchDescriptor > & xDesc) - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; Reference< XInterface > xTmp; @@ -1002,7 +991,6 @@ Reference< XInterface > SwXTextDocument::findNext(const Reference< XInterface > } Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; Sequence< beans::PropertyValue > aSeq(9); @@ -1080,7 +1068,6 @@ static OUString lcl_CreateOutlineString( size_t nIndex, } void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue >& aSettings) - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(IsValid()) @@ -1155,7 +1142,6 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue } void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOptions) - throw( IllegalArgumentException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(IsValid()) @@ -1236,7 +1222,6 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption } Reference< XNameAccess > SwXTextDocument::getReferenceMarks() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1248,7 +1233,7 @@ Reference< XNameAccess > SwXTextDocument::getReferenceMarks() return mxXReferenceMarks; } -Reference< XEnumerationAccess > SwXTextDocument::getTextFields() throw( RuntimeException, std::exception ) +Reference< XEnumerationAccess > SwXTextDocument::getTextFields() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1261,7 +1246,6 @@ Reference< XEnumerationAccess > SwXTextDocument::getTextFields() throw( Runtime } Reference< XNameAccess > SwXTextDocument::getTextFieldMasters() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1273,7 +1257,7 @@ Reference< XNameAccess > SwXTextDocument::getTextFieldMasters() return mxXTextFieldMasters; } -Reference< XNameAccess > SwXTextDocument::getEmbeddedObjects() throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getEmbeddedObjects() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1285,7 +1269,7 @@ Reference< XNameAccess > SwXTextDocument::getEmbeddedObjects() throw( RuntimeEx return mxXEmbeddedObjects; } -Reference< XNameAccess > SwXTextDocument::getBookmarks() throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getBookmarks() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1297,7 +1281,7 @@ Reference< XNameAccess > SwXTextDocument::getBookmarks() throw( RuntimeExceptio return mxXBookmarks; } -Reference< XNameAccess > SwXTextDocument::getTextSections() throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getTextSections() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1309,7 +1293,7 @@ Reference< XNameAccess > SwXTextDocument::getTextSections() throw( RuntimeExcep return mxXTextSections; } -Reference< XNameAccess > SwXTextDocument::getTextTables() throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getTextTables() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1321,7 +1305,7 @@ Reference< XNameAccess > SwXTextDocument::getTextTables() throw( RuntimeExcepti return mxXTextTables; } -Reference< XNameAccess > SwXTextDocument::getGraphicObjects() throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getGraphicObjects() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1333,7 +1317,7 @@ Reference< XNameAccess > SwXTextDocument::getGraphicObjects() throw( RuntimeExc return mxXGraphicObjects; } -Reference< XNameAccess > SwXTextDocument::getTextFrames() throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getTextFrames() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1345,7 +1329,7 @@ Reference< XNameAccess > SwXTextDocument::getTextFrames() throw( RuntimeExcepti return mxXTextFrames; } -Reference< XNameAccess > SwXTextDocument::getStyleFamilies() throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getStyleFamilies() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1358,7 +1342,6 @@ Reference< XNameAccess > SwXTextDocument::getStyleFamilies() throw( RuntimeExce } uno::Reference< style::XAutoStyles > SwXTextDocument::getAutoStyles( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1371,7 +1354,7 @@ uno::Reference< style::XAutoStyles > SwXTextDocument::getAutoStyles( ) } -Reference< drawing::XDrawPage > SwXTextDocument::getDrawPage() throw( RuntimeException, std::exception ) +Reference< drawing::XDrawPage > SwXTextDocument::getDrawPage() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1704,7 +1687,6 @@ css::uno::Reference<css::uno::XInterface> SwXTextDocument::create( } Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServiceName) - throw( Exception, RuntimeException, std::exception ) { return create(rServiceName, nullptr); } @@ -1712,13 +1694,11 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServic Reference< XInterface > SwXTextDocument::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& Arguments) - throw( Exception, RuntimeException, std::exception ) { return create(ServiceSpecifier, &Arguments); } Sequence< OUString > SwXTextDocument::getAvailableServiceNames() - throw( RuntimeException, std::exception ) { static Sequence< OUString > aServices; if ( aServices.getLength() == 0 ) @@ -1741,7 +1721,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames() return aServices; } -OUString SwXTextDocument::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXTextDocument::getImplementationName() { return OUString("SwXTextDocument"); /* // Matching the .component information: @@ -1753,12 +1733,12 @@ OUString SwXTextDocument::getImplementationName() throw( RuntimeException, std:: */ } -sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextDocument::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextDocument::getSupportedServiceNames() { bool bWebDoc = (dynamic_cast<SwWebDocShell*>( pDocShell) != nullptr ); bool bGlobalDoc = (dynamic_cast<SwGlobalDocShell*>( pDocShell) != nullptr ); @@ -1780,7 +1760,7 @@ Sequence< OUString > SwXTextDocument::getSupportedServiceNames() throw( RuntimeE return aRet; } -Reference< XIndexAccess > SwXTextDocument::getDocumentIndexes() throw( RuntimeException, std::exception ) +Reference< XIndexAccess > SwXTextDocument::getDocumentIndexes() { SolarMutexGuard aGuard; if(!IsValid()) @@ -1792,16 +1772,13 @@ Reference< XIndexAccess > SwXTextDocument::getDocumentIndexes() throw( RuntimeE return mxXDocumentIndexes; } -Reference< XPropertySetInfo > SwXTextDocument::getPropertySetInfo() throw( RuntimeException, std::exception ) +Reference< XPropertySetInfo > SwXTextDocument::getPropertySetInfo() { static Reference< XPropertySetInfo > xRet = pPropSet->getPropertySetInfo(); return xRet; } void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any& aValue) - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1981,7 +1958,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any& } Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -2135,33 +2111,29 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) void SwXTextDocument::addPropertyChangeListener(const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXTextDocument::removePropertyChangeListener(const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXTextDocument::addVetoableChangeListener(const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } void SwXTextDocument::removeVetoableChangeListener(const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { OSL_FAIL("not implemented"); } -Reference< XNameAccess > SwXTextDocument::getLinks() throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getLinks() { if(!mxLinkTargetSupplier.is()) { @@ -2170,7 +2142,7 @@ Reference< XNameAccess > SwXTextDocument::getLinks() throw( RuntimeException, s return mxLinkTargetSupplier; } -Reference< XEnumerationAccess > SwXTextDocument::getRedlines( ) throw(RuntimeException, std::exception) +Reference< XEnumerationAccess > SwXTextDocument::getRedlines( ) { if(!mxXRedlines.is()) { @@ -2188,7 +2160,7 @@ void SwXTextDocument::NotifyRefreshListeners() & util::XRefreshListener::refreshed, ev); } -void SwXTextDocument::refresh() throw( RuntimeException, std::exception ) +void SwXTextDocument::refresh() { SolarMutexGuard aGuard; if(!IsValid()) @@ -2201,7 +2173,6 @@ void SwXTextDocument::refresh() throw( RuntimeException, std::exception ) void SAL_CALL SwXTextDocument::addRefreshListener( const Reference<util::XRefreshListener> & xListener) -throw (RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_RefreshListeners.addInterface(xListener); @@ -2209,13 +2180,12 @@ throw (RuntimeException, std::exception) void SAL_CALL SwXTextDocument::removeRefreshListener( const Reference<util::XRefreshListener> & xListener) -throw (RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_RefreshListeners.removeInterface(xListener); } -void SwXTextDocument::updateLinks( ) throw(RuntimeException, std::exception) +void SwXTextDocument::updateLinks( ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -2231,7 +2201,6 @@ void SwXTextDocument::updateLinks( ) throw(RuntimeException, std::exception) //XPropertyState PropertyState SAL_CALL SwXTextDocument::getPropertyState( const OUString& rPropertyName ) - throw (UnknownPropertyException, RuntimeException, std::exception) { SolarMutexGuard aGuard; PropertyState eRet = PropertyState_DIRECT_VALUE; @@ -2249,7 +2218,6 @@ PropertyState SAL_CALL SwXTextDocument::getPropertyState( const OUString& rPrope } Sequence< PropertyState > SAL_CALL SwXTextDocument::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw (UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); const OUString * pNames = rPropertyNames.getConstArray(); @@ -2263,7 +2231,6 @@ Sequence< PropertyState > SAL_CALL SwXTextDocument::getPropertyStates( const Seq } void SAL_CALL SwXTextDocument::setPropertyToDefault( const OUString& rPropertyName ) - throw (UnknownPropertyException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!IsValid()) @@ -2278,7 +2245,6 @@ void SAL_CALL SwXTextDocument::setPropertyToDefault( const OUString& rPropertyNa } Any SAL_CALL SwXTextDocument::getPropertyDefault( const OUString& rPropertyName ) - throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!IsValid()) @@ -2460,8 +2426,6 @@ static void lcl_SavePrintUIOptionsToDocumentPrintData( sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( const uno::Any& rSelection, const uno::Sequence< beans::PropertyValue >& rxOptions ) - throw (IllegalArgumentException, RuntimeException, - std::exception) { SolarMutexGuard aGuard; if(!IsValid()) @@ -2649,8 +2613,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( sal_Int32 nRenderer, const uno::Any& rSelection, const uno::Sequence< beans::PropertyValue >& rxOptions ) - throw (IllegalArgumentException, RuntimeException, - std::exception) { SolarMutexGuard aGuard; if(!IsValid()) @@ -2916,8 +2878,6 @@ void SAL_CALL SwXTextDocument::render( sal_Int32 nRenderer, const uno::Any& rSelection, const uno::Sequence< beans::PropertyValue >& rxOptions ) - throw (IllegalArgumentException, RuntimeException, - std::exception) { SolarMutexGuard aGuard; if(!IsValid()) @@ -3074,7 +3034,6 @@ void SAL_CALL SwXTextDocument::render( // xforms::XFormsSupplier Reference<XNameContainer> SAL_CALL SwXTextDocument::getXForms() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if ( !pDocShell ) @@ -3084,7 +3043,6 @@ Reference<XNameContainer> SAL_CALL SwXTextDocument::getXForms() } uno::Reference< text::XFlatParagraphIterator > SAL_CALL SwXTextDocument::getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic) - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if (!IsValid()) @@ -3097,7 +3055,7 @@ uno::Reference< text::XFlatParagraphIterator > SAL_CALL SwXTextDocument::getFlat *pDocShell->GetDoc(), nTextMarkupType, bAutomatic); } -uno::Reference< util::XCloneable > SwXTextDocument::createClone( ) throw (uno::RuntimeException, std::exception) +uno::Reference< util::XCloneable > SwXTextDocument::createClone( ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -3488,7 +3446,7 @@ void SwXTextDocument::resetSelection() pWrtShell->ResetSelect(nullptr, false); } -void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, std::exception) +void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) { SystemGraphicsData aData; aData.nSize = sizeof(SystemGraphicsData); @@ -3526,9 +3484,6 @@ void SAL_CALL SwXTextDocument::operator delete( void * p) throw() uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nMaxCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -3734,7 +3689,6 @@ SwXLinkTargetSupplier::~SwXLinkTargetSupplier() } Any SwXLinkTargetSupplier::getByName(const OUString& rName) - throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { Any aRet; if(!pxDoc) @@ -3796,7 +3750,6 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) } Sequence< OUString > SwXLinkTargetSupplier::getElementNames() - throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(7); OUString* pNames = aRet.getArray(); @@ -3811,7 +3764,6 @@ Sequence< OUString > SwXLinkTargetSupplier::getElementNames() } sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName) - throw( RuntimeException, std::exception ) { if( rName == sTables || rName == sFrames || @@ -3825,30 +3777,27 @@ sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName) } uno::Type SwXLinkTargetSupplier::getElementType() - throw( RuntimeException, std::exception ) { return cppu::UnoType<XPropertySet>::get(); } -sal_Bool SwXLinkTargetSupplier::hasElements() throw( RuntimeException, std::exception ) +sal_Bool SwXLinkTargetSupplier::hasElements() { return nullptr != pxDoc; } -OUString SwXLinkTargetSupplier::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXLinkTargetSupplier::getImplementationName() { return OUString("SwXLinkTargetSupplier"); } sal_Bool SwXLinkTargetSupplier::supportsService(const OUString& rServiceName) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames() - throw( RuntimeException, std::exception ) { Sequence< OUString > aRet { "com.sun.star.document.LinkTargets" }; return aRet; @@ -3878,7 +3827,6 @@ SwXLinkNameAccessWrapper::~SwXLinkNameAccessWrapper() } Any SwXLinkNameAccessWrapper::getByName(const OUString& rName) - throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { Any aRet; bool bFound = false; @@ -3929,7 +3877,6 @@ Any SwXLinkNameAccessWrapper::getByName(const OUString& rName) } Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames() - throw( RuntimeException, std::exception ) { Sequence< OUString > aRet; if(pxDoc) @@ -3966,7 +3913,6 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames() } sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName) - throw( RuntimeException, std::exception ) { bool bRet = false; OUString sParam(rName); @@ -4005,12 +3951,11 @@ sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName) } uno::Type SwXLinkNameAccessWrapper::getElementType() - throw( RuntimeException, std::exception ) { return cppu::UnoType<XPropertySet>::get(); } -sal_Bool SwXLinkNameAccessWrapper::hasElements() throw( RuntimeException, std::exception ) +sal_Bool SwXLinkNameAccessWrapper::hasElements() { bool bRet = false; if(pxDoc) @@ -4025,7 +3970,6 @@ sal_Bool SwXLinkNameAccessWrapper::hasElements() throw( RuntimeException, std::e } Reference< XPropertySetInfo > SwXLinkNameAccessWrapper::getPropertySetInfo() - throw( RuntimeException, std::exception ) { static Reference< XPropertySetInfo > xRet = pPropSet->getPropertySetInfo(); return xRet; @@ -4033,11 +3977,6 @@ Reference< XPropertySetInfo > SwXLinkNameAccessWrapper::getPropertySetInfo() void SwXLinkNameAccessWrapper::setPropertyValue( const OUString& , const Any& ) - throw( UnknownPropertyException, - PropertyVetoException, - IllegalArgumentException, - WrappedTargetException, - RuntimeException, std::exception) { throw UnknownPropertyException(); } @@ -4073,7 +4012,6 @@ static Any lcl_GetDisplayBitmap(const OUString& _sLinkSuffix) } Any SwXLinkNameAccessWrapper::getPropertyValue(const OUString& rPropertyName) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { Any aRet; if( rPropertyName == UNO_LINK_DISPLAY_NAME ) @@ -4091,43 +4029,36 @@ Any SwXLinkNameAccessWrapper::getPropertyValue(const OUString& rPropertyName) void SwXLinkNameAccessWrapper::addPropertyChangeListener( const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) {} void SwXLinkNameAccessWrapper::removePropertyChangeListener( const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) {} void SwXLinkNameAccessWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) {} void SwXLinkNameAccessWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) {} Reference< XNameAccess > SwXLinkNameAccessWrapper::getLinks() - throw( RuntimeException, std::exception ) { return this; } -OUString SwXLinkNameAccessWrapper::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXLinkNameAccessWrapper::getImplementationName() { return OUString("SwXLinkNameAccessWrapper"); } sal_Bool SwXLinkNameAccessWrapper::supportsService(const OUString& rServiceName) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SwXLinkNameAccessWrapper::getSupportedServiceNames() - throw( RuntimeException, std::exception ) { Sequence< OUString > aRet { "com.sun.star.document.LinkTargets" }; return aRet; @@ -4143,7 +4074,7 @@ SwXOutlineTarget::~SwXOutlineTarget() { } -Reference< XPropertySetInfo > SwXOutlineTarget::getPropertySetInfo() throw( RuntimeException, std::exception ) +Reference< XPropertySetInfo > SwXOutlineTarget::getPropertySetInfo() { static Reference< XPropertySetInfo > xRet = pPropSet->getPropertySetInfo(); return xRet; @@ -4151,14 +4082,11 @@ Reference< XPropertySetInfo > SwXOutlineTarget::getPropertySetInfo() throw( Run void SwXOutlineTarget::setPropertyValue( const OUString& /*PropertyName*/, const Any& /*aValue*/) - throw( UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { throw UnknownPropertyException(); } Any SwXOutlineTarget::getPropertyValue(const OUString& rPropertyName) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { Any aRet; if(rPropertyName == UNO_LINK_DISPLAY_NAME) @@ -4170,39 +4098,35 @@ Any SwXOutlineTarget::getPropertyValue(const OUString& rPropertyName) void SwXOutlineTarget::addPropertyChangeListener( const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } void SwXOutlineTarget::removePropertyChangeListener( const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } void SwXOutlineTarget::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } void SwXOutlineTarget::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } -OUString SwXOutlineTarget::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXOutlineTarget::getImplementationName() { return OUString("SwXOutlineTarget"); } -sal_Bool SwXOutlineTarget::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXOutlineTarget::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SwXOutlineTarget::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXOutlineTarget::getSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.document.LinkTarget" }; diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 63cdd44f8306..acbd3f62eb26 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -131,7 +131,7 @@ void SwXTextView::Invalidate() m_pView = nullptr; } -Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) throw(uno::RuntimeException, std::exception) +Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) { uno::Sequence< uno::Type > aBaseTypes = SfxBaseController::getTypes(); @@ -151,7 +151,7 @@ Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) throw(uno::RuntimeExcep return aBaseTypes; } -Sequence< sal_Int8 > SAL_CALL SwXTextView::getImplementationId( ) throw(uno::RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL SwXTextView::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -167,7 +167,6 @@ void SAL_CALL SwXTextView::release( )throw() } uno::Any SAL_CALL SwXTextView::queryInterface( const uno::Type& aType ) - throw (RuntimeException, std::exception) { uno::Any aRet; if(aType == cppu::UnoType<view::XSelectionSupplier>::get()) @@ -221,8 +220,6 @@ uno::Any SAL_CALL SwXTextView::queryInterface( const uno::Type& aType ) } sal_Bool SwXTextView::select(const uno::Any& aInterface) - throw (lang::IllegalArgumentException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -320,7 +317,6 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) } uno::Any SwXTextView::getSelection() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< uno::XInterface > aRef; @@ -417,7 +413,6 @@ uno::Any SwXTextView::getSelection() void SwXTextView::addSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener > & rxListener) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_SelChangedListeners.addInterface(rxListener); @@ -425,7 +420,6 @@ void SwXTextView::addSelectionChangeListener( void SwXTextView::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener > & rxListener) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_SelChangedListeners.removeInterface(rxListener); @@ -449,7 +443,6 @@ SdrObject* SwXTextView::GetControl( } uno::Reference< awt::XControl > SwXTextView::getControl(const uno::Reference< awt::XControlModel > & xModel) - throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< awt::XControl > xRet; @@ -457,7 +450,7 @@ uno::Reference< awt::XControl > SwXTextView::getControl(const uno::Reference< a return xRet; } -uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormController( const uno::Reference< form::XForm >& Form ) throw (RuntimeException, std::exception) +uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormController( const uno::Reference< form::XForm >& Form ) { SolarMutexGuard aGuard; @@ -473,7 +466,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormCo return xController; } -sal_Bool SAL_CALL SwXTextView::isFormDesignMode( ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwXTextView::isFormDesignMode( ) { SolarMutexGuard aGuard; SwView* pView2 = GetView(); @@ -481,7 +474,7 @@ sal_Bool SAL_CALL SwXTextView::isFormDesignMode( ) throw (uno::RuntimeException return !pFormShell || pFormShell->IsDesignMode(); } -void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool DesignMode ) throw (RuntimeException, std::exception) +void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool DesignMode ) { SolarMutexGuard aGuard; SwView* pView2 = GetView(); @@ -490,7 +483,7 @@ void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool DesignMode ) throw (Runti pFormShell->SetDesignMode( DesignMode ); } -uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor() { SolarMutexGuard aGuard; if(GetView()) @@ -505,7 +498,7 @@ uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor() throw( uno throw uno::RuntimeException(); } -uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings() { SolarMutexGuard aGuard; if(m_pView) @@ -521,7 +514,6 @@ uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings() throw( uno } Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAutomatic*/ ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -567,7 +559,6 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto void SAL_CALL SwXTextView::setRubyList( const Sequence< Sequence< PropertyValue > >& rRubyList, sal_Bool /*bAutomatic*/ ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -706,7 +697,6 @@ void SwXTextView::NotifyDBChanged() } uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXTextView::getPropertySetInfo( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference< XPropertySetInfo > aRef = m_pPropSet->getPropertySetInfo(); @@ -715,7 +705,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXTextView::getPropertySetIn void SAL_CALL SwXTextView::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); @@ -750,10 +739,6 @@ void SAL_CALL SwXTextView::setPropertyValue( uno::Any SAL_CALL SwXTextView::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -804,7 +789,6 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue( void SAL_CALL SwXTextView::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*rxListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -812,7 +796,6 @@ void SAL_CALL SwXTextView::addPropertyChangeListener( void SAL_CALL SwXTextView::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*rxListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -820,7 +803,6 @@ void SAL_CALL SwXTextView::removePropertyChangeListener( void SAL_CALL SwXTextView::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*rxListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -828,22 +810,21 @@ void SAL_CALL SwXTextView::addVetoableChangeListener( void SAL_CALL SwXTextView::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*rxListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } -OUString SwXTextView::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXTextView::getImplementationName() { return OUString("SwXTextView"); } -sal_Bool SwXTextView::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXTextView::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextView::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextView::getSupportedServiceNames() { Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -887,18 +868,18 @@ bool SwXTextViewCursor::IsTextSelection( bool bAllowTables ) const return bRes; } -sal_Bool SwXTextViewCursor::isVisible() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::isVisible() { OSL_FAIL("not implemented"); return true; } -void SwXTextViewCursor::setVisible(sal_Bool /*bVisible*/) throw( uno::RuntimeException, std::exception ) +void SwXTextViewCursor::setVisible(sal_Bool /*bVisible*/) { OSL_FAIL("not implemented"); } -awt::Point SwXTextViewCursor::getPosition() throw( uno::RuntimeException, std::exception ) +awt::Point SwXTextViewCursor::getPosition() { SolarMutexGuard aGuard; awt::Point aRet; @@ -923,7 +904,6 @@ awt::Point SwXTextViewCursor::getPosition() throw( uno::RuntimeException, std::e } void SwXTextViewCursor::collapseToStart() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(m_pView) @@ -947,7 +927,6 @@ void SwXTextViewCursor::collapseToStart() } void SwXTextViewCursor::collapseToEnd() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(m_pView) @@ -971,7 +950,6 @@ void SwXTextViewCursor::collapseToEnd() } sal_Bool SwXTextViewCursor::isCollapsed() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -990,7 +968,6 @@ sal_Bool SwXTextViewCursor::isCollapsed() } sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -1007,7 +984,6 @@ sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand) } sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount, sal_Bool bExpand) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -1027,7 +1003,6 @@ sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount, sal_Bool bExpand) void SwXTextViewCursor::gotoRange( const uno::Reference< text::XTextRange > & xRange, sal_Bool bExpand) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if(m_pView && xRange.is()) @@ -1167,7 +1142,6 @@ void SwXTextViewCursor::gotoRange( } void SwXTextViewCursor::gotoStart(sal_Bool bExpand) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(m_pView) @@ -1182,7 +1156,6 @@ void SwXTextViewCursor::gotoStart(sal_Bool bExpand) } void SwXTextViewCursor::gotoEnd(sal_Bool bExpand) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(m_pView) @@ -1197,7 +1170,6 @@ void SwXTextViewCursor::gotoEnd(sal_Bool bExpand) } sal_Bool SwXTextViewCursor::jumpToFirstPage() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -1218,7 +1190,6 @@ sal_Bool SwXTextViewCursor::jumpToFirstPage() } sal_Bool SwXTextViewCursor::jumpToLastPage() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -1239,7 +1210,7 @@ sal_Bool SwXTextViewCursor::jumpToLastPage() return bRet; } -sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) { SolarMutexGuard aGuard; bool bRet = false; @@ -1250,7 +1221,7 @@ sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) throw( uno::RuntimeExcep return bRet; } -sal_Bool SwXTextViewCursor::jumpToNextPage() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::jumpToNextPage() { SolarMutexGuard aGuard; bool bRet = false; @@ -1261,7 +1232,7 @@ sal_Bool SwXTextViewCursor::jumpToNextPage() throw( uno::RuntimeException, std:: return bRet; } -sal_Bool SwXTextViewCursor::jumpToPreviousPage() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::jumpToPreviousPage() { SolarMutexGuard aGuard; bool bRet = false; @@ -1272,7 +1243,7 @@ sal_Bool SwXTextViewCursor::jumpToPreviousPage() throw( uno::RuntimeException, s return bRet; } -sal_Bool SwXTextViewCursor::jumpToEndOfPage() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::jumpToEndOfPage() { SolarMutexGuard aGuard; bool bRet = false; @@ -1283,7 +1254,7 @@ sal_Bool SwXTextViewCursor::jumpToEndOfPage() throw( uno::RuntimeException, std: return bRet; } -sal_Bool SwXTextViewCursor::jumpToStartOfPage() throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::jumpToStartOfPage() { SolarMutexGuard aGuard; bool bRet = false; @@ -1295,7 +1266,6 @@ sal_Bool SwXTextViewCursor::jumpToStartOfPage() throw( uno::RuntimeException, st } sal_Int16 SwXTextViewCursor::getPage() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Int16 nRet = 0; @@ -1311,7 +1281,6 @@ sal_Int16 SwXTextViewCursor::getPage() } sal_Bool SwXTextViewCursor::screenDown() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -1328,7 +1297,6 @@ sal_Bool SwXTextViewCursor::screenDown() } sal_Bool SwXTextViewCursor::screenUp() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -1345,7 +1313,6 @@ sal_Bool SwXTextViewCursor::screenUp() } uno::Reference< text::XText > SwXTextViewCursor::getText() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< text::XText > xRet; @@ -1365,7 +1332,6 @@ uno::Reference< text::XText > SwXTextViewCursor::getText() } uno::Reference< text::XTextRange > SwXTextViewCursor::getStart() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; @@ -1385,7 +1351,6 @@ uno::Reference< text::XTextRange > SwXTextViewCursor::getStart() } uno::Reference< text::XTextRange > SwXTextViewCursor::getEnd() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; @@ -1405,7 +1370,6 @@ uno::Reference< text::XTextRange > SwXTextViewCursor::getEnd() } OUString SwXTextViewCursor::getString() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString uRet; @@ -1438,7 +1402,6 @@ OUString SwXTextViewCursor::getString() } void SwXTextViewCursor::setString(const OUString& aString) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(m_pView) @@ -1468,16 +1431,13 @@ void SwXTextViewCursor::setString(const OUString& aString) } } -uno::Reference< XPropertySetInfo > SwXTextViewCursor::getPropertySetInfo( ) throw(RuntimeException, std::exception) +uno::Reference< XPropertySetInfo > SwXTextViewCursor::getPropertySetInfo( ) { static uno::Reference< XPropertySetInfo > xRef = m_pPropSet->getPropertySetInfo(); return xRef; } void SwXTextViewCursor::setPropertyValue( const OUString& rPropertyName, const Any& aValue ) - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; if(m_pView) @@ -1498,8 +1458,6 @@ void SwXTextViewCursor::setPropertyValue( const OUString& rPropertyName, const } Any SwXTextViewCursor::getPropertyValue( const OUString& rPropertyName ) - throw (UnknownPropertyException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; Any aRet; @@ -1517,30 +1475,25 @@ Any SwXTextViewCursor::getPropertyValue( const OUString& rPropertyName ) void SwXTextViewCursor::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SwXTextViewCursor::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*aListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SwXTextViewCursor::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SwXTextViewCursor::removeVetoableChangeListener( - const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) + const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ ) { } PropertyState SwXTextViewCursor::getPropertyState( const OUString& rPropertyName ) - throw (UnknownPropertyException, RuntimeException, - std::exception) { SolarMutexGuard aGuard; PropertyState eState; @@ -1558,8 +1511,6 @@ PropertyState SwXTextViewCursor::getPropertyState( const OUString& rPropertyNam Sequence< PropertyState > SwXTextViewCursor::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw (UnknownPropertyException, RuntimeException, - std::exception) { SolarMutexGuard aGuard; Sequence< PropertyState > aRet; @@ -1574,8 +1525,6 @@ Sequence< PropertyState > SwXTextViewCursor::getPropertyStates( } void SwXTextViewCursor::setPropertyToDefault( const OUString& rPropertyName ) - throw (UnknownPropertyException, RuntimeException, - std::exception) { SolarMutexGuard aGuard; if(m_pView) @@ -1588,8 +1537,6 @@ void SwXTextViewCursor::setPropertyToDefault( const OUString& rPropertyName ) } Any SwXTextViewCursor::getPropertyDefault( const OUString& rPropertyName ) - throw (UnknownPropertyException, WrappedTargetException, - RuntimeException, std::exception) { Any aRet; SolarMutexGuard aGuard; @@ -1604,7 +1551,6 @@ Any SwXTextViewCursor::getPropertyDefault( const OUString& rPropertyName ) } sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -1621,7 +1567,6 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand) } sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -1638,7 +1583,6 @@ sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand) } sal_Bool SwXTextViewCursor::isAtStartOfLine() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -1655,7 +1599,6 @@ sal_Bool SwXTextViewCursor::isAtStartOfLine() } sal_Bool SwXTextViewCursor::isAtEndOfLine() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bRet = false; @@ -1672,7 +1615,6 @@ sal_Bool SwXTextViewCursor::isAtEndOfLine() } void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(m_pView) @@ -1687,7 +1629,6 @@ void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand) } void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(m_pView) @@ -1701,17 +1642,17 @@ void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand) throw uno::RuntimeException(); } -OUString SwXTextViewCursor::getImplementationName() throw( RuntimeException, std::exception ) +OUString SwXTextViewCursor::getImplementationName() { return OUString("SwXTextViewCursor"); } -sal_Bool SwXTextViewCursor::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextViewCursor::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextViewCursor::getSupportedServiceNames() { Sequence< OUString > aRet(7); OUString* pArray = aRet.getArray(); @@ -1738,7 +1679,6 @@ const uno::Sequence< sal_Int8 > & SwXTextViewCursor::getUnoTunnelId() //XUnoTunnel sal_Int64 SAL_CALL SwXTextViewCursor::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw(uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -1775,7 +1715,6 @@ SwPaM* SwXTextViewCursor::GetPaM() } uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransferable() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1799,7 +1738,7 @@ uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransfera } } -void SAL_CALL SwXTextView::insertTransferable( const uno::Reference< datatransfer::XTransferable >& xTrans ) throw (datatransfer::UnsupportedFlavorException, uno::RuntimeException, std::exception) +void SAL_CALL SwXTextView::insertTransferable( const uno::Reference< datatransfer::XTransferable >& xTrans ) { SolarMutexGuard aGuard; |