diff options
Diffstat (limited to 'dbaccess/source/ui/uno')
26 files changed, 175 insertions, 186 deletions
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 6161774973e4..ff44ad7bea15 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -43,22 +43,22 @@ namespace dbaui public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper @@ -72,7 +72,7 @@ namespace dbaui :ODatabaseAdministrationDialog(_rxORB) { } - Sequence<sal_Int8> SAL_CALL OAdvancedSettingsDialog::getImplementationId( ) throw(RuntimeException, std::exception) + Sequence<sal_Int8> SAL_CALL OAdvancedSettingsDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -82,28 +82,28 @@ namespace dbaui return *(new OAdvancedSettingsDialog( comphelper::getComponentContext(_rxFactory) )); } - OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName() { return getImplementationName_Static(); } - OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException) + OUString OAdvancedSettingsDialog::getImplementationName_Static() { return OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog"); } - css::uno::Sequence<OUString> SAL_CALL OAdvancedSettingsDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OAdvancedSettingsDialog::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } - css::uno::Sequence<OUString> OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) + css::uno::Sequence<OUString> OAdvancedSettingsDialog::getSupportedServiceNames_Static() { css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.AdvancedDatabaseSettingsDialog" }; return aSupported; } - Reference<XPropertySetInfo> SAL_CALL OAdvancedSettingsDialog::getPropertySetInfo() throw(RuntimeException, std::exception) + Reference<XPropertySetInfo> SAL_CALL OAdvancedSettingsDialog::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 0fbe95b96031..e5b94f995e51 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -58,7 +58,7 @@ OUString OColumnControl::GetComponentServiceName() return OUString("com.sun.star.sdb.ColumnDescriptorControl"); } -void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer) throw( RuntimeException, std::exception ) +void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); if ( !getPeer().is() ) diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 9e4f415f5b02..fbf070ca64fa 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -41,14 +41,14 @@ namespace dbaui // XServiceInfo DECLARE_SERVICE_INFO(); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // css::awt::XControl - virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 51e538cf5bf0..c42af2059b46 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -102,13 +102,12 @@ void OColumnControlModel::registerProperties() } // XCloneable -Reference< XCloneable > SAL_CALL OColumnControlModel::createClone( ) throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL OColumnControlModel::createClone( ) { return new OColumnControlModel( this, m_xORB ); } css::uno::Sequence<sal_Int8> OColumnControlModel::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -117,13 +116,13 @@ IMPLEMENT_GETTYPES2(OColumnControlModel,OColumnControlModel_BASE,comphelper::OPr IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OColumnControlModel) IMPLEMENT_SERVICE_INFO2_STATIC(OColumnControlModel,"com.sun.star.comp.dbu.OColumnControlModel","com.sun.star.awt.UnoControlModel","com.sun.star.sdb.ColumnDescriptorControlModel") IMPLEMENT_FORWARD_REFCOUNT( OColumnControlModel, OColumnControlModel_BASE ) -Any SAL_CALL OColumnControlModel::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL OColumnControlModel::queryInterface( const Type& _rType ) { return OColumnControlModel_BASE::queryInterface( _rType ); } // css::XAggregation -Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType ) { Any aRet(OColumnControlModel_BASE::queryAggregation(rType)); if (!aRet.hasValue()) @@ -131,17 +130,17 @@ Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType ) throw(Ru return aRet; } -OUString SAL_CALL OColumnControlModel::getServiceName() throw ( RuntimeException, std::exception) +OUString SAL_CALL OColumnControlModel::getServiceName() { return OUString(); } -void OColumnControlModel::write(const Reference<XObjectOutputStream>& /*_rxOutStream*/) throw ( css::io::IOException, RuntimeException, std::exception) +void OColumnControlModel::write(const Reference<XObjectOutputStream>& /*_rxOutStream*/) { // TODO } -void OColumnControlModel::read(const Reference<XObjectInputStream>& /*_rxInStream*/) throw ( css::io::IOException, RuntimeException, std::exception) +void OColumnControlModel::read(const Reference<XObjectInputStream>& /*_rxInStream*/) { // TODO } diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index f4a5b9aaaa27..59e4311ea16d 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -75,29 +75,27 @@ public: // css::lang::XServiceInfo DECLARE_SERVICE_INFO(); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); - 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; // css::uno::XAggregation - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override; // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // OPropertyArrayUsageHelper DECLARE_PROPERTYCONTAINER_DEFAULTS( ); - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index 5d0ac17d3c4e..3700aa5d7637 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -107,7 +107,7 @@ void OColumnPeer::setConnection(const Reference< XConnection>& _xCon) pFieldControl->setConnection(_xCon); } -void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value) throw( RuntimeException, std::exception ) +void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value) { SolarMutexGuard aGuard; @@ -125,7 +125,7 @@ void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value) VCLXWindow::setProperty(_rPropertyName,Value); } -Any OColumnPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException, std::exception ) +Any OColumnPeer::getProperty( const OUString& _rPropertyName ) { Any aProp; VclPtr< OFieldDescControl > pFieldControl = GetAs< OFieldDescControl >(); diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index 1990c8f61829..91ebbdc7fc50 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -40,8 +40,8 @@ namespace dbaui void setConnection(const css::uno::Reference< css::sdbc::XConnection>& _xCon); void setEditWidth(sal_Int32 _nWidth); // VCLXWindow - virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; + virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override; }; } // namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNPEER_HXX diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index c8228a01f55a..b8a4d2acb29d 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -42,7 +42,7 @@ ODBTypeWizDialog::ODBTypeWizDialog(const Reference< XComponentContext >& _rxORB) { } -Sequence<sal_Int8> SAL_CALL ODBTypeWizDialog::getImplementationId( ) throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL ODBTypeWizDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -52,28 +52,28 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult return *(new ODBTypeWizDialog( comphelper::getComponentContext(_rxFactory) )); } -OUString SAL_CALL ODBTypeWizDialog::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL ODBTypeWizDialog::getImplementationName() { return getImplementationName_Static(); } -OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException) +OUString ODBTypeWizDialog::getImplementationName_Static() { return OUString("org.openoffice.comp.dbu.ODBTypeWizDialog"); } -css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialog::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } -css::uno::Sequence<OUString> ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> ODBTypeWizDialog::getSupportedServiceNames_Static() { css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.DataSourceTypeChangeDialog" }; return aSupported; } -Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialog::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialog::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 19c632562cce..4e21b345a994 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -35,22 +35,22 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 26f34a031b1b..a52a5ca4c6d6 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -56,7 +56,7 @@ ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XComponentContext &m_bStartTableWizard, cppu::UnoType<bool>::get()); } -Sequence<sal_Int8> SAL_CALL ODBTypeWizDialogSetup::getImplementationId( ) throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL ODBTypeWizDialogSetup::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -67,28 +67,28 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< return xDBWizard; } -OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName() { return getImplementationName_Static(); } -OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeException) +OUString ODBTypeWizDialogSetup::getImplementationName_Static() { return OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"); } -css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialogSetup::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialogSetup::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } -css::uno::Sequence<OUString> ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> ODBTypeWizDialogSetup::getSupportedServiceNames_Static() { css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.DatabaseWizardDialog" }; return aSupported; } -Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ); } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index 15d888d2326c..f8145f788e9c 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -37,22 +37,22 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index 4810894a97db..bd8a98c6b9a9 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -42,7 +42,7 @@ OTableFilterDialog::OTableFilterDialog(const Reference< XComponentContext >& _rx { } -Sequence<sal_Int8> SAL_CALL OTableFilterDialog::getImplementationId( ) throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL OTableFilterDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -52,28 +52,28 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu return *(new OTableFilterDialog( comphelper::getComponentContext(_rxFactory) )); } -OUString SAL_CALL OTableFilterDialog::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL OTableFilterDialog::getImplementationName() { return getImplementationName_Static(); } -OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeException) +OUString OTableFilterDialog::getImplementationName_Static() { return OUString("org.openoffice.comp.dbu.OTableFilterDialog"); } -css::uno::Sequence<OUString> SAL_CALL OTableFilterDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OTableFilterDialog::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } -css::uno::Sequence<OUString> OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> OTableFilterDialog::getSupportedServiceNames_Static() { css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.TableFilterDialog" }; return aSupported; } -Reference<XPropertySetInfo> SAL_CALL OTableFilterDialog::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference<XPropertySetInfo> SAL_CALL OTableFilterDialog::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 4fddd73b2d19..23c765ae528e 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -35,22 +35,22 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 96f4781c3643..9c12cd708bd8 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -42,7 +42,7 @@ OUserSettingsDialog::OUserSettingsDialog(const Reference< XComponentContext >& _ { } -Sequence<sal_Int8> SAL_CALL OUserSettingsDialog::getImplementationId( ) throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL OUserSettingsDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -52,28 +52,28 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM return *(new OUserSettingsDialog( comphelper::getComponentContext(_rxFactory) )); } -OUString SAL_CALL OUserSettingsDialog::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL OUserSettingsDialog::getImplementationName() { return getImplementationName_Static(); } -OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeException) +OUString OUserSettingsDialog::getImplementationName_Static() { return OUString("org.openoffice.comp.dbu.OUserSettingsDialog"); } -css::uno::Sequence<OUString> SAL_CALL OUserSettingsDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OUserSettingsDialog::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } -css::uno::Sequence<OUString> OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> OUserSettingsDialog::getSupportedServiceNames_Static() { css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.UserAdministrationDialog" }; return aSupported; } -Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index 32514a67f69a..b4c6cf597150 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -35,22 +35,22 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index 1366ed7e8f9c..bbbebc28f718 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -42,7 +42,7 @@ ODataSourcePropertyDialog::ODataSourcePropertyDialog(const Reference< XComponent { } -Sequence<sal_Int8> SAL_CALL ODataSourcePropertyDialog::getImplementationId( ) throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL ODataSourcePropertyDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -52,28 +52,28 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen return *(new ODataSourcePropertyDialog( comphelper::getComponentContext(_rxFactory) )); } -OUString SAL_CALL ODataSourcePropertyDialog::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL ODataSourcePropertyDialog::getImplementationName() { return getImplementationName_Static(); } -OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(RuntimeException) +OUString ODataSourcePropertyDialog::getImplementationName_Static() { return OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"); } -css::uno::Sequence<OUString> SAL_CALL ODataSourcePropertyDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ODataSourcePropertyDialog::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } -css::uno::Sequence<OUString> ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> ODataSourcePropertyDialog::getSupportedServiceNames_Static() { css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.DatasourceAdministrationDialog" }; return aSupported; } -Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index da64c0c7ea83..8e4fb8b67f90 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -35,22 +35,22 @@ protected: public: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index c18655155efd..1cdc2984e090 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -70,7 +70,6 @@ namespace dbaui } css::uno::Sequence<sal_Int8> ComposerDialog::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -145,7 +144,7 @@ namespace dbaui return VclPtr<DlgFilterCrit>::Create( _pParent, m_aContext, _rxConnection, m_xComposer, _rxColumns ); } - void SAL_CALL RowsetFilterDialog::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL RowsetFilterDialog::initialize( const Sequence< Any >& aArguments ) { if( aArguments.getLength() == 3 ) { @@ -193,7 +192,7 @@ namespace dbaui return VclPtr<DlgOrderCrit>::Create( _pParent, _rxConnection, m_xComposer, _rxColumns ); } - void SAL_CALL RowsetOrderDialog::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL RowsetOrderDialog::initialize( const Sequence< Any >& aArguments ) { if( aArguments.getLength() == 2 ) { diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 2f6dd6eae4a5..4d59b432f596 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -55,8 +55,7 @@ namespace dbaui virtual ~ComposerDialog() override; public: - 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; DECLARE_PROPERTYCONTAINER_DEFAULTS( ); @@ -83,9 +82,9 @@ namespace dbaui DECLARE_SERVICE_INFO(); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); @@ -99,8 +98,7 @@ namespace dbaui // OGenericUnoDialog overridables virtual void executedDialog( sal_Int16 _nExecutionResult ) override; - 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; }; @@ -114,9 +112,9 @@ namespace dbaui DECLARE_SERVICE_INFO(); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); @@ -130,8 +128,7 @@ namespace dbaui // OGenericUnoDialog overridables virtual void executedDialog( sal_Int16 _nExecutionResult ) override; - 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; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 31f89eb4394d..d61bda15a8cd 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -146,37 +146,37 @@ namespace dbaui { public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XServiceInfo - static methods /// @throws RuntimeException - static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException ); + static Sequence< OUString > getSupportedServiceNames_Static(); /// @throws RuntimeException - static OUString getImplementationName_Static() throw( RuntimeException ); + static OUString getImplementationName_Static(); static Reference< XInterface > Create( const Reference< XMultiServiceFactory >& ); // XCopyTableWizard - virtual ::sal_Int16 SAL_CALL getOperation() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setOperation( ::sal_Int16 _operation ) throw (IllegalArgumentException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDestinationTableName() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setDestinationTableName( const OUString& _destinationTableName ) throw (RuntimeException, std::exception) override; - virtual Optional< OUString > SAL_CALL getCreatePrimaryKey() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getUseHeaderLineAsColumnNames() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL addCopyTableListener( const Reference< XCopyTableListener >& Listener ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL removeCopyTableListener( const Reference< XCopyTableListener >& Listener ) throw (RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getOperation() override; + virtual void SAL_CALL setOperation( ::sal_Int16 _operation ) override; + virtual OUString SAL_CALL getDestinationTableName() override; + virtual void SAL_CALL setDestinationTableName( const OUString& _destinationTableName ) override; + virtual Optional< OUString > SAL_CALL getCreatePrimaryKey() override; + virtual void SAL_CALL setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey ) override; + virtual sal_Bool SAL_CALL getUseHeaderLineAsColumnNames() override; + virtual void SAL_CALL setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames ) override; + virtual void SAL_CALL addCopyTableListener( const Reference< XCopyTableListener >& Listener ) override; + virtual void SAL_CALL removeCopyTableListener( const Reference< XCopyTableListener >& Listener ) override; // XCopyTableWizard::XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) override; + virtual ::sal_Int16 SAL_CALL execute( ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) override; + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper @@ -411,40 +411,40 @@ Reference< XInterface > CopyTableWizard::Create( const Reference< XMultiServiceF return *( new CopyTableWizard( comphelper::getComponentContext(_rxFactory) ) ); } -OUString SAL_CALL CopyTableWizard::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL CopyTableWizard::getImplementationName() { return getImplementationName_Static(); } -OUString CopyTableWizard::getImplementationName_Static() throw(RuntimeException) +OUString CopyTableWizard::getImplementationName_Static() { return OUString( "org.openoffice.comp.dbu.CopyTableWizard" ); } -css::uno::Sequence<OUString> SAL_CALL CopyTableWizard::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL CopyTableWizard::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } -css::uno::Sequence<OUString> CopyTableWizard::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> CopyTableWizard::getSupportedServiceNames_Static() { css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.application.CopyTableWizard" }; return aSupported; } -Reference< XPropertySetInfo > SAL_CALL CopyTableWizard::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL CopyTableWizard::getPropertySetInfo() { Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -::sal_Int16 SAL_CALL CopyTableWizard::getOperation() throw (RuntimeException, std::exception) +::sal_Int16 SAL_CALL CopyTableWizard::getOperation() { CopyTableAccessGuard aGuard( *this ); return m_nOperation; } -void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation ) { CopyTableAccessGuard aGuard( *this ); @@ -467,25 +467,25 @@ void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation ) throw (Ill m_nOperation = _operation; } -OUString SAL_CALL CopyTableWizard::getDestinationTableName() throw (RuntimeException, std::exception) +OUString SAL_CALL CopyTableWizard::getDestinationTableName() { CopyTableAccessGuard aGuard( *this ); return m_sDestinationTable; } -void SAL_CALL CopyTableWizard::setDestinationTableName( const OUString& _destinationTableName ) throw (RuntimeException, std::exception) +void SAL_CALL CopyTableWizard::setDestinationTableName( const OUString& _destinationTableName ) { CopyTableAccessGuard aGuard( *this ); m_sDestinationTable = _destinationTableName; } -Optional< OUString > SAL_CALL CopyTableWizard::getCreatePrimaryKey() throw (RuntimeException, std::exception) +Optional< OUString > SAL_CALL CopyTableWizard::getCreatePrimaryKey() { CopyTableAccessGuard aGuard( *this ); return m_aPrimaryKeyName; } -void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception) +void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey ) { CopyTableAccessGuard aGuard( *this ); @@ -499,39 +499,39 @@ void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >& m_aPrimaryKeyName = _newPrimaryKey; } -sal_Bool SAL_CALL CopyTableWizard::getUseHeaderLineAsColumnNames() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL CopyTableWizard::getUseHeaderLineAsColumnNames() { CopyTableAccessGuard aGuard( *this ); return m_bUseHeaderLineAsColumnNames; } -void SAL_CALL CopyTableWizard::setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames ) throw (RuntimeException, std::exception) +void SAL_CALL CopyTableWizard::setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames ) { CopyTableAccessGuard aGuard( *this ); m_bUseHeaderLineAsColumnNames = _bUseHeaderLineAsColumnNames; } -void SAL_CALL CopyTableWizard::addCopyTableListener( const Reference< XCopyTableListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL CopyTableWizard::addCopyTableListener( const Reference< XCopyTableListener >& _rxListener ) { CopyTableAccessGuard aGuard( *this ); if ( _rxListener.is() ) m_aCopyTableListeners.addInterface( _rxListener ); } -void SAL_CALL CopyTableWizard::removeCopyTableListener( const Reference< XCopyTableListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL CopyTableWizard::removeCopyTableListener( const Reference< XCopyTableListener >& _rxListener ) { CopyTableAccessGuard aGuard( *this ); if ( _rxListener.is() ) m_aCopyTableListeners.removeInterface( _rxListener ); } -void SAL_CALL CopyTableWizard::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) +void SAL_CALL CopyTableWizard::setTitle( const OUString& _rTitle ) { CopyTableAccessGuard aGuard( *this ); CopyTableWizard_DialogBase::setTitle( _rTitle ); } -::sal_Int16 SAL_CALL CopyTableWizard::execute( ) throw (RuntimeException, std::exception) +::sal_Int16 SAL_CALL CopyTableWizard::execute( ) { CopyTableAccessGuard aGuard( *this ); @@ -1448,7 +1448,7 @@ OUString CopyTableWizard::impl_getServerSideCopyStatement_throw(const Reference< return sSql; } -void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) +void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( isInitialized() ) diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 7bfab1306def..a41e1f730e79 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -66,12 +66,12 @@ namespace dbaui "BasicInteractionHandler::BasicInteractionHandler: enabling legacy behavior, there should be no clients of this anymore!" ); } - sal_Bool SAL_CALL BasicInteractionHandler::handleInteractionRequest( const Reference< XInteractionRequest >& i_rRequest ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL BasicInteractionHandler::handleInteractionRequest( const Reference< XInteractionRequest >& i_rRequest ) { return impl_handle_throw( i_rRequest ); } - void SAL_CALL BasicInteractionHandler::handle( const Reference< XInteractionRequest >& i_rRequest ) throw(RuntimeException, std::exception) + void SAL_CALL BasicInteractionHandler::handle( const Reference< XInteractionRequest >& i_rRequest ) { impl_handle_throw( i_rRequest ); } diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 9e6184313974..5166a6bde184 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -74,10 +74,10 @@ namespace dbaui ); // XInteractionHandler2 - virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override; // XInteractionHandler - virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override; protected: bool @@ -135,9 +135,9 @@ namespace dbaui // XServiceInfo DECLARE_SERVICE_INFO(); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); }; @@ -169,9 +169,9 @@ namespace dbaui // XServiceInfo DECLARE_SERVICE_INFO(); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); }; diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 3970604e9b49..7bbd6a749ee5 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -71,38 +71,37 @@ namespace dbaui virtual ~OTextConnectionSettingsDialog() override; public: - 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; DECLARE_SERVICE_INFO(); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); DECLARE_PROPERTYCONTAINER_DEFAULTS( ); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(Exception, std::exception) override; - virtual sal_Bool SAL_CALL convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw(IllegalArgumentException) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const override; // Overrides to resolve inheritance ambiguity - virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override { ODatabaseAdministrationDialog::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override { return ODatabaseAdministrationDialog::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { ODatabaseAdministrationDialog::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { ODatabaseAdministrationDialog::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { ODatabaseAdministrationDialog::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { ODatabaseAdministrationDialog::removeVetoableChangeListener(p1, p2); } - virtual void SAL_CALL setTitle(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setTitle(const OUString& p1) override { ODatabaseAdministrationDialog::setTitle(p1); } - virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int16 SAL_CALL execute() override { return ODatabaseAdministrationDialog::execute(); } protected: @@ -124,7 +123,6 @@ namespace dbaui css::uno::Sequence<sal_Int8> OTextConnectionSettingsDialog::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -139,7 +137,7 @@ namespace dbaui return static_cast< XServiceInfo* >(new OTextConnectionSettingsDialog( comphelper::getComponentContext(_rxORB))); } - Reference< XPropertySetInfo > SAL_CALL OTextConnectionSettingsDialog::getPropertySetInfo() throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL OTextConnectionSettingsDialog::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ); } @@ -210,7 +208,7 @@ namespace dbaui return VclPtr<TextConnectionSettingsDialog>::Create( _pParent, *m_pDatasourceItems ); } - void SAL_CALL OTextConnectionSettingsDialog::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw(Exception, std::exception) + void SAL_CALL OTextConnectionSettingsDialog::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { PropertyValues::const_iterator pos = m_aPropertyValues.find( _nHandle ); if ( pos != m_aPropertyValues.end() ) @@ -223,7 +221,7 @@ namespace dbaui } } - sal_Bool SAL_CALL OTextConnectionSettingsDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw(IllegalArgumentException) + sal_Bool SAL_CALL OTextConnectionSettingsDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) { bool bModified = false; diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 52a32ba81d79..1858bf9de2ce 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -61,7 +61,6 @@ namespace dbaui } css::uno::Sequence<sal_Int8> ODirectSQLDialog::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index eae08a0aa01c..96e198e8a34a 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -48,14 +48,13 @@ namespace dbaui virtual ~ODirectSQLDialog() override; public: - 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; DECLARE_SERVICE_INFO(); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 6638c82feaac..4494a2eedda3 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -53,7 +53,7 @@ OSQLMessageDialog::OSQLMessageDialog(const Reference< XComponentContext >& _rxOR &m_sHelpURL, cppu::UnoType<decltype(m_sHelpURL)>::get() ); } -Sequence<sal_Int8> SAL_CALL OSQLMessageDialog::getImplementationId( ) throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL OSQLMessageDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -63,28 +63,28 @@ Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMul return *(new OSQLMessageDialog( comphelper::getComponentContext(_rxFactory) )); } -OUString SAL_CALL OSQLMessageDialog::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL OSQLMessageDialog::getImplementationName() { return getImplementationName_Static(); } -OUString OSQLMessageDialog::getImplementationName_Static() throw(RuntimeException) +OUString OSQLMessageDialog::getImplementationName_Static() { return OUString("org.openoffice.comp.dbu.OSQLMessageDialog"); } -css::uno::Sequence<OUString> SAL_CALL OSQLMessageDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OSQLMessageDialog::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } -css::uno::Sequence<OUString> OSQLMessageDialog::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> OSQLMessageDialog::getSupportedServiceNames_Static() { css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.ErrorMessageDialog" }; return aSupported; } -void OSQLMessageDialog::initialize(Sequence<Any> const & args) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) +void OSQLMessageDialog::initialize(Sequence<Any> const & args) { OUString title; Reference< css::awt::XWindow > parentWindow; @@ -100,7 +100,7 @@ void OSQLMessageDialog::initialize(Sequence<Any> const & args) throw (css::uno:: } } -sal_Bool SAL_CALL OSQLMessageDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw(IllegalArgumentException) +sal_Bool SAL_CALL OSQLMessageDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) { switch (_nHandle) { @@ -121,7 +121,7 @@ sal_Bool SAL_CALL OSQLMessageDialog::convertFastPropertyValue( Any& _rConvertedV } } -Reference<XPropertySetInfo> SAL_CALL OSQLMessageDialog::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference<XPropertySetInfo> SAL_CALL OSQLMessageDialog::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; |