From e57ca02849c3d87142ff5ff9099a212e72b8139c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Jan 2017 12:28:58 +0100 Subject: Remove dynamic exception specifications ...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at "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 Reviewed-by: Stephan Bergmann --- sc/inc/appluno.hxx | 194 ++++++++++++++++++++--------------------------------- 1 file changed, 74 insertions(+), 120 deletions(-) (limited to 'sc/inc/appluno.hxx') diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index 221ce48b19e8..8ae79b293bbd 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -48,34 +48,34 @@ css::uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() th OUString SAL_CALL ScDocument_getImplementationName() throw(); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL ScDocument_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags ) throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags ); // Calc XML import css::uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw(); OUString SAL_CALL ScXMLImport_getImplementationName() throw(); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw(); OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw(); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw(); OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw(); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw(); OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw(); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw(); OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw(); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); class ScSpreadsheetSettings : public cppu::WeakImplHelper< css::sheet::XGlobalSheetSettings, @@ -86,14 +86,14 @@ private: SfxItemPropertySet aPropSet; /// @throws css::uno::RuntimeException - bool getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException); + bool getPropertyBool(const OUString& aPropertyName); /// @throws css::uno::RuntimeException - sal_Int16 getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException); + sal_Int16 getPropertyInt16(const OUString& aPropertyName); /// @throws css::uno::RuntimeException - void setProperty(const OUString& aPropertyName, bool p1) throw (css::uno::RuntimeException) + void setProperty(const OUString& aPropertyName, bool p1) { setPropertyValue( aPropertyName, css::uno::Any(p1) ); } /// @throws css::uno::RuntimeException - void setProperty(const OUString& aPropertyName, sal_Int16 p1) throw (css::uno::RuntimeException) + void setProperty(const OUString& aPropertyName, sal_Int16 p1) { setPropertyValue( aPropertyName, css::uno::Any(p1) ); } public: ScSpreadsheetSettings(); @@ -103,130 +103,104 @@ public: static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XGlobalSheetSettings - virtual sal_Bool SAL_CALL getMoveSelection() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getMoveSelection() override { return getPropertyBool("MoveSelection"); } - virtual void SAL_CALL setMoveSelection(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setMoveSelection(sal_Bool p1) override { setProperty("MoveSelection", (bool)p1); } - virtual sal_Int16 SAL_CALL getMoveDirection() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int16 SAL_CALL getMoveDirection() override { return getPropertyInt16("MoveDirection"); } - virtual void SAL_CALL setMoveDirection(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setMoveDirection(sal_Int16 p1) override { setProperty("MoveDirection", p1); } - virtual sal_Bool SAL_CALL getEnterEdit() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getEnterEdit() override { return getPropertyBool("EnterEdit"); } - virtual void SAL_CALL setEnterEdit(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setEnterEdit(sal_Bool p1) override { setProperty("EnterEdit", (bool)p1); } - virtual sal_Bool SAL_CALL getExtendFormat() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getExtendFormat() override { return getPropertyBool("ExtendFormat"); } - virtual void SAL_CALL setExtendFormat(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setExtendFormat(sal_Bool p1) override { setProperty("ExtendFormat", (bool)p1); } - virtual sal_Bool SAL_CALL getRangeFinder() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getRangeFinder() override { return getPropertyBool("RangeFinder"); } - virtual void SAL_CALL setRangeFinder(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setRangeFinder(sal_Bool p1) override { setProperty("RangeFinder", (bool)p1); } - virtual sal_Bool SAL_CALL getExpandReferences() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getExpandReferences() override { return getPropertyBool("ExpandReferences"); } - virtual void SAL_CALL setExpandReferences(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setExpandReferences(sal_Bool p1) override { setProperty("ExpandReferences", (bool)p1); } - virtual sal_Bool SAL_CALL getMarkHeader() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getMarkHeader() override { return getPropertyBool("MarkHeader"); } - virtual void SAL_CALL setMarkHeader(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setMarkHeader(sal_Bool p1) override { setProperty("MarkHeader", (bool)p1); } - virtual sal_Bool SAL_CALL getUseTabCol() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getUseTabCol() override { return getPropertyBool("UseTabCol"); } - virtual void SAL_CALL setUseTabCol(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setUseTabCol(sal_Bool p1) override { setProperty("UseTabCol", (bool)p1); } - virtual sal_Int16 SAL_CALL getMetric() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int16 SAL_CALL getMetric() override { return getPropertyInt16("Metric"); } - virtual void SAL_CALL setMetric(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setMetric(sal_Int16 p1) override { setProperty("Metric", p1); } - virtual sal_Int16 SAL_CALL getScale() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int16 SAL_CALL getScale() override { return getPropertyInt16("Scale"); } - virtual void SAL_CALL setScale(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setScale(sal_Int16 p1) override { setProperty("Scale", p1); } - virtual sal_Bool SAL_CALL getDoAutoComplete() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getDoAutoComplete() override { return getPropertyBool("DoAutoComplete"); } - virtual void SAL_CALL setDoAutoComplete(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setDoAutoComplete(sal_Bool p1) override { setProperty("DoAutoComplete", (bool)p1); } - virtual sal_Int16 SAL_CALL getStatusBarFunction() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int16 SAL_CALL getStatusBarFunction() override { return getPropertyInt16("StatusBarFunction"); } - virtual void SAL_CALL setStatusBarFunction(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setStatusBarFunction(sal_Int16 p1) override { setProperty("StatusBarFunction", p1); } - virtual css::uno::Sequence SAL_CALL getUserLists() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence SAL_CALL getUserLists() override { css::uno::Any any = getPropertyValue("UserLists"); css::uno::Sequence b; any >>= b; return b; } - virtual void SAL_CALL setUserLists(const css::uno::Sequence& p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setUserLists(const css::uno::Sequence& p1) override { setPropertyValue( "UserLists", css::uno::Any(p1) ); } - virtual sal_Int16 SAL_CALL getLinkUpdateMode() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int16 SAL_CALL getLinkUpdateMode() override { return getPropertyInt16("LinkUpdateMode"); } - virtual void SAL_CALL setLinkUpdateMode(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setLinkUpdateMode(sal_Int16 p1) override { setProperty("LinkUpdateMode", p1); } - virtual sal_Bool SAL_CALL getPrintAllSheets() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getPrintAllSheets() override { return getPropertyBool("PrintAllSheets"); } - virtual void SAL_CALL setPrintAllSheets(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setPrintAllSheets(sal_Bool p1) override { setProperty("PrintAllSheets", (bool)p1); } - virtual sal_Bool SAL_CALL getPrintEmptyPages() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getPrintEmptyPages() override { return getPropertyBool("PrintEmptyPages"); } - virtual void SAL_CALL setPrintEmptyPages(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setPrintEmptyPages(sal_Bool p1) override { setProperty("PrintEmptyPages", (bool)p1); } - virtual sal_Bool SAL_CALL getUsePrinterMetrics() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getUsePrinterMetrics() override { return getPropertyBool("UsePrinterMetrics"); } - virtual void SAL_CALL setUsePrinterMetrics(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setUsePrinterMetrics(sal_Bool p1) override { setProperty("UsePrinterMetrics", (bool)p1); } - virtual sal_Bool SAL_CALL getReplaceCellsWarning() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL getReplaceCellsWarning() override { return getPropertyBool("ReplaceCellsWarning"); } - virtual void SAL_CALL setReplaceCellsWarning(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setReplaceCellsWarning(sal_Bool p1) override { setProperty("ReplaceCellsWarning", (bool)p1); } // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const css::uno::Any& aValue ) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; + const css::uno::Any& aValue ) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; + 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; // 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 ScRecentFunctionsObj : public cppu::WeakImplHelper< @@ -238,20 +212,14 @@ public: virtual ~ScRecentFunctionsObj() override; // XRecentFunctions - virtual css::uno::Sequence< sal_Int32 > SAL_CALL getRecentFunctionIds() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRecentFunctionIds( const css::uno::Sequence< sal_Int32 >& aRecentFunctionIds ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRecentFunctions() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getRecentFunctionIds() override; + virtual void SAL_CALL setRecentFunctionIds( const css::uno::Sequence< sal_Int32 >& aRecentFunctionIds ) override; + virtual sal_Int32 SAL_CALL getMaxRecentFunctions() 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 ScFunctionListObj : public cppu::WeakImplHelper< @@ -266,43 +234,29 @@ public: // XFunctionDescriptions virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - getById( sal_Int32 nId ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + getById( sal_Int32 nId ) 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; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - 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 Index ) override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() throw(css::uno::RuntimeException, std::exception) override; + 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; }; #endif -- cgit