From 0e507ae031768deceab236a41d1bbe9fb5123cea Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 5 Jun 2014 08:16:59 +0200 Subject: various: remove SAL_THROW macro Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494 --- reportdesign/inc/UndoActions.hxx | 12 ++++++------ reportdesign/inc/UndoEnv.hxx | 4 ++-- reportdesign/source/core/sdr/UndoActions.cxx | 12 ++++++------ reportdesign/source/core/sdr/UndoEnv.cxx | 4 ++-- reportdesign/source/ui/dlg/GroupsSorting.cxx | 2 +- reportdesign/source/ui/inc/GroupsSorting.hxx | 2 +- reportdesign/source/ui/inc/ReportControllerObserver.hxx | 4 ++-- reportdesign/source/ui/report/ReportControllerObserver.cxx | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 421442b0446d..2079a68b5b8f 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -196,8 +196,8 @@ namespace rptui virtual void Redo() SAL_OVERRIDE; protected: - virtual void implReInsert( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); - virtual void implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ); + virtual void implReInsert( ); + virtual void implReRemove( ); }; @@ -218,8 +218,8 @@ namespace rptui ,sal_uInt16 _nCommentId); protected: - virtual void implReInsert( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) SAL_OVERRIDE; - virtual void implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) SAL_OVERRIDE; + virtual void implReInsert( ) SAL_OVERRIDE; + virtual void implReRemove( ) SAL_OVERRIDE; }; @@ -239,8 +239,8 @@ namespace rptui ,sal_uInt16 _nCommentId); protected: - virtual void implReInsert( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) SAL_OVERRIDE; - virtual void implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) SAL_OVERRIDE; + virtual void implReInsert( ) SAL_OVERRIDE; + virtual void implReRemove( ) SAL_OVERRIDE; }; // ORptUndoPropertyAction diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index 4c0985053c83..3a5910cf273a 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -132,8 +132,8 @@ namespace rptui void implSetModified(); - void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(()); - void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()); + void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ); + void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ); ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild>& _xContainer) const; diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 8d1fce6f1c65..7331e88abd18 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -151,7 +151,7 @@ OUndoContainerAction::~OUndoContainerAction() } } -void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) +void OUndoContainerAction::implReInsert( ) { if ( m_xContainer.is() ) { @@ -163,7 +163,7 @@ void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) } -void OUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) ) +void OUndoContainerAction::implReRemove( ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try @@ -258,7 +258,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod { } -void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) +void OUndoGroupSectionAction::implReInsert( ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try @@ -275,7 +275,7 @@ void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) } -void OUndoGroupSectionAction::implReRemove( ) SAL_THROW( ( Exception ) ) +void OUndoGroupSectionAction::implReRemove( ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try @@ -304,7 +304,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod { } -void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) +void OUndoReportSectionAction::implReInsert( ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try @@ -327,7 +327,7 @@ void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) } -void OUndoReportSectionAction::implReRemove( ) SAL_THROW( ( Exception ) ) +void OUndoReportSectionAction::implReRemove( ) { OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 558b7daba9cd..7f4217c7fa1c 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -542,7 +542,7 @@ void OXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & -void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(()) +void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxContainer, bool _bStartListening ) { OSL_PRECOND( _rxContainer.is(), "OXUndoEnvironment::switchListening: invalid container!" ); if ( !_rxContainer.is() ) @@ -579,7 +579,7 @@ void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxCon } -void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()) +void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObject, bool _bStartListening ) { OSL_PRECOND( _rxObject.is(), "OXUndoEnvironment::switchListening: how should I listen at a NULL object?" ); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 441658bd1ff9..57811315bde8 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1428,7 +1428,7 @@ void OGroupsSortingDialog::resizeControls(const Size& _rDiff) // load the images -ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType) SAL_THROW (( com::sun::star::lang::IllegalArgumentException )) +ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType) { return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SC)); } diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 4eecf7b5a491..ebe694ce3e4a 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -179,7 +179,7 @@ public: virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const SAL_OVERRIDE; // ImageListProvider interface - virtual ImageList getImageList(vcl::ImageListType) SAL_THROW ((com::sun::star::lang::IllegalArgumentException )) SAL_OVERRIDE; + virtual ImageList getImageList(vcl::ImageListType) SAL_OVERRIDE; }; diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index 4cce89654bcb..48821dd187d4 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -100,8 +100,8 @@ namespace rptui private: void TogglePropertyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); - void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(()); - void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()); + void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ); + void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ); DECL_LINK(SettingsChanged, VclWindowEvent* ); private: diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 13cd591e3097..4bb23fe98ed7 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -259,7 +259,7 @@ void OXReportControllerObserver::TogglePropertyListening(const uno::Reference< u -void OXReportControllerObserver::switchListening( const uno::Reference< container::XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(()) +void OXReportControllerObserver::switchListening( const uno::Reference< container::XIndexAccess >& _rxContainer, bool _bStartListening ) { OSL_PRECOND( _rxContainer.is(), "OXReportControllerObserver::switchListening: invalid container!" ); if ( !_rxContainer.is() ) @@ -296,7 +296,7 @@ void OXReportControllerObserver::switchListening( const uno::Reference< containe } -void OXReportControllerObserver::switchListening( const uno::Reference< uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()) +void OXReportControllerObserver::switchListening( const uno::Reference< uno::XInterface >& _rxObject, bool _bStartListening ) { OSL_PRECOND( _rxObject.is(), "OXReportControllerObserver::switchListening: how should I listen at a NULL object?" ); -- cgit