diff options
Diffstat (limited to 'sc')
266 files changed, 4946 insertions, 9482 deletions
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx index 7d4c737fde66..43d338072153 100644 --- a/sc/inc/AccessibleFilterMenu.hxx +++ b/sc/inc/AccessibleFilterMenu.hxx @@ -52,90 +52,70 @@ public: ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos); virtual ~ScAccessibleFilterMenu() override; - virtual bool SAL_CALL isVisible() - throw (css::uno::RuntimeException, std::exception) override; + virtual bool SAL_CALL isVisible() override; /// XAccessibleComponent virtual css::uno::Reference< css::accessibility::XAccessible > - SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) 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 getForeground() override; - virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground() override; /// XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; 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; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() 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; /// Remove an existing event listener. 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; /// XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected(sal_Int32 nChildIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected(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 nChildIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + getSelectedAccessibleChild(sal_Int32 nChildIndex) override; - virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex) override; /// XInterface 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; /// 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; /// non-UNO methods @@ -147,11 +127,9 @@ protected: sal_Int32 getMenuItemCount() const; - virtual Rectangle GetBoundingBoxOnScreen() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; - virtual Rectangle GetBoundingBox() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const override; private: bool isSelected() const; diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx index c150278631d1..cbf4425cff25 100644 --- a/sc/inc/AccessibleFilterMenuItem.hxx +++ b/sc/inc/AccessibleFilterMenuItem.hxx @@ -44,40 +44,31 @@ public: /// XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; 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; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; /// XAccessibleAction - virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() override; - virtual sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) 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; + virtual OUString SAL_CALL getAccessibleActionDescription(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; /// XInterface 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; @@ -88,11 +79,9 @@ public: protected: - virtual Rectangle GetBoundingBoxOnScreen() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; - virtual Rectangle GetBoundingBox() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const override; private: bool isSelected() const; diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx index 5a8af2f9f0ee..8ef5af28fa81 100644 --- a/sc/inc/AccessibleFilterTopWindow.hxx +++ b/sc/inc/AccessibleFilterTopWindow.hxx @@ -35,15 +35,12 @@ public: // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; 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; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; // Non-UNO Methods diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx index 12106ddd82e6..9cc670e4df7c 100644 --- a/sc/inc/AccessibleGlobal.hxx +++ b/sc/inc/AccessibleGlobal.hxx @@ -34,18 +34,14 @@ public: // XAccessibleStateSet - virtual sal_Bool SAL_CALL isEmpty() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isEmpty() override; - virtual sal_Bool SAL_CALL contains(sal_Int16 nState) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL contains(sal_Int16 nState) override; virtual sal_Bool SAL_CALL containsAll( - const css::uno::Sequence<sal_Int16>& aStateSet) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<sal_Int16>& aStateSet) override; - virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() override; // Non-UNO Methods diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index 009740167c84..095ddf6012d0 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -48,48 +48,24 @@ public: // 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; }; #endif diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index 8ed8eb03bda4..27436be98963 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -58,58 +58,34 @@ public: // 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; + 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; + 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; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() throw(css::uno::RuntimeException, std::exception) override; + 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 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; // 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 ScAutoFormatObj : public ::cppu::WeakImplHelper< @@ -135,80 +111,49 @@ public: void InitFormat( sal_uInt16 nNewIndex ); // 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; // 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; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // 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; + 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; + 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; + 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; + 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; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int8 >& aIdentifier ) override; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScAutoFormatObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); @@ -229,48 +174,24 @@ public: // 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; }; #endif 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<OUString> SAL_CALL getUserLists() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence<OUString> SAL_CALL getUserLists() override { css::uno::Any any = getPropertyValue("UserLists"); css::uno::Sequence<OUString> b; any >>= b; return b; } - virtual void SAL_CALL setUserLists(const css::uno::Sequence<OUString>& p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setUserLists(const css::uno::Sequence<OUString>& 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 diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 2caeea7f10c0..aded180f3f69 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -218,24 +218,18 @@ protected: sal_uInt16 nItemWhich, const SfxItemPropertySimpleEntry* pEntry ); /// @throws css::uno::RuntimeException virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - css::uno::Any& ) - throw(css::uno::RuntimeException, - std::exception); + css::uno::Any& ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const css::uno::Any& aValue ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception); + const css::uno::Any& aValue ); public: ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR); ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR); virtual ~ScCellRangesBase() override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -258,228 +252,135 @@ public: bool IsCursorOnly() const { return bCursorOnly; } // XSheetOperation - virtual double SAL_CALL computeFunction( css::sheet::GeneralFunction nFunction ) - throw(css::uno::Exception, - css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL clearContents( sal_Int32 nContentFlags ) - throw(css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL computeFunction( css::sheet::GeneralFunction nFunction ) override; + virtual void SAL_CALL clearContents( sal_Int32 nContentFlags ) override; // 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; // 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; - 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 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 ) - 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 >& aPropertyNames, - const css::uno::Sequence< css::uno::Any >& aValues ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + 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 ) - throw (css::uno::RuntimeException, std::exception) override; + getPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) override; virtual css::uno::Sequence< css::beans::GetDirectPropertyTolerantResult > SAL_CALL - getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) - throw (css::uno::RuntimeException, std::exception) override; + getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) override; // XPropertyState virtual css::beans::PropertyState SAL_CALL getPropertyState( - const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const OUString& PropertyName ) 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; + OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; virtual css::uno::Any SAL_CALL getPropertyDefault( - const OUString& aPropertyName ) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& aPropertyName ) override; // XIndent - virtual void SAL_CALL decrementIndent() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL incrementIndent() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL decrementIndent() override; + virtual void SAL_CALL incrementIndent() override; // XChartData virtual void SAL_CALL addChartDataChangeEventListener( - const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw(css::uno::RuntimeException, - std::exception) override; + const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) 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; + 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; + 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; // XCellRangesQuery virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL - queryVisibleCells() - throw(css::uno::RuntimeException, - std::exception) override; + queryVisibleCells() override; virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL - queryEmptyCells() - throw(css::uno::RuntimeException, - std::exception) override; + queryEmptyCells() override; virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL - queryContentCells( sal_Int16 nContentFlags ) - throw(css::uno::RuntimeException, - std::exception) override; + queryContentCells( sal_Int16 nContentFlags ) override; virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL - queryFormulaCells( sal_Int32 nResultFlags ) - throw(css::uno::RuntimeException, - std::exception) override; + queryFormulaCells( sal_Int32 nResultFlags ) override; virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryColumnDifferences( - const css::table::CellAddress& aCompare ) - throw(css::uno::RuntimeException, - std::exception) override; + const css::table::CellAddress& aCompare ) override; virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryRowDifferences( - const css::table::CellAddress& aCompare ) - throw(css::uno::RuntimeException, - std::exception) override; + const css::table::CellAddress& aCompare ) override; virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL queryIntersection( - const css::table::CellRangeAddress& aRange ) - throw(css::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aRange ) override; // XFormulaQuery virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL - queryDependents( sal_Bool bRecursive ) - throw(css::uno::RuntimeException, - std::exception) override; + queryDependents( sal_Bool bRecursive ) override; virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL - queryPrecedents( sal_Bool bRecursive ) - throw(css::uno::RuntimeException, - std::exception) override; + queryPrecedents( sal_Bool bRecursive ) override; // XSearchable virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL - createSearchDescriptor() - throw(css::uno::RuntimeException, std::exception) override; + createSearchDescriptor() 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; + 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 ) - throw(css::uno::RuntimeException, std::exception) override; + 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 ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) 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; + createReplaceDescriptor() override; + virtual sal_Int32 SAL_CALL replaceAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) 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; // 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; // 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScCellRangesBase* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); // 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; }; class SC_DLLPUBLIC ScCellRangesObj : public ScCellRangesBase, @@ -497,8 +398,7 @@ public: ScCellRangesObj(ScDocShell* pDocSh, const ScRangeList& rR); virtual ~ScCellRangesObj() override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -506,88 +406,55 @@ public: // XSheetCellRanges virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL - getCells() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRangeAddressesAsString() - throw(css::uno::RuntimeException, std::exception) override; + getCells() override; + virtual OUString SAL_CALL getRangeAddressesAsString() override; virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL - getRangeAddresses() throw(css::uno::RuntimeException, std::exception) override; + getRangeAddresses() override; // XSheetCellRangeContainer virtual void SAL_CALL addRangeAddress( const css::table::CellRangeAddress& rRange, - sal_Bool bMergeRanges ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRangeAddress( const css::table::CellRangeAddress& rRange ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMergeRanges ) override; + virtual void SAL_CALL removeRangeAddress( const css::table::CellRangeAddress& rRange ) override; virtual void SAL_CALL addRangeAddresses( const css::uno::Sequence< css::table::CellRangeAddress >& rRanges, - sal_Bool bMergeRanges ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Bool bMergeRanges ) override; virtual void SAL_CALL removeRangeAddresses( const css::uno::Sequence< - css::table::CellRangeAddress >& rRanges ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + css::table::CellRangeAddress >& rRanges ) override; // 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; + 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; + 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; // 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; // 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; // 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; }; class SC_DLLPUBLIC ScCellRangeObj : public ScCellRangesBase, @@ -617,27 +484,19 @@ protected: const ScRange& GetRange() const { return aRange; } virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - css::uno::Any& ) - throw(css::uno::RuntimeException, - std::exception) override; + css::uno::Any& ) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const css::uno::Any& aValue ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + const css::uno::Any& aValue ) override; /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException css::uno::Reference< css::table::XCell > - GetCellByPosition_Impl( sal_Int32 nColumn, sal_Int32 nRow ) - throw(css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + GetCellByPosition_Impl( sal_Int32 nColumn, sal_Int32 nRow ); /// @throws css::uno::RuntimeException void SetArrayFormula_Impl( const OUString& rFormula, const OUString& rFormulaNmsp, - const formula::FormulaGrammar::Grammar eGrammar ) - throw (css::uno::RuntimeException, std::exception); + const formula::FormulaGrammar::Grammar eGrammar ); public: ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR); @@ -648,162 +507,126 @@ public: CreateRangeFromDoc( ScDocument* pDoc, const ScRange& rR ); 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; virtual void SAL_CALL release() throw() override; virtual void RefChanged() override; // XCellRangeAddressable - virtual css::table::CellRangeAddress SAL_CALL getRangeAddress() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getRangeAddress() override; // XSheetCellRange virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL - getSpreadsheet() throw(css::uno::RuntimeException, std::exception) override; + getSpreadsheet() override; // XArrayFormulaRange - virtual OUString SAL_CALL getArrayFormula() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArrayFormula( const OUString& aFormula ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getArrayFormula() override; + virtual void SAL_CALL setArrayFormula( const OUString& aFormula ) override; // XArrayFormulaTokens - virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getArrayTokens() - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getArrayTokens() override; virtual void SAL_CALL setArrayTokens( const css::uno::Sequence< - css::sheet::FormulaToken >& aTokens ) - throw (css::uno::RuntimeException, std::exception) override; + css::sheet::FormulaToken >& aTokens ) 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; // XCellRangeFormula virtual css::uno::Sequence< css::uno::Sequence< - OUString > > SAL_CALL getFormulaArray() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormulaArray( const css::uno::Sequence< css::uno::Sequence< OUString > >& aArray ) - throw (css::uno::RuntimeException, std::exception) override; + OUString > > SAL_CALL getFormulaArray() override; + virtual void SAL_CALL setFormulaArray( const css::uno::Sequence< css::uno::Sequence< OUString > >& aArray ) override; // XMultipleOperation virtual void SAL_CALL setTableOperation( const css::table::CellRangeAddress& aFormulaRange, css::sheet::TableOperationMode nMode, const css::table::CellAddress& aColumnCell, - const css::table::CellAddress& aRowCell ) - throw(css::uno::RuntimeException, std::exception) override; + const css::table::CellAddress& aRowCell ) override; // XMergeable - virtual void SAL_CALL merge( sal_Bool bMerge ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getIsMerged() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL merge( sal_Bool bMerge ) override; + virtual sal_Bool SAL_CALL getIsMerged() override; // XCellSeries virtual void SAL_CALL fillSeries( css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, - double fStep, double fEndValue ) - throw(css::uno::RuntimeException, std::exception) override; + double fStep, double fEndValue ) override; virtual void SAL_CALL fillAuto( css::sheet::FillDirection nFillDirection, - sal_Int32 nSourceCount ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 nSourceCount ) 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; // 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; + css::beans::PropertyValue >& xDescriptor ) override; // XSheetFilterableEx virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL createFilterDescriptorByObject( const css::uno::Reference< - css::sheet::XSheetFilterable >& xObject ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::XSheetFilterable >& xObject ) override; // XSheetFilterable virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL - createFilterDescriptor( sal_Bool bEmpty ) - throw(css::uno::RuntimeException, std::exception) override; + createFilterDescriptor( sal_Bool bEmpty ) override; virtual void SAL_CALL filter( const css::uno::Reference< - css::sheet::XSheetFilterDescriptor >& xDescriptor ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::XSheetFilterDescriptor >& xDescriptor ) override; // XSubTotalCalculatable virtual css::uno::Reference< css::sheet::XSubTotalDescriptor > SAL_CALL - createSubTotalDescriptor( sal_Bool bEmpty ) - throw(css::uno::RuntimeException, std::exception) override; + createSubTotalDescriptor( sal_Bool bEmpty ) override; virtual void SAL_CALL applySubTotals(const css::uno::Reference< css::sheet::XSubTotalDescriptor >& xDescriptor, - sal_Bool bReplace) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL removeSubTotals() throw(css::uno::RuntimeException, std::exception) override; + sal_Bool bReplace) override; + virtual void SAL_CALL removeSubTotals() override; // XImportable virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - createImportDescriptor( sal_Bool bEmpty ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doImport( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw(css::uno::RuntimeException, std::exception) override; + createImportDescriptor( sal_Bool bEmpty ) override; + virtual void SAL_CALL doImport( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override; // XCellFormatRangesSupplier virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getCellFormatRanges() throw(css::uno::RuntimeException, std::exception) override; + getCellFormatRanges() override; // XUniqueCellFormatRangesSupplier virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getUniqueCellFormatRanges() throw(css::uno::RuntimeException, std::exception) override; + getUniqueCellFormatRanges() override; // XColumnRowRange virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL - getColumns() throw(css::uno::RuntimeException, std::exception) override; + getColumns() override; virtual css::uno::Reference< css::table::XTableRows > SAL_CALL - getRows() throw(css::uno::RuntimeException, std::exception) override; + getRows() 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; + 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 ) - throw(css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nRight, sal_Int32 nBottom ) override; virtual css::uno::Reference< css::table::XCellRange > SAL_CALL - getCellRangeByName( const OUString& aRange ) - throw(css::uno::RuntimeException, std::exception) override; + getCellRangeByName( const OUString& aRange ) override; /// @throws css::uno::RuntimeException css::uno::Reference< css::table::XCellRange > - getCellRangeByName( const OUString& aRange, const ScAddress::Details& rDetails ) - throw(css::uno::RuntimeException); + getCellRangeByName( const OUString& aRange, const ScAddress::Details& rDetails ); // XPropertySet override due to Range-Properties virtual css::uno::Reference< css::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertySetInfo() 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; }; //! really derive cell from range? @@ -835,13 +658,9 @@ private: protected: virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - css::uno::Any& ) - throw(css::uno::RuntimeException, - std::exception) override; + css::uno::Any& ) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const css::uno::Any& aValue ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) override; public: static const SvxItemPropertySet* GetEditPropertySet(); @@ -850,8 +669,7 @@ public: ScCellObj(ScDocShell* pDocSh, const ScAddress& rP); virtual ~ScCellObj() override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -868,108 +686,83 @@ public: // 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; - virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bAbsorb ) override; + virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) 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 >& aTextPosition ) - throw(css::uno::RuntimeException, std::exception) override; + 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 ) - 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; // XTextRange virtual css::uno::Reference< css::text::XText > SAL_CALL - getText() throw(css::uno::RuntimeException, std::exception) override; + getText() override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getStart() throw(css::uno::RuntimeException, std::exception) override; + 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& aString ) - throw(css::uno::RuntimeException, std::exception) override; + getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString( const OUString& aString ) 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; // 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 void SAL_CALL setFormulaResult( double nValue ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormulaString( const OUString& aFormula ) - throw(css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getValue() throw(css::uno::RuntimeException, std::exception) override; - 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 OUString SAL_CALL getFormula() override; + virtual void SAL_CALL setFormula( const OUString& aFormula ) override; + virtual void SAL_CALL setFormulaResult( double nValue ) override; + virtual void SAL_CALL setFormulaString( const OUString& aFormula ) override; + virtual double SAL_CALL getValue() override; + virtual void SAL_CALL setValue( double nValue ) override; + virtual css::table::CellContentType SAL_CALL getType() override; + virtual sal_Int32 SAL_CALL getError() override; // XFormulaTokens - virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens() - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL setTokens( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens() override; + virtual void SAL_CALL setTokens( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) override; // XCellAddressable - virtual css::table::CellAddress SAL_CALL getCellAddress() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellAddress SAL_CALL getCellAddress() override; // XSheetAnnotationAnchor virtual css::uno::Reference< css::sheet::XSheetAnnotation > SAL_CALL - getAnnotation() throw(css::uno::RuntimeException, std::exception) override; + getAnnotation() override; // XTextFieldsSupplier virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL - getTextFields() throw(css::uno::RuntimeException, std::exception) override; + getTextFields() override; virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getTextFieldMasters() throw(css::uno::RuntimeException, std::exception) override; + getTextFieldMasters() override; // XPropertySet override due to cell properties virtual css::uno::Reference< css::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertySetInfo() 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; // XActionLockable - virtual sal_Bool SAL_CALL isActionLocked() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionLock() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionLock() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL resetActionLocks() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActionLocked() override; + virtual void SAL_CALL addActionLock() override; + virtual void SAL_CALL removeActionLock() override; + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) override; + virtual sal_Int16 SAL_CALL resetActionLocks() override; }; class ScTableSheetObj : public ScCellRangeObj, @@ -1003,14 +796,9 @@ private: protected: virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - css::uno::Any& ) - throw(css::uno::RuntimeException, - std::exception) override; + css::uno::Any& ) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const css::uno::Any& aValue ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + const css::uno::Any& aValue ) override; public: ScTableSheetObj(ScDocShell* pDocSh, SCTAB nTab); @@ -1018,222 +806,163 @@ public: void InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab); - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XSpreadsheet virtual css::uno::Reference< css::sheet::XSheetCellCursor > - SAL_CALL createCursor() throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL createCursor() override; virtual css::uno::Reference< css::sheet::XSheetCellCursor > SAL_CALL createCursorByRange( const css::uno::Reference< - css::sheet::XSheetCellRange >& aRange ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::XSheetCellRange >& aRange ) override; // XSheetCellRange virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL - getSpreadsheet() throw(css::uno::RuntimeException, std::exception) override; + getSpreadsheet() 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; + 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 ) - throw(css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nRight, sal_Int32 nBottom ) override; using ScCellRangeObj::getCellRangeByName; virtual css::uno::Reference< css::table::XCellRange > SAL_CALL - getCellRangeByName( const OUString& aRange ) - throw(css::uno::RuntimeException, std::exception) override; + getCellRangeByName( const OUString& aRange ) override; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XSheetPageBreak virtual css::uno::Sequence< css::sheet::TablePageBreakData > SAL_CALL - getColumnPageBreaks() throw(css::uno::RuntimeException, std::exception) override; + getColumnPageBreaks() override; virtual css::uno::Sequence< css::sheet::TablePageBreakData > SAL_CALL - getRowPageBreaks() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAllManualPageBreaks() throw(css::uno::RuntimeException, std::exception) override; + getRowPageBreaks() override; + virtual void SAL_CALL removeAllManualPageBreaks() override; // XCellRangeMovement virtual void SAL_CALL insertCells( const css::table::CellRangeAddress& aRange, - css::sheet::CellInsertMode nMode ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::CellInsertMode nMode ) override; virtual void SAL_CALL removeRange( const css::table::CellRangeAddress& aRange, - css::sheet::CellDeleteMode nMode ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::CellDeleteMode nMode ) override; virtual void SAL_CALL moveRange( const css::table::CellAddress& aDestination, - const css::table::CellRangeAddress& aSource ) - throw(css::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aSource ) override; virtual void SAL_CALL copyRange( const css::table::CellAddress& aDestination, - const css::table::CellRangeAddress& aSource ) - throw(css::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aSource ) override; // XTableChartsSupplier virtual css::uno::Reference< css::table::XTableCharts > SAL_CALL - getCharts() throw(css::uno::RuntimeException, std::exception) override; + getCharts() override; // XDataPilotTablesSupplier virtual css::uno::Reference< css::sheet::XDataPilotTables > SAL_CALL - getDataPilotTables() throw(css::uno::RuntimeException, std::exception) override; + getDataPilotTables() override; // XScenariosSupplier virtual css::uno::Reference< css::sheet::XScenarios > SAL_CALL - getScenarios() throw(css::uno::RuntimeException, std::exception) override; + getScenarios() override; // XSheetAnnotationsSupplier virtual css::uno::Reference< css::sheet::XSheetAnnotations > SAL_CALL - getAnnotations() throw(css::uno::RuntimeException, std::exception) override; + getAnnotations() override; // XDrawPageSupplier virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL - getDrawPage() throw(css::uno::RuntimeException, std::exception) override; + getDrawPage() override; // XPrintAreas virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL - getPrintAreas() throw(css::uno::RuntimeException, std::exception) override; + getPrintAreas() override; virtual void SAL_CALL setPrintAreas( const css::uno::Sequence< - css::table::CellRangeAddress >& aPrintAreas ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrintTitleColumns() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintTitleColumns( sal_Bool bPrintTitleColumns ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::table::CellRangeAddress SAL_CALL getTitleColumns() - throw(css::uno::RuntimeException, std::exception) override; + css::table::CellRangeAddress >& aPrintAreas ) override; + virtual sal_Bool SAL_CALL getPrintTitleColumns() override; + virtual void SAL_CALL setPrintTitleColumns( sal_Bool bPrintTitleColumns ) override; + virtual css::table::CellRangeAddress SAL_CALL getTitleColumns() override; virtual void SAL_CALL setTitleColumns( - const css::table::CellRangeAddress& aTitleColumns ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrintTitleRows() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintTitleRows( sal_Bool bPrintTitleRows ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::table::CellRangeAddress SAL_CALL getTitleRows() - throw(css::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aTitleColumns ) override; + virtual sal_Bool SAL_CALL getPrintTitleRows() override; + virtual void SAL_CALL setPrintTitleRows( sal_Bool bPrintTitleRows ) override; + virtual css::table::CellRangeAddress SAL_CALL getTitleRows() override; virtual void SAL_CALL setTitleRows( - const css::table::CellRangeAddress& aTitleRows ) - throw(css::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aTitleRows ) override; // XSheetLinkable - virtual css::sheet::SheetLinkMode SAL_CALL getLinkMode() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkMode( css::sheet::SheetLinkMode nLinkMode ) - throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkUrl() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkUrl( const OUString& aLinkUrl ) - throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkSheetName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkSheetName( const OUString& aLinkSheetName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::sheet::SheetLinkMode SAL_CALL getLinkMode() override; + virtual void SAL_CALL setLinkMode( css::sheet::SheetLinkMode nLinkMode ) override; + virtual OUString SAL_CALL getLinkUrl() override; + virtual void SAL_CALL setLinkUrl( const OUString& aLinkUrl ) override; + virtual OUString SAL_CALL getLinkSheetName() override; + virtual void SAL_CALL setLinkSheetName( const OUString& aLinkSheetName ) override; virtual void SAL_CALL link( const OUString& aUrl, const OUString& aSheetName, const OUString& aFilterName, const OUString& aFilterOptions, - css::sheet::SheetLinkMode nMode ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::SheetLinkMode nMode ) override; // XSheetAuditing - virtual sal_Bool SAL_CALL hideDependents( const css::table::CellAddress& aPosition ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hidePrecedents( const css::table::CellAddress& aPosition ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL showDependents( const css::table::CellAddress& aPosition ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL showPrecedents( const css::table::CellAddress& aPosition ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL showErrors( const css::table::CellAddress& aPosition ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL showInvalid() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearArrows() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hideDependents( const css::table::CellAddress& aPosition ) override; + virtual sal_Bool SAL_CALL hidePrecedents( const css::table::CellAddress& aPosition ) override; + virtual sal_Bool SAL_CALL showDependents( const css::table::CellAddress& aPosition ) override; + virtual sal_Bool SAL_CALL showPrecedents( const css::table::CellAddress& aPosition ) override; + virtual sal_Bool SAL_CALL showErrors( const css::table::CellAddress& aPosition ) override; + virtual sal_Bool SAL_CALL showInvalid() override; + virtual void SAL_CALL clearArrows() override; // XSheetOutline virtual void SAL_CALL group( const css::table::CellRangeAddress& aRange, - css::table::TableOrientation nOrientation ) - throw (css::uno::RuntimeException, - std::exception) override; + css::table::TableOrientation nOrientation ) override; virtual void SAL_CALL ungroup( const css::table::CellRangeAddress& aRange, - css::table::TableOrientation nOrientation ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL autoOutline( const css::table::CellRangeAddress& aRange ) - throw(css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL clearOutline() - throw(css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL hideDetail( const css::table::CellRangeAddress& aRange ) - throw(css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL showDetail( const css::table::CellRangeAddress& aRange ) - throw(css::uno::RuntimeException, - std::exception) override; + css::table::TableOrientation nOrientation ) override; + virtual void SAL_CALL autoOutline( const css::table::CellRangeAddress& aRange ) override; + virtual void SAL_CALL clearOutline() override; + virtual void SAL_CALL hideDetail( const css::table::CellRangeAddress& aRange ) override; + virtual void SAL_CALL showDetail( const css::table::CellRangeAddress& aRange ) override; virtual void SAL_CALL showLevel( sal_Int16 nLevel, - css::table::TableOrientation nOrientation ) - throw(css::uno::RuntimeException, - std::exception) override; + css::table::TableOrientation nOrientation ) override; // XProtectable - virtual void SAL_CALL protect( const OUString& aPassword ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unprotect( const OUString& aPassword ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isProtected() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL protect( const OUString& aPassword ) override; + virtual void SAL_CALL unprotect( const OUString& aPassword ) override; + virtual sal_Bool SAL_CALL isProtected() override; // XScenario - virtual sal_Bool SAL_CALL getIsScenario() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getScenarioComment() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScenarioComment( const OUString& aScenarioComment ) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsScenario() override; + virtual OUString SAL_CALL getScenarioComment() override; + virtual void SAL_CALL setScenarioComment( const OUString& aScenarioComment ) override; virtual void SAL_CALL addRanges( const css::uno::Sequence< - css::table::CellRangeAddress >& aRanges ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL apply() throw(css::uno::RuntimeException, std::exception) override; + css::table::CellRangeAddress >& aRanges ) override; + virtual void SAL_CALL apply() override; // XScenarioEnhanced virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL - getRanges( ) - throw(css::uno::RuntimeException, std::exception) override; + getRanges( ) override; // XExternalSheetName - virtual void SAL_CALL setExternalName( const OUString& aUrl, const OUString& aSheetName ) - throw (css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setExternalName( const OUString& aUrl, const OUString& aSheetName ) 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; // XPropertySet override due to sheet properties virtual css::uno::Reference< css::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertySetInfo() 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; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int8 >& aIdentifier ) override; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTableSheetObj* getImplementation(const css::uno::Reference< css::uno::XInterface>& rObj); // 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; }; class ScTableColumnObj : public ScCellRangeObj, @@ -1245,48 +974,35 @@ private: protected: virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - css::uno::Any& ) - throw(css::uno::RuntimeException, - std::exception) override; + css::uno::Any& ) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const css::uno::Any& aValue ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + const css::uno::Any& aValue ) override; public: ScTableColumnObj(ScDocShell* pDocSh, SCCOL nCol, SCTAB nTab); virtual ~ScTableColumnObj() override; 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; virtual void SAL_CALL release() throw() override; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XPropertySet override due to column properties virtual css::uno::Reference< css::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertySetInfo() 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; }; class ScTableRowObj : public ScCellRangeObj @@ -1297,14 +1013,9 @@ private: protected: virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - css::uno::Any& ) - throw(css::uno::RuntimeException, - std::exception) override; + css::uno::Any& ) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, - const css::uno::Any& aValue ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + const css::uno::Any& aValue ) override; public: ScTableRowObj(ScDocShell* pDocSh, SCROW nRow, SCTAB nTab); @@ -1312,16 +1023,12 @@ public: // XPropertySet override due to row properties virtual css::uno::Reference< css::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertySetInfo() 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 ScCellsObj : public cppu::WeakImplHelper< @@ -1341,20 +1048,16 @@ public: // 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; }; class ScCellsEnumeration : public cppu::WeakImplHelper< @@ -1380,19 +1083,13 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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 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 ScCellFormatsObj : public cppu::WeakImplHelper< @@ -1415,28 +1112,21 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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; }; class ScCellFormatsEnumeration : public cppu::WeakImplHelper< @@ -1463,19 +1153,13 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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 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 std::vector< ScRangeList > ScMyRangeLists; @@ -1498,28 +1182,21 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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; }; class ScUniqueCellFormatsEnumeration : public cppu::WeakImplHelper< @@ -1539,19 +1216,13 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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 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/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 9201638b701d..d9c019dc7a3d 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -71,109 +71,76 @@ public: // XDataProvider virtual sal_Bool SAL_CALL createDataSourcePossible( - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::uno::RuntimeException, std::exception) override; + 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 ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + 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 ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) override; virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( - const OUString& aRangeRepresentation ) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& aRangeRepresentation ) 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; + const OUString& aRangeRepresentation ) 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; + createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) override; - virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() override; // XSheetDataProvider virtual sal_Bool SAL_CALL createDataSequenceByFormulaTokensPossible( - const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) override; virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByFormulaTokens( - const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) override; // XRangeXMLConversion - virtual OUString SAL_CALL convertRangeToXML( const OUString& sRangeRepresentation ) - throw ( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override; + virtual OUString SAL_CALL convertRangeToXML( const OUString& sRangeRepresentation ) override; - virtual OUString SAL_CALL convertRangeFromXML( const OUString& sXMLRange ) - throw ( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override; + virtual OUString SAL_CALL convertRangeFromXML( const OUString& sXMLRange ) 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>& rListener) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener>& rListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) 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; + rServiceName) override; virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() throw( - css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; private: @@ -198,18 +165,16 @@ public: // XDataSource virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL - getDataSequences() throw (css::uno::RuntimeException, std::exception) override; + getDataSequences() 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; + rServiceName) override; virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() throw( - css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // implementation @@ -249,113 +214,75 @@ public: // 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; + SAL_CALL getData() override; + virtual OUString SAL_CALL getSourceRangeRepresentation() override; virtual css::uno::Sequence< OUString > - SAL_CALL generateLabel(css::chart2::data::LabelOrigin nOrigin) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL generateLabel(css::chart2::data::LabelOrigin nOrigin) override; /** Get the number format key for the n-th data entry * If nIndex == -1, then you will get the number format key for the first non-empty entry */ - virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override; // XNumericalDataSequence virtual css::uno::Sequence< double > - SAL_CALL getNumericalData() - throw (css::uno::RuntimeException, - std::exception) override; + SAL_CALL getNumericalData() override; // XTextualDataSequence virtual css::uno::Sequence< OUString > - SAL_CALL getTextualData() - throw (css::uno::RuntimeException, - std::exception) override; + SAL_CALL getTextualData() override; // XTimeBased - virtual sal_Bool SAL_CALL switchToNext(sal_Bool bWrap) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setToPointInTime(sal_Int32 nPoint) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL switchToNext(sal_Bool bWrap) override; + virtual sal_Bool SAL_CALL setToPointInTime(sal_Int32 nPoint) override; - virtual void SAL_CALL setRange(sal_Int32 nStart, sal_Int32 nEnd) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRange(sal_Int32 nStart, sal_Int32 nEnd) 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>& rListener) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener>& rListener) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) 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; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, - std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) 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; + rServiceName) override; virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() throw( - css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; private: void setDataChangedHint(bool b); diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index 0cc5e50eb89b..f0b715bb3c6c 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -63,45 +63,30 @@ public: virtual void SAL_CALL addNewByName( const OUString& aName, const css::awt::Rectangle& aRect, const css::uno::Sequence< css::table::CellRangeAddress >& aRanges, - sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) - throw(css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL removeByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) override; + virtual void SAL_CALL removeByName( const OUString& aName ) 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; }; typedef ::cppu::WeakComponentImplHelper< @@ -130,9 +115,7 @@ private: protected: // ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, - std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; @@ -155,40 +138,29 @@ public: using ScChartObj_Base::disposing; // XTableChart - virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHasColumnHeaders( sal_Bool bHasColumnHeaders ) - throw(css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL getHasRowHeaders() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders ) - throw(css::uno::RuntimeException, - std::exception) override; + virtual sal_Bool SAL_CALL getHasColumnHeaders() override; + virtual void SAL_CALL setHasColumnHeaders( sal_Bool bHasColumnHeaders ) override; + virtual sal_Bool SAL_CALL getHasRowHeaders() override; + virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders ) override; virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL - getRanges( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRanges( const css::uno::Sequence< css::table::CellRangeAddress >& aRanges ) - throw(css::uno::RuntimeException, - std::exception) override; + getRanges( ) override; + virtual void SAL_CALL setRanges( const css::uno::Sequence< css::table::CellRangeAddress >& aRanges ) override; // XEmbeddedObjectSupplier virtual css::uno::Reference< css::lang::XComponent > SAL_CALL - getEmbeddedObject() throw(css::uno::RuntimeException, std::exception) override; + getEmbeddedObject() override; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) 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 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; }; #endif diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx index caa8bff8bc1a..0d1f5a7919d0 100644 --- a/sc/inc/confuno.hxx +++ b/sc/inc/confuno.hxx @@ -46,48 +46,24 @@ public: // 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; }; #endif diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx index ceff23afb5b4..256d7690c66d 100644 --- a/sc/inc/cursuno.hxx +++ b/sc/inc/cursuno.hxx @@ -35,68 +35,51 @@ public: virtual ~ScCellCursorObj() override; 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; virtual void SAL_CALL release() throw() override; // XSheetCellCursor - virtual void SAL_CALL collapseToCurrentRegion() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL collapseToCurrentArray() - throw(css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL collapseToMergedArea() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL expandToEntireColumns() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL expandToEntireRows() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL collapseToCurrentRegion() override; + virtual void SAL_CALL collapseToCurrentArray() override; + virtual void SAL_CALL collapseToMergedArea() override; + virtual void SAL_CALL expandToEntireColumns() override; + virtual void SAL_CALL expandToEntireRows() override; + virtual void SAL_CALL collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) override; // XUsedAreaCursor - virtual void SAL_CALL gotoStartOfUsedArea( sal_Bool bExpand ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoEndOfUsedArea( sal_Bool bExpand ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoStartOfUsedArea( sal_Bool bExpand ) override; + virtual void SAL_CALL gotoEndOfUsedArea( sal_Bool bExpand ) override; // XCellCursor - virtual void SAL_CALL gotoStart() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoEnd() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoNext() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoPrevious() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoStart() override; + virtual void SAL_CALL gotoEnd() override; + virtual void SAL_CALL gotoNext() override; + virtual void SAL_CALL gotoPrevious() override; + virtual void SAL_CALL gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) override; // XSheetCellRange virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL - getSpreadsheet() throw(css::uno::RuntimeException, std::exception) override; + getSpreadsheet() 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; + 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 ) - throw(css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nRight, sal_Int32 nBottom ) override; using ScCellRangeObj::getCellRangeByName; virtual css::uno::Reference< css::table::XCellRange > SAL_CALL - getCellRangeByName( const OUString& aRange ) - throw(css::uno::RuntimeException, std::exception) override; + getCellRangeByName( const OUString& aRange ) 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/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index c4e7841640d0..b99538667267 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -100,48 +100,33 @@ public: // XDataPilotTables virtual css::uno::Reference< css::sheet::XDataPilotDescriptor > SAL_CALL - createDataPilotDescriptor() throw(css::uno::RuntimeException, std::exception) override; + createDataPilotDescriptor() override; virtual void SAL_CALL insertNewByName( const OUString& aName, const css::table::CellAddress& aOutputAddress, - const css::uno::Reference< css::sheet::XDataPilotDescriptor >& xDescriptor ) - throw(css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL removeByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sheet::XDataPilotDescriptor >& xDescriptor ) override; + virtual void SAL_CALL removeByName( const OUString& aName ) 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; }; // ScDataPilotDescriptorBase is never instantiated directly @@ -163,8 +148,7 @@ public: virtual ~ScDataPilotDescriptorBase() override; 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; virtual void SAL_CALL release() throw() override; @@ -179,82 +163,53 @@ public: // XDataPilotDescriptor // getName, setName, getTag, setTag in derived classes - virtual css::table::CellRangeAddress SAL_CALL getSourceRange() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSourceRange( const css::table::CellRangeAddress& aSourceRange ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getSourceRange() override; + virtual void SAL_CALL setSourceRange( const css::table::CellRangeAddress& aSourceRange ) override; virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL - getFilterDescriptor() throw(css::uno::RuntimeException, std::exception) override; + getFilterDescriptor() override; virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getDataPilotFields() throw(css::uno::RuntimeException, std::exception) override; + getDataPilotFields() override; virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getColumnFields() throw(css::uno::RuntimeException, std::exception) override; + getColumnFields() override; virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getRowFields() throw(css::uno::RuntimeException, std::exception) override; + getRowFields() override; virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getPageFields() throw(css::uno::RuntimeException, std::exception) override; + getPageFields() override; virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getDataFields() throw(css::uno::RuntimeException, std::exception) override; + getDataFields() override; virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getHiddenFields() throw(css::uno::RuntimeException, std::exception) override; + getHiddenFields() override; // 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; // XDataPilotDataLayoutFieldSupplier virtual css::uno::Reference< css::sheet::XDataPilotField > - SAL_CALL getDataLayoutField() - throw (css::uno::RuntimeException, - std::exception) override; + SAL_CALL getDataLayoutField() override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int8 >& aIdentifier ) override; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); SC_DLLPUBLIC static ScDataPilotDescriptorBase* getImplementation(const css::uno::Reference<css::sheet::XDataPilotDescriptor>& rObj); // XTypeProvider (override in ScDataPilotTableObj) - 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; // XServiceInfo is in derived classes }; @@ -272,20 +227,15 @@ public: virtual void SetDPObject(ScDPObject* pDPObj) override; // rest of XDataPilotDescriptor (incl. XNamed) - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTag() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTag( const OUString& aTag ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; + virtual OUString SAL_CALL getTag() override; + virtual void SAL_CALL setTag( const OUString& aTag ) 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 ScDataPilotTableObj : public ScDataPilotDescriptorBase, @@ -303,8 +253,7 @@ public: ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN); virtual ~ScDataPilotTableObj() override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -314,54 +263,38 @@ public: virtual void SetDPObject(ScDPObject* pDPObj) override; // rest of XDataPilotDescriptor (incl. XNamed) - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTag() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTag( const OUString& aTag ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; + virtual OUString SAL_CALL getTag() override; + virtual void SAL_CALL setTag( const OUString& aTag ) override; // XDataPilotTable - virtual css::table::CellRangeAddress SAL_CALL getOutputRange() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refresh() throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getOutputRange() override; + virtual void SAL_CALL refresh() override; // XDataPilotTable2 virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > - SAL_CALL getDrillDownData(const css::table::CellAddress& aAddr) - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getDrillDownData(const css::table::CellAddress& aAddr) override; virtual css::sheet::DataPilotTablePositionData - SAL_CALL getPositionData(const css::table::CellAddress& aAddr) - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getPositionData(const css::table::CellAddress& aAddr) override; - virtual void SAL_CALL insertDrillDownSheet(const css::table::CellAddress& aAddr) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertDrillDownSheet(const css::table::CellAddress& aAddr) override; - virtual css::table::CellRangeAddress SAL_CALL getOutputRangeByType( sal_Int32 nType ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getOutputRangeByType( sal_Int32 nType ) 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; // XTypeProvider (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::Sequence< css::uno::Type > SAL_CALL getTypes() 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 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; }; struct ScFieldIdentifier @@ -431,38 +364,26 @@ public: virtual ~ScDataPilotFieldsObj() 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; private: ScDataPilotFieldObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; @@ -498,54 +419,27 @@ public: virtual ~ScDataPilotFieldObj() override; // XNamed - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL setName(const OUString& aName) - throw (css::uno::RuntimeException, - std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& aName) override; // 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; - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - 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 ) 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; // XDatePilotField virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL - getItems() throw (css::uno::RuntimeException, std::exception) override; + getItems() override; // only called from property-functions: css::sheet::DataPilotFieldOrientation getOrientation() const; @@ -576,23 +470,14 @@ public: // XDataPilotFieldGrouping static bool HasString(const css::uno::Sequence< OUString >& aItems, const OUString& aString); virtual css::uno::Reference < css::sheet::XDataPilotField > SAL_CALL - createNameGroup(const css::uno::Sequence< OUString >& aItems) - throw (css::uno::RuntimeException, - css::lang::IllegalArgumentException, - std::exception) override; + createNameGroup(const css::uno::Sequence< OUString >& aItems) override; virtual css::uno::Reference < css::sheet::XDataPilotField > SAL_CALL - createDateGroup(const css::sheet::DataPilotFieldGroupInfo& rInfo) - throw (css::uno::RuntimeException, - css::lang::IllegalArgumentException, - std::exception) override; + createDateGroup(const css::sheet::DataPilotFieldGroupInfo& rInfo) 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; private: css::uno::Reference< css::container::XIndexAccess > @@ -633,64 +518,41 @@ public: virtual ~ScDataPilotFieldGroupsObj() 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; // 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; + const css::uno::Any& aElement ) override; // 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; + const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( 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 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; // implementation /// @throws css::uno::RuntimeException - ScFieldGroup& getFieldGroup( const OUString& rName ) throw(css::uno::RuntimeException); + ScFieldGroup& getFieldGroup( const OUString& rName ); /// @throws css::uno::RuntimeException - void renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) throw(css::uno::RuntimeException); + void renameFieldGroup( const OUString& rOldName, const OUString& rNewName ); private: ScFieldGroups::iterator implFindByName( const OUString& rName ); @@ -716,63 +578,39 @@ public: virtual ~ScDataPilotFieldGroupObj() 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; // 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; + const css::uno::Any& aElement ) override; // 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; + const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( 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 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; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) 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; private: ScDataPilotFieldGroupsObj& mrParent; @@ -793,17 +631,13 @@ public: virtual ~ScDataPilotFieldGroupItemObj() override; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) 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; private: ScDataPilotFieldGroupObj& mrParent; @@ -826,38 +660,26 @@ public: virtual ~ScDataPilotItemsObj() 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; private: ScDataPilotItemObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; @@ -882,56 +704,29 @@ public: virtual ~ScDataPilotItemObj() override; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // 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; private: SfxItemPropertySet maPropSet; diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 233e25645e0f..115d5e7b1c58 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -126,77 +126,47 @@ public: // XSubTotalDescriptor virtual void SAL_CALL addNew( const css::uno::Sequence< css::sheet::SubTotalColumn >& aSubTotalColumns, - sal_Int32 nGroupColumn ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear() throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 nGroupColumn ) override; + virtual void SAL_CALL clear() 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; // 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; // 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScSubTotalDescriptorBase* getImplementation(const css::uno::Reference<css::sheet::XSubTotalDescriptor>& rObj); // 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; }; // ScSubTotalDescriptor - dummy container to use with XImportTarget @@ -247,22 +217,17 @@ public: virtual ~ScSubTotalFieldObj() override; // XSubTotalField - virtual sal_Int32 SAL_CALL getGroupColumn() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroupColumn( sal_Int32 nGroupColumn ) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getGroupColumn() override; + virtual void SAL_CALL setGroupColumn( sal_Int32 nGroupColumn ) override; virtual css::uno::Sequence< css::sheet::SubTotalColumn > SAL_CALL - getSubTotalColumns() throw(css::uno::RuntimeException, std::exception) override; + getSubTotalColumns() override; virtual void SAL_CALL setSubTotalColumns( const css::uno::Sequence< - css::sheet::SubTotalColumn >& aSubTotalColumns ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::SubTotalColumn >& aSubTotalColumns ) 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 ScConsolidationDescriptor : public cppu::WeakImplHelper< @@ -280,36 +245,25 @@ public: const ScConsolidateParam& GetParam() const { return aParam; } // XConsolidationDescriptor - virtual css::sheet::GeneralFunction SAL_CALL getFunction() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFunction( css::sheet::GeneralFunction nFunction ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::sheet::GeneralFunction SAL_CALL getFunction() override; + virtual void SAL_CALL setFunction( css::sheet::GeneralFunction nFunction ) override; virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL - getSources( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSources( const css::uno::Sequence< css::table::CellRangeAddress >& aSources ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::table::CellAddress SAL_CALL getStartOutputPosition() - throw(css::uno::RuntimeException, std::exception) override; + getSources( ) override; + virtual void SAL_CALL setSources( const css::uno::Sequence< css::table::CellRangeAddress >& aSources ) override; + virtual css::table::CellAddress SAL_CALL getStartOutputPosition() override; virtual void SAL_CALL setStartOutputPosition( - const css::table::CellAddress& aStartOutputPosition ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getUseColumnHeaders() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setUseColumnHeaders( sal_Bool bUseColumnHeaders ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getUseRowHeaders() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setUseRowHeaders( sal_Bool bUseRowHeaders ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getInsertLinks() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInsertLinks( sal_Bool bInsertLinks ) - throw(css::uno::RuntimeException, std::exception) override; + const css::table::CellAddress& aStartOutputPosition ) override; + virtual sal_Bool SAL_CALL getUseColumnHeaders() override; + virtual void SAL_CALL setUseColumnHeaders( sal_Bool bUseColumnHeaders ) override; + virtual sal_Bool SAL_CALL getUseRowHeaders() override; + virtual void SAL_CALL setUseRowHeaders( sal_Bool bUseRowHeaders ) override; + virtual sal_Bool SAL_CALL getInsertLinks() override; + virtual void SAL_CALL setInsertLinks( sal_Bool bInsertLinks ) 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; }; // ScFilterDescriptorBase - base class for FilterDescriptor @@ -342,73 +296,46 @@ public: // XSheetFilterDescriptor virtual css::uno::Sequence< css::sheet::TableFilterField > SAL_CALL - getFilterFields() throw(css::uno::RuntimeException, std::exception) override; + getFilterFields() override; virtual void SAL_CALL setFilterFields( const css::uno::Sequence< - css::sheet::TableFilterField >& aFilterFields ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::TableFilterField >& aFilterFields ) override; // XSheetFilterDescriptor2 virtual css::uno::Sequence< css::sheet::TableFilterField2 > SAL_CALL - getFilterFields2() throw(css::uno::RuntimeException, std::exception) override; + getFilterFields2() override; virtual void SAL_CALL setFilterFields2( const css::uno::Sequence< - css::sheet::TableFilterField2 >& aFilterFields ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::TableFilterField2 >& aFilterFields ) override; // XSheetFilterDescriptor3 virtual css::uno::Sequence< css::sheet::TableFilterField3 > SAL_CALL - getFilterFields3() throw(css::uno::RuntimeException, std::exception) override; + getFilterFields3() override; virtual void SAL_CALL setFilterFields3( const css::uno::Sequence< - css::sheet::TableFilterField3 >& aFilterFields ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::TableFilterField3 >& aFilterFields ) override; // 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; + 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; + 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; + 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; + 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; }; // ScFilterDescriptor - dummy container to use with XFilterable @@ -499,85 +426,56 @@ public: void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XDatabaseRange - virtual css::table::CellRangeAddress SAL_CALL getDataArea() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataArea( const css::table::CellRangeAddress& aDataArea ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getDataArea() override; + virtual void SAL_CALL setDataArea( const css::table::CellRangeAddress& aDataArea ) override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - getSortDescriptor() throw(css::uno::RuntimeException, std::exception) override; + getSortDescriptor() override; virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL - getFilterDescriptor() throw(css::uno::RuntimeException, std::exception) override; + getFilterDescriptor() override; virtual css::uno::Reference< css::sheet::XSubTotalDescriptor > SAL_CALL - getSubTotalDescriptor() throw(css::uno::RuntimeException, std::exception) override; + getSubTotalDescriptor() override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - getImportDescriptor() throw(css::uno::RuntimeException, std::exception) override; + getImportDescriptor() 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 >& l ) - throw(css::uno::RuntimeException, std::exception) override; + css::util::XRefreshListener >& l ) override; virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< - css::util::XRefreshListener >& l ) - throw(css::uno::RuntimeException, std::exception) override; + css::util::XRefreshListener >& l ) override; // XCellRangeReferrer virtual css::uno::Reference< css::table::XCellRange > SAL_CALL - getReferredCells() throw(css::uno::RuntimeException, std::exception) override; + getReferredCells() override; // 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; + 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; + 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; + 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; + 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 ScDatabaseRangesObj : public cppu::WeakImplHelper< @@ -601,44 +499,30 @@ public: // XDatabaseRanges virtual void SAL_CALL addNewByName( const OUString& aName, - const css::table::CellRangeAddress& aRange ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aRange ) override; + virtual void SAL_CALL removeByName( const OUString& aName ) override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() throw(css::uno::RuntimeException, std::exception) override; + 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 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; // 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& 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; // 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 ScUnnamedDatabaseRangesObj : public cppu::WeakImplHelper< @@ -655,16 +539,9 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XUnnamedDatabaseRanges - virtual void SAL_CALL setByTable( const css::table::CellRangeAddress& aRange ) - throw(css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByTable( sal_Int32 nTab ) - throw(css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - css::container::NoSuchElementException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByTable( sal_Int32 nTab ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; + virtual void SAL_CALL setByTable( const css::table::CellRangeAddress& aRange ) override; + virtual css::uno::Any SAL_CALL getByTable( sal_Int32 nTab ) override; + virtual sal_Bool SAL_CALL hasByTable( sal_Int32 nTab ) override; }; #endif diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx index 62b80274fb4b..6fa01fbcd104 100644 --- a/sc/inc/defltuno.hxx +++ b/sc/inc/defltuno.hxx @@ -49,66 +49,33 @@ public: // 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; // XPropertyState virtual css::beans::PropertyState SAL_CALL getPropertyState( - const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + const OUString& PropertyName ) 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; + 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 ) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + 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; }; #endif diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index b54ad2fd5ae6..c6dab173dc44 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -60,27 +60,22 @@ public: 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; + 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 ) - throw(css::uno::RuntimeException, std::exception) override; + 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; + getSlaveDispatchProvider() override; virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< - css::frame::XDispatchProvider >& xNewDispatchProvider ) - throw(css::uno::RuntimeException, std::exception) override; + css::frame::XDispatchProvider >& xNewDispatchProvider ) override; virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL - getMasterDispatchProvider() throw(css::uno::RuntimeException, std::exception) override; + getMasterDispatchProvider() override; virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< - css::frame::XDispatchProvider >& xNewSupplier ) - throw(css::uno::RuntimeException, std::exception) override; + 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; }; class ScDispatch : public cppu::WeakImplHelper< @@ -103,24 +98,17 @@ public: /// 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; + 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 ) - throw(css::uno::RuntimeException, - std::exception) override; + const css::util::URL& aURL ) 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; + 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; }; #endif diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 55957f37ae2d..d4969581dfab 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -143,8 +143,7 @@ public: void NotifyChanges( const OUString& rOperation, const ScRangeList& rRanges, const css::uno::Sequence< css::beans::PropertyValue >& rProperties ); - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -152,205 +151,136 @@ public: /// XSpreadsheetDocument virtual css::uno::Reference< css::sheet::XSpreadsheets > SAL_CALL - getSheets() throw(css::uno::RuntimeException, std::exception) override; + getSheets() override; /// XStyleFamiliesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getStyleFamilies() throw(css::uno::RuntimeException, std::exception) override; + getStyleFamilies() override; /// 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; + 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 ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + 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 ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override; /// XLinkTargetSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getLinks() throw(css::uno::RuntimeException, std::exception) override; + getLinks() override; /// XActionLockable - virtual sal_Bool SAL_CALL isActionLocked() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionLock() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionLock() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL resetActionLocks() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActionLocked() override; + virtual void SAL_CALL addActionLock() override; + virtual void SAL_CALL removeActionLock() override; + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) override; + virtual sal_Int16 SAL_CALL resetActionLocks() 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 void SAL_CALL lockControllers() override; + virtual void SAL_CALL unlockControllers() override; /// XCalculatable - virtual void SAL_CALL calculate() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL calculateAll() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutomaticCalculationEnabled() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enableAutomaticCalculation( sal_Bool bEnabled ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL calculate() override; + virtual void SAL_CALL calculateAll() override; + virtual sal_Bool SAL_CALL isAutomaticCalculationEnabled() override; + virtual void SAL_CALL enableAutomaticCalculation( sal_Bool bEnabled ) override; /// XProtectable - virtual void SAL_CALL protect( const OUString& aPassword ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unprotect( const OUString& aPassword ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isProtected() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL protect( const OUString& aPassword ) override; + virtual void SAL_CALL unprotect( const OUString& aPassword ) override; + virtual sal_Bool SAL_CALL isProtected() override; /// XDrawPagesSupplier virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL - getDrawPages() throw(css::uno::RuntimeException, std::exception) override; + getDrawPages() override; /// XGoalSeek virtual css::sheet::GoalResult SAL_CALL seekGoal( const css::table::CellAddress& aFormulaPosition, const css::table::CellAddress& aVariablePosition, - const OUString& aGoalValue ) - throw (css::uno::RuntimeException, - std::exception) override; + const OUString& aGoalValue ) override; /// XConsolidatable virtual css::uno::Reference< css::sheet::XConsolidationDescriptor > - SAL_CALL createConsolidationDescriptor( sal_Bool bEmpty ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL consolidate( const css::uno::Reference< css::sheet::XConsolidationDescriptor >& xDescriptor ) - throw (css::uno::RuntimeException, - std::exception) override; + SAL_CALL createConsolidationDescriptor( sal_Bool bEmpty ) override; + virtual void SAL_CALL consolidate( const css::uno::Reference< css::sheet::XConsolidationDescriptor >& xDescriptor ) override; /// XDocumentAuditing - virtual void SAL_CALL refreshArrows() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refreshArrows() override; /// XViewDataSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getViewData( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getViewData( ) override; /// 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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; /// XMultiServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - createInstance( const OUString& aServiceSpecifier ) - throw(css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + createInstance( const OUString& aServiceSpecifier ) 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; /// 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScModelObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); /// 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; /// XChangesNotifier - virtual void SAL_CALL addChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) override; + virtual void SAL_CALL removeChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) override; // XOpenCLSelection - virtual sal_Bool SAL_CALL isOpenCLEnabled() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isOpenCLEnabled() override; - virtual void SAL_CALL enableOpenCL(sal_Bool bEnable) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enableOpenCL(sal_Bool bEnable) override; - virtual void SAL_CALL enableAutomaticDeviceSelection(sal_Bool bForce) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enableAutomaticDeviceSelection(sal_Bool bForce) override; - virtual void SAL_CALL disableAutomaticDeviceSelection() - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disableAutomaticDeviceSelection() override; - virtual void SAL_CALL selectOpenCLDevice( sal_Int32 platform, sal_Int32 device ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectOpenCLDevice( sal_Int32 platform, sal_Int32 device ) override; - virtual sal_Int32 SAL_CALL getPlatformID() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getPlatformID() override; - virtual sal_Int32 SAL_CALL getDeviceID() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDeviceID() override; virtual css::uno::Sequence< css::sheet::opencl::OpenCLPlatform > - SAL_CALL getOpenCLPlatforms() - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getOpenCLPlatforms() override; - virtual void SAL_CALL enableOpcodeSubsetTest() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enableOpcodeSubsetTest() override; - virtual void SAL_CALL disableOpcodeSubsetTest() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disableOpcodeSubsetTest() override; - virtual sal_Bool SAL_CALL isOpcodeSubsetTested() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isOpcodeSubsetTested() override; - virtual void SAL_CALL setFormulaCellNumberLimit( sal_Int32 number ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormulaCellNumberLimit( sal_Int32 number ) override; - virtual sal_Int32 SAL_CALL getFormulaCellNumberLimit() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getFormulaCellNumberLimit() override; /// @see vcl::ITiledRenderable::paintTile(). virtual void paintTile( VirtualDevice& rDevice, @@ -447,30 +377,21 @@ public: /// XDrawPages virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL - insertNewByIndex( sal_Int32 nIndex ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) - throw(css::uno::RuntimeException, std::exception) override; + insertNewByIndex( sal_Int32 nIndex ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) 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; /// 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 ScTableSheetsObj : public cppu::WeakImplHelper< @@ -494,92 +415,58 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XSpreadsheets - virtual void SAL_CALL insertNewByName( const OUString& aName, sal_Int16 nPosition ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveByName( const OUString& aName, sal_Int16 nDestination ) - throw(css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL insertNewByName( const OUString& aName, sal_Int16 nPosition ) override; + virtual void SAL_CALL moveByName( const OUString& aName, sal_Int16 nDestination ) override; virtual void SAL_CALL copyByName( const OUString& aName, - const OUString& aCopy, sal_Int16 nDestination ) - throw(css::uno::RuntimeException, - std::exception) override; + const OUString& aCopy, sal_Int16 nDestination ) override; /// XSpreadsheets2 virtual sal_Int32 SAL_CALL importSheet( const css::uno::Reference< css::sheet::XSpreadsheetDocument > & xDocSrc, const OUString& srcName, - sal_Int32 nDestPosition) - throw(css::lang::IllegalArgumentException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nDestPosition) override; /// XCellRangesAccess virtual css::uno::Reference< css::table::XCell > - SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow, sal_Int32 nSheet ) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow, sal_Int32 nSheet ) override; virtual css::uno::Reference< css::table::XCellRange > - SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom, sal_Int32 nSheet ) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom, sal_Int32 nSheet ) override; virtual css::uno::Sequence < css::uno::Reference< css::table::XCellRange > > - SAL_CALL getCellRangesByName( const OUString& aRange ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + SAL_CALL getCellRangesByName( const OUString& aRange ) override; /// 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; + 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; + const css::uno::Any& aElement ) 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; /// 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; /// 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; /// 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 ScTableColumnsObj : public cppu::WeakImplHelper< @@ -607,82 +494,46 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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; /// 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; /// 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 ScTableRowsObj : public cppu::WeakImplHelper< @@ -708,71 +559,40 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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; /// 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; /// 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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 ScSpreadsheetSettingsObj : public cppu::WeakImplHelper< @@ -785,47 +605,23 @@ public: /// 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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 ScAnnotationsObj : public cppu::WeakImplHelper< @@ -849,36 +645,25 @@ public: /// XSheetAnnotations virtual void SAL_CALL insertNew( const css::table::CellAddress& aPosition, - const OUString& aText ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(css::uno::RuntimeException, std::exception) override; + const OUString& aText ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) 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; }; class ScScenariosObj : public cppu::WeakImplHelper< @@ -905,44 +690,30 @@ public: /// XScenarios virtual void SAL_CALL addNewByName( const OUString& aName, const css::uno::Sequence< css::table::CellRangeAddress >& aRanges, - const OUString& aComment ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + const OUString& aComment ) override; + virtual void SAL_CALL removeByName( const OUString& aName ) 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 diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 128853020ee8..2cb65bae2617 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -179,75 +179,45 @@ public: // XDimensionsSupplier virtual css::uno::Reference< css::container::XNameAccess > - SAL_CALL getDimensions( ) - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getDimensions( ) override; // XDataPilotResults - virtual css::uno::Sequence< css::uno::Sequence< css::sheet::DataResult > > SAL_CALL getResults( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::sheet::DataResult > > SAL_CALL getResults( ) override; virtual css::uno::Sequence<double> SAL_CALL getFilteredResults( - const css::uno::Sequence<css::sheet::DataPilotFieldFilter>& aFilters ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::sheet::DataPilotFieldFilter>& aFilters ) override; // 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; // XDrillDownDataSupplier virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDrillDownData(const css::uno::Sequence< - css::sheet::DataPilotFieldFilter >& aFilters ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::DataPilotFieldFilter >& aFilters ) override; // 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; #if DUMP_PIVOT_TABLE void DumpResults() const; @@ -270,27 +240,18 @@ public: void CountChanged(); // 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; // 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; long getCount() const; ScDPDimension* getByIndex(long nIndex) const; @@ -335,63 +296,38 @@ public: const OUString* GetSubtotalName() const; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XHierarchiesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getHierarchies() throw(css::uno::RuntimeException, std::exception) override; + getHierarchies() override; // XCloneable virtual css::uno::Reference< css::util::XCloneable > SAL_CALL - createClone() throw(css::uno::RuntimeException, std::exception) override; + createClone() override; // 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; + 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; sal_uInt16 getOrientation() const; bool getIsDataLayoutDimension() const; @@ -422,27 +358,18 @@ public: virtual ~ScDPHierarchies() 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; // 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 long getCount(); ScDPHierarchy* getByIndex(long nIndex) const; @@ -466,21 +393,17 @@ public: ScDPLevels* GetLevelsObject(); // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XLevelsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getLevels() throw(css::uno::RuntimeException, std::exception) override; + getLevels() 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 ScDPLevels : public cppu::WeakImplHelper< @@ -499,27 +422,18 @@ public: virtual ~ScDPLevels() 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; // 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; long getCount() const; ScDPLevel* getByIndex(long nIndex) const; @@ -557,62 +471,37 @@ public: ScDPMembers* GetMembersObject(); // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XMembersSupplier virtual css::uno::Reference< css::sheet::XMembersAccess > SAL_CALL - getMembers() throw(css::uno::RuntimeException, std::exception) override; + getMembers() override; // XDataPilotMemberResults virtual css::uno::Sequence< css::sheet::MemberResult > SAL_CALL - getResults() throw(css::uno::RuntimeException, std::exception) override; + getResults() override; // 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; css::uno::Sequence<sal_Int16> getSubTotals() const; bool getShowEmpty() const { return bShowEmpty;} @@ -673,31 +562,21 @@ public: virtual ~ScDPMembers() override; // XMembersAccess - virtual css::uno::Sequence< OUString > SAL_CALL getLocaleIndependentElementNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getLocaleIndependentElementNames() 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; // 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; long getCount() const { return nMbrCount;} ScDPMember* getByIndex(long nIndex) const; @@ -709,8 +588,7 @@ public: private: /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > getElementNames( bool bLocaleIndependent ) const - throw(css::uno::RuntimeException, std::exception); + css::uno::Sequence< OUString > getElementNames( bool bLocaleIndependent ) const; }; class ScDPMember : public cppu::WeakImplHelper< @@ -749,54 +627,29 @@ public: sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // 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; bool isVisible() const { return bVisible;} bool getShowDetails() const { return bShowDet;} diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx index 8099aa55e3f5..504c7cd5cdcc 100644 --- a/sc/inc/eventuno.hxx +++ b/sc/inc/eventuno.hxx @@ -46,34 +46,21 @@ public: // 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; + 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; // 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/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index 79fc090fe412..e176ac862de9 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -79,42 +79,30 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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; // XContainer - virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override; // 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; // 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 ScHeaderFieldsObj : public cppu::WeakImplHelper< @@ -141,42 +129,30 @@ public: virtual ~ScHeaderFieldsObj() 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; // XContainer - virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override; // 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; // 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; }; /** @@ -240,77 +216,44 @@ public: ScEditSource* pEditSrc, const ESelection& rSel); // 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; // 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 void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getAnchor() throw(css::uno::RuntimeException, std::exception) override; + 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; // 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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; // 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; // 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/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx index 12d22860e294..01acc3ccc565 100644 --- a/sc/inc/filtuno.hxx +++ b/sc/inc/filtuno.hxx @@ -53,37 +53,24 @@ 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; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< 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; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< 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; }; #endif diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 547989d82d31..045f5d0c69ba 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -88,52 +88,37 @@ public: formula::FormulaGrammar::Grammar eGrammar) const; // XSheetConditionalEntries - virtual void SAL_CALL addNew( const css::uno::Sequence< css::beans::PropertyValue >& aConditionalEntry ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addNew( const css::uno::Sequence< css::beans::PropertyValue >& aConditionalEntry ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) override; + virtual void SAL_CALL clear() 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; // 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; // 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; // 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTableConditionalFormat* getImplementation(const css::uno::Reference<css::sheet::XSheetConditionalEntries>& rObj); // 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 ScTableConditionalEntry : public cppu::WeakImplHelper< @@ -152,37 +137,25 @@ public: void GetData(ScCondFormatEntryItem& rData) const; // XSheetCondition - virtual css::sheet::ConditionOperator SAL_CALL getOperator() - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getConditionOperator() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOperator( css::sheet::ConditionOperator nOperator ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) - throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula1() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) - throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula2() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::table::CellAddress SAL_CALL getSourcePosition() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSourcePosition( const css::table::CellAddress& aSourcePosition ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::sheet::ConditionOperator SAL_CALL getOperator() override; + virtual sal_Int32 SAL_CALL getConditionOperator() override; + virtual void SAL_CALL setOperator( css::sheet::ConditionOperator nOperator ) override; + virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) override; + virtual OUString SAL_CALL getFormula1() override; + virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) override; + virtual OUString SAL_CALL getFormula2() override; + virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) override; + virtual css::table::CellAddress SAL_CALL getSourcePosition() override; + virtual void SAL_CALL setSourcePosition( const css::table::CellAddress& aSourcePosition ) override; // XSheetConditionalEntry - virtual OUString SAL_CALL getStyleName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStyleName( const OUString& aStyleName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getStyleName() override; + virtual void SAL_CALL setStyleName( const OUString& aStyleName ) 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 ScTableValidationObj : public cppu::WeakImplHelper< @@ -229,85 +202,50 @@ public: formula::FormulaGrammar::Grammar eGrammar ) const; // XSheetCondition - virtual css::sheet::ConditionOperator SAL_CALL getOperator() - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getConditionOperator() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOperator( css::sheet::ConditionOperator nOperator ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) - throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula1() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) - throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula2() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::table::CellAddress SAL_CALL getSourcePosition() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSourcePosition( const css::table::CellAddress& aSourcePosition ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::sheet::ConditionOperator SAL_CALL getOperator() override; + virtual sal_Int32 SAL_CALL getConditionOperator() override; + virtual void SAL_CALL setOperator( css::sheet::ConditionOperator nOperator ) override; + virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) override; + virtual OUString SAL_CALL getFormula1() override; + virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) override; + virtual OUString SAL_CALL getFormula2() override; + virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) override; + virtual css::table::CellAddress SAL_CALL getSourcePosition() override; + virtual void SAL_CALL setSourcePosition( const css::table::CellAddress& aSourcePosition ) override; // XMultiFormulaTokens virtual css::uno::Sequence< css::sheet::FormulaToken > - SAL_CALL getTokens( sal_Int32 nIndex ) - throw(css::uno::RuntimeException,css::lang::IndexOutOfBoundsException, std::exception) override; + SAL_CALL getTokens( sal_Int32 nIndex ) override; virtual void SAL_CALL setTokens( sal_Int32 nIndex, - const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) - throw(css::uno::RuntimeException,css::lang::IndexOutOfBoundsException, std::exception) override; - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) override; + virtual sal_Int32 SAL_CALL getCount() override; // 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; // 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTableValidationObj* getImplementation(const css::uno::Reference<css::beans::XPropertySet>& rObj); // 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/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index 267c7f31706c..ad32fb6d3e54 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -73,55 +73,27 @@ public: // XFunctionAccess virtual css::uno::Any SAL_CALL callFunction( const OUString& aName, - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; // 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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; }; #endif diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index efbfc35311fa..f6f0a3e97b86 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -72,56 +72,29 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // 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; // 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; // aus get/setPropertyValue gerufen: OUString getFileName() const; @@ -134,12 +107,9 @@ public: void setRefreshDelay(sal_Int32 nRefreshDelay); // 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 ScSheetLinksObj : public cppu::WeakImplHelper< @@ -162,38 +132,26 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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; }; class ScAreaLinkObj : public cppu::WeakImplHelper< @@ -222,50 +180,24 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // 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; // 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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; // called from get/setPropertyValue: OUString getFileName() const; @@ -278,21 +210,15 @@ public: void setRefreshDelay(sal_Int32 nRefreshDelay); // XAreaLink - virtual OUString SAL_CALL getSourceArea() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSourceArea( const OUString& aSourceArea ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::table::CellRangeAddress SAL_CALL getDestArea() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDestArea( const css::table::CellRangeAddress& aDestArea ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSourceArea() override; + virtual void SAL_CALL setSourceArea( const OUString& aSourceArea ) override; + virtual css::table::CellRangeAddress SAL_CALL getDestArea() override; + virtual void SAL_CALL setDestArea( const css::table::CellRangeAddress& aDestArea ) 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 ScAreaLinksObj : public cppu::WeakImplHelper< @@ -317,34 +243,25 @@ public: const OUString& aFileName, const OUString& aSourceArea, const OUString& aFilter, - const OUString& aFilterOptions ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(css::uno::RuntimeException, std::exception) override; + const OUString& aFilterOptions ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) 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; }; //! order of XNamed and DDELink changed to avoid "duplicate comdat" symbols @@ -374,40 +291,29 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XDDELink - virtual OUString SAL_CALL getApplication() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTopic() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getItem() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getApplication() override; + virtual OUString SAL_CALL getTopic() override; + virtual OUString SAL_CALL getItem() override; // 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; // XDDELinkResults virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > - SAL_CALL getResults( ) - throw (css::uno::RuntimeException, - std::exception) override; + SAL_CALL getResults( ) override; virtual void SAL_CALL setResults( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aResults ) - throw (css::uno::RuntimeException, - std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aResults ) 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 ScDDELinksObj : public cppu::WeakImplHelper< @@ -430,45 +336,31 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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; // XDDELinks virtual css::uno::Reference< css::sheet::XDDELink > SAL_CALL addDDELink( const OUString& aApplication, const OUString& aTopic, - const OUString& aItem, css::sheet::DDELinkMode nMode ) - throw (css::uno::RuntimeException, - std::exception) override; + const OUString& aItem, css::sheet::DDELinkMode nMode ) 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 ScExternalSheetCacheObj : public cppu::WeakImplHelper< css::sheet::XExternalSheetCache > @@ -479,21 +371,16 @@ public: // XExternalSheetCache virtual void SAL_CALL setCellValue( - sal_Int32 nCol, sal_Int32 nRow, const css::uno::Any& rAny) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + sal_Int32 nCol, sal_Int32 nRow, const css::uno::Any& rAny) override; - virtual css::uno::Any SAL_CALL getCellValue(sal_Int32 nCol, sal_Int32 nRow) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCellValue(sal_Int32 nCol, sal_Int32 nRow) override; - virtual css::uno::Sequence< sal_Int32 > SAL_CALL getAllRows() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getAllRows() override; - virtual css::uno::Sequence< sal_Int32 > SAL_CALL getAllColumns(sal_Int32 nRow) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getAllColumns(sal_Int32 nRow) override; // Attributes - virtual sal_Int32 SAL_CALL getTokenIndex() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTokenIndex() override; private: ScExternalSheetCacheObj(const ScExternalSheetCacheObj&) = delete; @@ -512,38 +399,27 @@ public: // XExternalDocLink virtual css::uno::Reference< css::sheet::XExternalSheetCache > - SAL_CALL addSheetCache( const OUString& aSheetName, sal_Bool bDynamicCache ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL addSheetCache( const OUString& aSheetName, sal_Bool bDynamicCache ) 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 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 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; // Attributes - virtual sal_Int32 SAL_CALL getTokenIndex() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTokenIndex() override; private: ScDocShell* mpDocShell; @@ -560,34 +436,24 @@ public: // XExternalDocLinks virtual css::uno::Reference< css::sheet::XExternalDocLink > - SAL_CALL addDocLink( const OUString& aDocName ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL addDocLink( const OUString& aDocName ) 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 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 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; private: ScExternalDocLinksObj(const ScExternalDocLinksObj&) = delete; diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index d939d77a6759..e3af738b95b9 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -32,18 +32,15 @@ #define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii ) \ OUString SAL_CALL ClassName::getImplementationName() \ - throw(css::uno::RuntimeException, std::exception) \ { \ return OUString(ClassNameAscii); \ } \ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ - throw(css::uno::RuntimeException, std::exception) \ { \ return cppu::supportsService(this, ServiceName); \ } \ css::uno::Sequence< OUString > \ SAL_CALL ClassName::getSupportedServiceNames() \ - throw(css::uno::RuntimeException, std::exception) \ { \ css::uno::Sequence< OUString > aRet { ServiceAscii }; \ return aRet; \ @@ -52,23 +49,15 @@ css::uno::Sequence< OUString > \ #define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName ) \ void SAL_CALL ClassName::addPropertyChangeListener( const OUString&, \ const uno::Reference<beans::XPropertyChangeListener>&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException, std::exception) \ { OSL_FAIL("not implemented"); } \ void SAL_CALL ClassName::removePropertyChangeListener( const OUString&, \ const uno::Reference<beans::XPropertyChangeListener>&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException, std::exception) \ { OSL_FAIL("not implemented"); } \ void SAL_CALL ClassName::addVetoableChangeListener( const OUString&, \ const uno::Reference<beans::XVetoableChangeListener>&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException, std::exception) \ { OSL_FAIL("not implemented"); } \ void SAL_CALL ClassName::removeVetoableChangeListener( const OUString&, \ const uno::Reference<beans::XVetoableChangeListener>&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException, std::exception) \ { OSL_FAIL("not implemented"); } #define SC_QUERYINTERFACE(x) \ @@ -97,19 +86,13 @@ public: virtual ~ScIndexEnumeration() 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 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; }; // new (uno 3) variant @@ -127,24 +110,17 @@ public: virtual ~ScNameToIndexAccess() 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; // 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 SC_DLLPUBLIC ScUnoHelpFunctions diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index befd15efe3bf..62375e598007 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -75,88 +75,50 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XNamedRange - virtual OUString SAL_CALL getContent() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setContent( const OUString& aContent ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual css::table::CellAddress SAL_CALL getReferencePosition() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getContent() override; + virtual void SAL_CALL setContent( const OUString& aContent ) override; + virtual css::table::CellAddress SAL_CALL getReferencePosition() override; virtual void SAL_CALL setReferencePosition( - const css::table::CellAddress& aReferencePosition ) - 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 nType ) - throw (css::uno::RuntimeException, - std::exception) override; + const css::table::CellAddress& aReferencePosition ) override; + virtual sal_Int32 SAL_CALL getType() override; + virtual void SAL_CALL setType( sal_Int32 nType ) override; /// XFormulaTokens - virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens() - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL setTokens( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens() override; + virtual void SAL_CALL setTokens( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) override; /// XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; /// XCellRangeReferrer virtual css::uno::Reference< css::table::XCellRange > SAL_CALL - getReferredCells() throw(css::uno::RuntimeException, std::exception) override; + getReferredCells() override; /// 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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; /// 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); /// 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 ScNamedRangesObj : public ::cppu::WeakImplHelper< @@ -200,95 +162,57 @@ public: /// XNamedRanges virtual void SAL_CALL addNewByName( const OUString& aName, const OUString& aContent, - const css::table::CellAddress& aPosition, sal_Int32 nType ) - throw (css::uno::RuntimeException, - std::exception) override; + const css::table::CellAddress& aPosition, sal_Int32 nType ) override; virtual void SAL_CALL addNewFromTitles( const css::table::CellRangeAddress& aSource, - css::sheet::Border aBorder ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL outputList( const css::table::CellAddress& aOutputPosition ) - throw(css::uno::RuntimeException, std::exception) override; + css::sheet::Border aBorder ) override; + virtual void SAL_CALL removeByName( const OUString& aName ) override; + virtual void SAL_CALL outputList( const css::table::CellAddress& aOutputPosition ) 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; /// 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; + 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; /// XActionLockable - virtual sal_Bool SAL_CALL isActionLocked() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionLock() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionLock() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL resetActionLocks() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isActionLocked() override; + virtual void SAL_CALL addActionLock() override; + virtual void SAL_CALL removeActionLock() override; + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) override; + virtual sal_Int16 SAL_CALL resetActionLocks() 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 ScGlobalNamedRangesObj: public ScNamedRangesObj @@ -343,22 +267,15 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XLabelRange - virtual css::table::CellRangeAddress SAL_CALL getLabelArea() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabelArea( const css::table::CellRangeAddress& aLabelArea ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::table::CellRangeAddress SAL_CALL getDataArea() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataArea( const css::table::CellRangeAddress& aDataArea ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellRangeAddress SAL_CALL getLabelArea() override; + virtual void SAL_CALL setLabelArea( const css::table::CellRangeAddress& aLabelArea ) override; + virtual css::table::CellRangeAddress SAL_CALL getDataArea() override; + virtual void SAL_CALL setDataArea( const css::table::CellRangeAddress& aDataArea ) 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 ScLabelRangesObj : public ::cppu::WeakImplHelper< @@ -381,34 +298,25 @@ public: /// XLabelRanges virtual void SAL_CALL addNew( const css::table::CellRangeAddress& aLabelArea, - const css::table::CellRangeAddress& aDataArea ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(css::uno::RuntimeException, std::exception) override; + const css::table::CellRangeAddress& aDataArea ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) 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 diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx index e849b3e3da86..015132a7b4fa 100644 --- a/sc/inc/notesuno.hxx +++ b/sc/inc/notesuno.hxx @@ -50,66 +50,46 @@ public: /// 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( const css::uno::Reference< - css::uno::XInterface >& Parent ) - throw(css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + css::uno::XInterface >& Parent ) 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 >& aTextPosition ) - throw(css::uno::RuntimeException, std::exception) override; + 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 ) - 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; /// XTextRange virtual css::uno::Reference< css::text::XText > SAL_CALL - getText() throw(css::uno::RuntimeException, std::exception) override; + getText() override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getStart() throw(css::uno::RuntimeException, std::exception) override; + 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& aString ) - throw(css::uno::RuntimeException, std::exception) override; + getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString( const OUString& aString ) override; /// XSheetAnnotation - virtual css::table::CellAddress SAL_CALL getPosition() - throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAuthor() - throw(css::uno::RuntimeException, - std::exception) override; - virtual OUString SAL_CALL getDate() - throw(css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL getIsVisible() - throw(css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL setIsVisible( sal_Bool bIsVisible ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellAddress SAL_CALL getPosition() override; + virtual OUString SAL_CALL getAuthor() override; + virtual OUString SAL_CALL getDate() override; + virtual sal_Bool SAL_CALL getIsVisible() override; + virtual void SAL_CALL setIsVisible( sal_Bool bIsVisible ) override; /// XSheetAnnotationShapeSupplier virtual css::uno::Reference < css::drawing::XShape > SAL_CALL - getAnnotationShape() - throw(css::uno::RuntimeException, - std::exception) override; + getAnnotationShape() 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; private: SvxUnoText& GetUnoText(); diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index ca201c342a29..84dbc7665ce8 100644 --- a/sc/inc/optuno.hxx +++ b/sc/inc/optuno.hxx @@ -66,18 +66,9 @@ public: // get/setPropertyValue override to used stored options instead of document 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; }; #endif diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx index f7303919799b..4da521a9359d 100644 --- a/sc/inc/pageuno.hxx +++ b/sc/inc/pageuno.hxx @@ -30,16 +30,12 @@ public: ScPageObj(SdrPage* pPage); virtual ~ScPageObj() throw() override; - 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; // 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; }; #endif diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index f4e9e7ec4dfb..df3eef981a84 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -91,141 +91,84 @@ 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; virtual void SAL_CALL release() throw() override; // 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; // XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; virtual 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; + 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 void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getAnchor() - throw(css::uno::RuntimeException, - std::exception) override; + 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; // 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; - virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bAbsorb ) override; + virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) 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 >& aTextPosition ) - throw(css::uno::RuntimeException, std::exception) override; + 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 ) - 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; // XTextRange virtual css::uno::Reference< css::text::XText > SAL_CALL - getText() throw(css::uno::RuntimeException, std::exception) override; + getText() override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getStart() throw(css::uno::RuntimeException, std::exception) override; + 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& aString ) - throw(css::uno::RuntimeException, std::exception) override; + getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString( const OUString& aString ) override; // XChild - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) 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; // 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; // 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/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index 60f93d456203..d139311f4fc5 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -45,68 +45,41 @@ public: SvxSearchItem* GetSearchItem() const { return pSearchItem.get(); } // 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; // 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; // search/replace should be called from outside (from XSearchable)... // 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int8 >& aIdentifier ) override; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScCellSearchObj* getImplementation(const css::uno::Reference<css::util::XSearchDescriptor>& rObj); // 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/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index 5eef0928930c..f0a6408b7efc 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -66,54 +66,36 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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; // 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; // XStyleLoader virtual void SAL_CALL loadStylesFromURL( const OUString& URL, - const css::uno::Sequence< css::beans::PropertyValue >& aOptions ) - throw(css::io::IOException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aOptions ) override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - getStyleLoaderOptions() throw(css::uno::RuntimeException, std::exception) override; + getStyleLoaderOptions() override; //XStyleLoader2 virtual void SAL_CALL loadStylesFromDocument( const css::uno::Reference < css::lang::XComponent > & aSourceComponent, - const css::uno::Sequence< css::beans::PropertyValue >& aOptions ) - throw(css::io::IOException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aOptions ) 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; private: /// @throws css::io::IOException /// @throws css::uno::RuntimeException void loadStylesFromDocShell( ScDocShell* pSource, - const css::uno::Sequence< css::beans::PropertyValue>& aOptions ) - throw(css::io::IOException, - css::uno::RuntimeException, std::exception); + const css::uno::Sequence< css::beans::PropertyValue>& aOptions ); }; class ScStyleFamilyObj : public ::cppu::WeakImplHelper< @@ -138,74 +120,39 @@ public: // 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; + 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; + 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; // 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; // 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; // 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 ScStyleObj : public ::cppu::WeakImplHelper< @@ -229,24 +176,20 @@ private: const SfxItemSet* GetStyleItemSet_Impl( const OUString& rPropName, const SfxItemPropertySimpleEntry*& rpEntry ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - css::beans::PropertyState getPropertyState_Impl( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); + css::beans::PropertyState getPropertyState_Impl( const OUString& PropertyName ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Any getPropertyDefault_Impl( const OUString& aPropertyName ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + css::uno::Any getPropertyDefault_Impl( const OUString& aPropertyName ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Any getPropertyValue_Impl( const OUString& aPropertyName ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + css::uno::Any getPropertyValue_Impl( const OUString& aPropertyName ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException void setPropertyValue_Impl( const OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, - const css::uno::Any* pValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + const css::uno::Any* pValue ); public: ScStyleObj() = delete; @@ -264,121 +207,64 @@ public: CreateEmptyNumberingRules(); // 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& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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; + 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; + 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; - 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 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 ) - throw (css::uno::RuntimeException, std::exception) override; + 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; + const OUString& PropertyName ) 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; + getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; // XMultiPropertyStates // getPropertyStates already defined for XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault() - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, - std::exception) override; + virtual 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 ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) 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; // 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScStyleObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index e688683dcecc..547d61df89d9 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -78,21 +78,18 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // css::container::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; // css::container::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; // 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; }; class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper< @@ -115,46 +112,26 @@ public: static void SetLinkTargetBitmap( css::uno::Any& rRet, sal_uInt16 nType ); // css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, - const css::uno::Any& aValue) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + 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; // css::document::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; // 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; }; class ScLinkTargetsObj : public ::cppu::WeakImplHelper< @@ -169,21 +146,18 @@ public: virtual ~ScLinkTargetsObj() override; // css::container::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; // css::container::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; // 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; }; #endif diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 12c7136fce8b..3d6f5f1908d8 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -80,27 +80,23 @@ public: // XHeaderFooterContent virtual css::uno::Reference< css::text::XText > SAL_CALL - getLeftText() throw(css::uno::RuntimeException, std::exception) override; + getLeftText() override; virtual css::uno::Reference< css::text::XText > SAL_CALL - getCenterText() throw(css::uno::RuntimeException, std::exception) override; + getCenterText() override; virtual css::uno::Reference< css::text::XText > SAL_CALL - getRightText() throw(css::uno::RuntimeException, std::exception) override; + getRightText() override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int8 >& aIdentifier ) override; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static rtl::Reference<ScHeaderFooterContentObj> getImplementation(const css::uno::Reference<css::sheet::XHeaderFooterContent>& rObj); // 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; }; @@ -167,65 +163,51 @@ public: // 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; - virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bAbsorb ) override; + virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) 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 >& aTextPosition ) - throw(css::uno::RuntimeException, std::exception) override; + 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 ) - 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; // XTextRange virtual css::uno::Reference< css::text::XText > SAL_CALL - getText() throw(css::uno::RuntimeException, std::exception) override; + getText() override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getStart() throw(css::uno::RuntimeException, std::exception) override; + 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& aString ) - throw(css::uno::RuntimeException, std::exception) override; + getEnd() override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString( const OUString& aString ) override; // XTextRangeMover virtual void SAL_CALL moveTextRange( const css::uno::Reference< css::text::XTextRange >& xRange, - sal_Int16 nParagraphs ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int16 nParagraphs ) 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; // XTextFieldsSupplier virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL - getTextFields() throw(css::uno::RuntimeException, std::exception) override; + getTextFields() override; virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getTextFieldMasters() throw(css::uno::RuntimeException, std::exception) override; + getTextFieldMasters() 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; }; @@ -246,15 +228,14 @@ public: // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL - getText() throw(css::uno::RuntimeException, std::exception) override; + getText() override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getStart() throw(css::uno::RuntimeException, std::exception) override; + getStart() override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getEnd() throw(css::uno::RuntimeException, std::exception) override; + getEnd() 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScCellTextCursor* getImplementation(const css::uno::Reference< css::uno::XInterface>& rObj); @@ -271,15 +252,14 @@ public: // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL - getText() throw(css::uno::RuntimeException, std::exception) override; + getText() override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getStart() throw(css::uno::RuntimeException, std::exception) override; + getStart() override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getEnd() throw(css::uno::RuntimeException, std::exception) override; + getEnd() 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScHeaderFooterTextCursor* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); @@ -298,15 +278,14 @@ public: // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL - getText() throw(css::uno::RuntimeException, std::exception) override; + getText() override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getStart() throw(css::uno::RuntimeException, std::exception) override; + getStart() override; virtual css::uno::Reference< css::text::XTextRange > SAL_CALL - getEnd() throw(css::uno::RuntimeException, std::exception) override; + getEnd() 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScDrawTextCursor* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index 55599c3834d2..17108b038659 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -75,56 +75,29 @@ public: // XFormulaParser virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL parseFormula( const OUString& aFormula, - const css::table::CellAddress& rReferencePos ) - throw (css::uno::RuntimeException, - std::exception) override; + const css::table::CellAddress& rReferencePos ) override; virtual OUString SAL_CALL printFormula( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens, - const css::table::CellAddress& rReferencePos ) - throw (css::uno::RuntimeException, std::exception) override; + const css::table::CellAddress& rReferencePos ) override; // 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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 ScFormulaOpCodeMapperObj : public formula::FormulaOpCodeMapperObj diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index e81010a1eb1d..2baa6c8bdb65 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -70,56 +70,40 @@ public: ScTabViewShell* GetViewShell() const { return pViewShell; } - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XViewPane - virtual sal_Int32 SAL_CALL getFirstVisibleColumn() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getFirstVisibleRow() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) - throw(css::uno::RuntimeException, - std::exception) override; - virtual css::table::CellRangeAddress SAL_CALL getVisibleRange() - throw(css::uno::RuntimeException, - std::exception) override; + virtual sal_Int32 SAL_CALL getFirstVisibleColumn() override; + virtual void SAL_CALL setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn ) override; + virtual sal_Int32 SAL_CALL getFirstVisibleRow() override; + virtual void SAL_CALL setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) override; + virtual css::table::CellRangeAddress SAL_CALL getVisibleRange() override; // XCellRangeReferrer virtual css::uno::Reference< css::table::XCellRange > SAL_CALL - getReferredCells() throw(css::uno::RuntimeException, std::exception) override; + getReferredCells() 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; + getFormController( const css::uno::Reference< css::form::XForm >& Form ) 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; + 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 >& xModel ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + getControl( const css::uno::Reference< css::awt::XControlModel >& xModel ) 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; }; // ScViewPaneObj for direct use (including OWeakObject) @@ -130,8 +114,7 @@ public: ScViewPaneObj(ScTabViewShell* pViewSh, sal_uInt16 nP); virtual ~ScViewPaneObj() override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; }; @@ -189,8 +172,7 @@ public: ScTabViewObj() = delete; virtual ~ScTabViewObj() override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -200,180 +182,108 @@ public: void SheetChanged( bool bSameTabButMoved ); bool IsMouseListening() const; /// @throws css::uno::RuntimeException - bool MousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException); + bool MousePressed( const css::awt::MouseEvent& e ); /// @throws css::uno::RuntimeException - bool MouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException); + bool MouseReleased( const css::awt::MouseEvent& e ); void RangeSelDone( const OUString& rText ); void RangeSelAborted( const OUString& rText ); void RangeSelChanged( const OUString& rText ); // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Any SAL_CALL getSelection() - throw(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 sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) override; + virtual css::uno::Any SAL_CALL getSelection() 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; //! XPrintable? // 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; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, - 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 ) 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; + css::beans::XVetoableChangeListener >& aListener ) override; // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() throw(css::uno::RuntimeException, std::exception) override; + 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 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; // 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; // XSpreadsheetView virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL - getActiveSheet() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveSheet( const css::uno::Reference< css::sheet::XSpreadsheet >& xActiveSheet ) - throw(css::uno::RuntimeException, - std::exception) override; + getActiveSheet() override; + virtual void SAL_CALL setActiveSheet( const css::uno::Reference< css::sheet::XSpreadsheet >& xActiveSheet ) override; //XEnhancedMouseClickBroadcaster virtual void SAL_CALL addEnhancedMouseClickHandler( const css::uno::Reference< - css::awt::XEnhancedMouseClickHandler >& aListener ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL removeEnhancedMouseClickHandler( const css::uno::Reference< css::awt::XEnhancedMouseClickHandler >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::awt::XEnhancedMouseClickHandler >& aListener ) override; + virtual void SAL_CALL removeEnhancedMouseClickHandler( const css::uno::Reference< css::awt::XEnhancedMouseClickHandler >& aListener ) override; //XActivationBroadcaster - virtual void SAL_CALL addActivationEventListener( const css::uno::Reference< css::sheet::XActivationEventListener >& aListener ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL removeActivationEventListener( const css::uno::Reference< css::sheet::XActivationEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActivationEventListener( const css::uno::Reference< css::sheet::XActivationEventListener >& aListener ) override; + virtual void SAL_CALL removeActivationEventListener( const css::uno::Reference< css::sheet::XActivationEventListener >& aListener ) override; // XViewSplitable - virtual sal_Bool SAL_CALL getIsWindowSplit() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSplitHorizontal() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSplitVertical() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSplitColumn() - throw(css::uno::RuntimeException, - std::exception) override; - virtual sal_Int32 SAL_CALL getSplitRow() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) - throw(css::uno::RuntimeException, - std::exception) override; + virtual sal_Bool SAL_CALL getIsWindowSplit() override; + virtual sal_Int32 SAL_CALL getSplitHorizontal() override; + virtual sal_Int32 SAL_CALL getSplitVertical() override; + virtual sal_Int32 SAL_CALL getSplitColumn() override; + virtual sal_Int32 SAL_CALL getSplitRow() override; + virtual void SAL_CALL splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) override; // XViewFreezable - virtual sal_Bool SAL_CALL hasFrozenPanes() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) - throw(css::uno::RuntimeException, - std::exception) override; + virtual sal_Bool SAL_CALL hasFrozenPanes() override; + virtual void SAL_CALL freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) override; // XRangeSelection - virtual void SAL_CALL startRangeSelection( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL abortRangeSelection() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRangeSelectionListener( const css::uno::Reference< css::sheet::XRangeSelectionListener >& aListener ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL removeRangeSelectionListener( const css::uno::Reference< css::sheet::XRangeSelectionListener >& aListener ) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRangeSelectionChangeListener( const css::uno::Reference< css::sheet::XRangeSelectionChangeListener >& aListener ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL removeRangeSelectionChangeListener( const css::uno::Reference< css::sheet::XRangeSelectionChangeListener >& aListener ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startRangeSelection( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; + virtual void SAL_CALL abortRangeSelection() override; + virtual void SAL_CALL addRangeSelectionListener( const css::uno::Reference< css::sheet::XRangeSelectionListener >& aListener ) override; + virtual void SAL_CALL removeRangeSelectionListener( const css::uno::Reference< css::sheet::XRangeSelectionListener >& aListener ) override; + virtual void SAL_CALL addRangeSelectionChangeListener( const css::uno::Reference< css::sheet::XRangeSelectionChangeListener >& aListener ) override; + virtual void SAL_CALL removeRangeSelectionChangeListener( const css::uno::Reference< css::sheet::XRangeSelectionChangeListener >& 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; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int8 >& aIdentifier ) override; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTabViewObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); // 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; // 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; // XSelectedSheetsSupplier - virtual css::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() - throw(css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() override; }; class ScPreviewObj : public SfxBaseController, @@ -385,8 +295,7 @@ public: ScPreviewObj(ScPreviewShell* pViewSh); virtual ~ScPreviewObj() override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -394,8 +303,7 @@ public: virtual void Notify(SfxBroadcaster&, const SfxHint& rHint) override; // XSelectedSheetsSupplier - virtual css::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() override; }; #endif diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 73f4ebc3b09d..f17f689f5cff 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -302,7 +302,7 @@ ScDPDimensions* ScDPSource::GetDimensionsObject() return pDimensions.get(); } -uno::Reference<container::XNameAccess> SAL_CALL ScDPSource::getDimensions() throw(uno::RuntimeException, std::exception) +uno::Reference<container::XNameAccess> SAL_CALL ScDPSource::getDimensions() { return GetDimensionsObject(); } @@ -357,7 +357,6 @@ long ScDPSource::GetSourceDim(long nDim) } uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResults() - throw(uno::RuntimeException, std::exception) { CreateRes_Impl(); // create pColResRoot and pRowResRoot @@ -393,7 +392,6 @@ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResult uno::Sequence<double> ScDPSource::getFilteredResults( const uno::Sequence<sheet::DataPilotFieldFilter>& aFilters ) - throw (uno::RuntimeException, std::exception) { if (maResFilterSet.empty()) getResults(); // Build result tree first. @@ -425,25 +423,22 @@ uno::Sequence<double> ScDPSource::getFilteredResults( return uno::Sequence<double>(); } -void SAL_CALL ScDPSource::refresh() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDPSource::refresh() { disposeData(); } void SAL_CALL ScDPSource::addRefreshListener( const uno::Reference<util::XRefreshListener >& ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); //TODO: exception? } void SAL_CALL ScDPSource::removeRefreshListener( const uno::Reference<util::XRefreshListener >& ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); //TODO: exception? } Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<sheet::DataPilotFieldFilter>& aFilters) - throw (uno::RuntimeException, std::exception) { long nColumnCount = GetData()->GetColumnCount(); @@ -1101,7 +1096,6 @@ const uno::Sequence<sheet::MemberResult>* ScDPSource::GetMemberResults( ScDPLeve // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; using beans::PropertyAttribute::READONLY; @@ -1125,9 +1119,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo( } void SAL_CALL ScDPSource::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if (aPropertyName == SC_UNO_DP_COLGRAND) bColumnGrand = lcl_GetBoolFromAny(aValue); @@ -1151,8 +1142,6 @@ void SAL_CALL ScDPSource::setPropertyValue( const OUString& aPropertyName, const } uno::Any SAL_CALL ScDPSource::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { uno::Any aRet; if ( aPropertyName == SC_UNO_DP_COLGRAND ) @@ -1240,8 +1229,6 @@ void ScDPDimensions::CountChanged() // very simple XNameAccess implementation using getCount/getByIndex uno::Any SAL_CALL ScDPDimensions::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { long nCount = getCount(); for (long i=0; i<nCount; i++) @@ -1257,7 +1244,7 @@ uno::Any SAL_CALL ScDPDimensions::getByName( const OUString& aName ) // return uno::Any(); } -uno::Sequence<OUString> SAL_CALL ScDPDimensions::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScDPDimensions::getElementNames() { long nCount = getCount(); uno::Sequence<OUString> aSeq(nCount); @@ -1267,7 +1254,7 @@ uno::Sequence<OUString> SAL_CALL ScDPDimensions::getElementNames() throw(uno::Ru return aSeq; } -sal_Bool SAL_CALL ScDPDimensions::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDPDimensions::hasByName( const OUString& aName ) { long nCount = getCount(); for (long i=0; i<nCount; i++) @@ -1276,12 +1263,12 @@ sal_Bool SAL_CALL ScDPDimensions::hasByName( const OUString& aName ) throw(uno:: return false; } -uno::Type SAL_CALL ScDPDimensions::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScDPDimensions::getElementType() { return cppu::UnoType<container::XNamed>::get(); } -sal_Bool SAL_CALL ScDPDimensions::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDPDimensions::hasElements() { return ( getCount() > 0 ); } @@ -1355,12 +1342,11 @@ const OUString* ScDPDimension::GetSubtotalName() const } uno::Reference<container::XNameAccess> SAL_CALL ScDPDimension::getHierarchies() - throw(uno::RuntimeException, std::exception) { return GetHierarchiesObject(); } -OUString SAL_CALL ScDPDimension::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDPDimension::getName() { if (!aName.isEmpty()) return aName; @@ -1368,7 +1354,7 @@ OUString SAL_CALL ScDPDimension::getName() throw(uno::RuntimeException, std::exc return pSource->GetData()->getDimensionName( nDim ); } -void SAL_CALL ScDPDimension::setName( const OUString& rNewName ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDPDimension::setName( const OUString& rNewName ) { // used after cloning aName = rNewName; @@ -1404,7 +1390,7 @@ ScDPDimension* ScDPDimension::CreateCloneObject() return pNew; } -uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone() throw(uno::RuntimeException, std::exception) +uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone() { return CreateCloneObject(); } @@ -1448,7 +1434,6 @@ const ScDPItemData& ScDPDimension::GetSelectedData() // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1477,9 +1462,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn } void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if ( aPropertyName == SC_UNO_DP_USEDHIERARCHY ) { @@ -1562,8 +1544,6 @@ void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, co } uno::Any SAL_CALL ScDPDimension::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { uno::Any aRet; if ( aPropertyName == SC_UNO_DP_POSITION ) @@ -1690,8 +1670,6 @@ ScDPHierarchies::~ScDPHierarchies() // very simple XNameAccess implementation using getCount/getByIndex uno::Any SAL_CALL ScDPHierarchies::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { long nCount = getCount(); for (long i=0; i<nCount; i++) @@ -1706,7 +1684,7 @@ uno::Any SAL_CALL ScDPHierarchies::getByName( const OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScDPHierarchies::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScDPHierarchies::getElementNames() { long nCount = getCount(); uno::Sequence<OUString> aSeq(nCount); @@ -1716,7 +1694,7 @@ uno::Sequence<OUString> SAL_CALL ScDPHierarchies::getElementNames() throw(uno::R return aSeq; } -sal_Bool SAL_CALL ScDPHierarchies::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDPHierarchies::hasByName( const OUString& aName ) { long nCount = getCount(); for (long i=0; i<nCount; i++) @@ -1725,12 +1703,12 @@ sal_Bool SAL_CALL ScDPHierarchies::hasByName( const OUString& aName ) throw(uno: return false; } -uno::Type SAL_CALL ScDPHierarchies::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScDPHierarchies::getElementType() { return cppu::UnoType<container::XNamed>::get(); } -sal_Bool SAL_CALL ScDPHierarchies::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDPHierarchies::hasElements() { return ( getCount() > 0 ); } @@ -1789,12 +1767,11 @@ ScDPLevels* ScDPHierarchy::GetLevelsObject() } uno::Reference<container::XNameAccess> SAL_CALL ScDPHierarchy::getLevels() - throw(uno::RuntimeException, std::exception) { return GetLevelsObject(); } -OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDPHierarchy::getName() { OUString aRet; //TODO: globstr-ID !!!! switch (nHier) @@ -1815,7 +1792,7 @@ OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException, std::exc return aRet; } -void SAL_CALL ScDPHierarchy::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDPHierarchy::setName( const OUString& /* rNewName */ ) { OSL_FAIL("not implemented"); //TODO: exception? } @@ -1860,8 +1837,6 @@ ScDPLevels::~ScDPLevels() // very simple XNameAccess implementation using getCount/getByIndex uno::Any SAL_CALL ScDPLevels::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { long nCount = getCount(); for (long i=0; i<nCount; i++) @@ -1876,7 +1851,7 @@ uno::Any SAL_CALL ScDPLevels::getByName( const OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScDPLevels::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScDPLevels::getElementNames() { long nCount = getCount(); uno::Sequence<OUString> aSeq(nCount); @@ -1886,7 +1861,7 @@ uno::Sequence<OUString> SAL_CALL ScDPLevels::getElementNames() throw(uno::Runtim return aSeq; } -sal_Bool SAL_CALL ScDPLevels::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDPLevels::hasByName( const OUString& aName ) { long nCount = getCount(); for (long i=0; i<nCount; i++) @@ -1895,12 +1870,12 @@ sal_Bool SAL_CALL ScDPLevels::hasByName( const OUString& aName ) throw(uno::Runt return false; } -uno::Type SAL_CALL ScDPLevels::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScDPLevels::getElementType() { return cppu::UnoType<container::XNamed>::get(); } -sal_Bool SAL_CALL ScDPLevels::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDPLevels::hasElements() { return ( getCount() > 0 ); } @@ -2053,12 +2028,12 @@ ScDPMembers* ScDPLevel::GetMembersObject() return mxMembers.get(); } -uno::Reference<sheet::XMembersAccess> SAL_CALL ScDPLevel::getMembers() throw(uno::RuntimeException, std::exception) +uno::Reference<sheet::XMembersAccess> SAL_CALL ScDPLevel::getMembers() { return GetMembersObject(); } -uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::RuntimeException, std::exception) +uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() { const uno::Sequence<sheet::MemberResult>* pRes = pSource->GetMemberResults( this ); if (pRes) @@ -2067,7 +2042,7 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R return uno::Sequence<sheet::MemberResult>(0); //TODO: Error? } -OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDPLevel::getName() { long nSrcDim = pSource->GetSourceDim( nDim ); if ( pSource->IsDateDimension( nSrcDim ) ) @@ -2124,7 +2099,7 @@ OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException, std::excepti return pDim->getName(); } -void SAL_CALL ScDPLevel::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDPLevel::setName( const OUString& /* rNewName */ ) { OSL_FAIL("not implemented"); //TODO: exception? } @@ -2143,7 +2118,6 @@ uno::Sequence<sal_Int16> ScDPLevel::getSubTotals() const // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2165,9 +2139,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo() } void SAL_CALL ScDPLevel::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if ( aPropertyName == SC_UNO_DP_SHOWEMPTY ) bShowEmpty = lcl_GetBoolFromAny(aValue); @@ -2198,8 +2169,6 @@ void SAL_CALL ScDPLevel::setPropertyValue( const OUString& aPropertyName, const } uno::Any SAL_CALL ScDPLevel::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { uno::Any aRet; if ( aPropertyName == SC_UNO_DP_SHOWEMPTY ) @@ -2354,8 +2323,6 @@ sal_Int32 ScDPMembers::GetIndexFromName( const OUString& rName ) const } uno::Any SAL_CALL ScDPMembers::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nIndex = GetIndexFromName( aName ); if ( nIndex >= 0 ) @@ -2369,22 +2336,22 @@ uno::Any SAL_CALL ScDPMembers::getByName( const OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScDPMembers::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScDPMembers::getElementNames() { return getElementNames( false ); } -sal_Bool SAL_CALL ScDPMembers::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDPMembers::hasByName( const OUString& aName ) { return ( GetIndexFromName( aName ) >= 0 ); } -uno::Type SAL_CALL ScDPMembers::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScDPMembers::getElementType() { return cppu::UnoType<container::XNamed>::get(); } -sal_Bool SAL_CALL ScDPMembers::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDPMembers::hasElements() { return ( getCount() > 0 ); } @@ -2394,7 +2361,6 @@ sal_Bool SAL_CALL ScDPMembers::hasElements() throw(uno::RuntimeException, std::e // XMembersAccess implementation uno::Sequence<OUString> SAL_CALL ScDPMembers::getLocaleIndependentElementNames() - throw(uno::RuntimeException, std::exception) { return getElementNames( true ); } @@ -2402,7 +2368,6 @@ uno::Sequence<OUString> SAL_CALL ScDPMembers::getLocaleIndependentElementNames() // end of XMembersAccess implementation uno::Sequence<OUString> ScDPMembers::getElementNames( bool bLocaleIndependent ) const - throw(uno::RuntimeException, std::exception) { // Return list of names in sorted order, // so it's displayed in that order in the field options dialog. @@ -2623,12 +2588,12 @@ OUString ScDPMember::GetNameStr( bool bLocaleIndependent ) const return OUString(); } -OUString SAL_CALL ScDPMember::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDPMember::getName() { return GetNameStr( false ); } -void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) { OSL_FAIL("not implemented"); //TODO: exception? } @@ -2636,7 +2601,6 @@ void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) throw(uno::R // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2654,9 +2618,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo( } void SAL_CALL ScDPMember::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if ( aPropertyName == SC_UNO_DP_ISVISIBLE ) bVisible = lcl_GetBoolFromAny(aValue); @@ -2677,8 +2638,6 @@ void SAL_CALL ScDPMember::setPropertyValue( const OUString& aPropertyName, const } uno::Any SAL_CALL ScDPMember::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { uno::Any aRet; if ( aPropertyName == SC_UNO_DP_ISVISIBLE ) diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx index 5f451f518f51..b11b90d0a5ee 100644 --- a/sc/source/core/inc/addinlis.hxx +++ b/sc/source/core/inc/addinlis.hxx @@ -67,22 +67,17 @@ public: { return aResult; } // XResultListener - virtual void SAL_CALL modified( const css::sheet::ResultEvent& aEvent ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::sheet::ResultEvent& 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; // 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; + 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; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_CORE_INC_ADDINLIS_HXX diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx index 29985bf4f9d7..41a68c17c6d9 100644 --- a/sc/source/core/tool/addinlis.cxx +++ b/sc/source/core/tool/addinlis.cxx @@ -105,7 +105,6 @@ void ScAddInListener::RemoveDocument( ScDocument* pDocumentP ) // XResultListener void SAL_CALL ScAddInListener::modified( const css::sheet::ResultEvent& aEvent ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; //TODO: or generate a UserEvent @@ -126,7 +125,6 @@ void SAL_CALL ScAddInListener::modified( const css::sheet::ResultEvent& aEvent ) // XEventListener void SAL_CALL ScAddInListener::disposing( const css::lang::EventObject& /* Source */ ) - throw(css::uno::RuntimeException, std::exception) { // hold a ref so this is not deleted at removeResultListener uno::Reference<sheet::XResultListener> xRef( this ); diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 5b50659be9d6..020962ddc2a0 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -118,33 +118,33 @@ private: ::osl::Mutex m_aMutex; public: // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<container::XIndexContainer>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<container::XIndexContainer>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return ( !IdToOleNameHash.empty() ); } // 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 { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( IdToOleNameHash[ aName ] ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return comphelper::mapKeysToSequence( IdToOleNameHash); } - 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 { ::osl::MutexGuard aGuard( m_aMutex ); return ( IdToOleNameHash.find( aName ) != IdToOleNameHash.end() ); } // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -154,14 +154,14 @@ public: throw lang::IllegalArgumentException(); IdToOleNameHash[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeByName( const OUString& aName ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw container::NoSuchElementException(); IdToOleNameHash.erase( IdToOleNameHash.find( aName ) ); } - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index e0ff274097d7..e82e7a5e0ae7 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1050,9 +1050,6 @@ ScDocShell* XclExpXmlStream::getDocShell() } bool XclExpXmlStream::exportDocument() - throw (css::uno::RuntimeException, - css::ucb::ContentCreationException, - std::exception) { ScDocShell* pShell = getDocShell(); ScDocument& rDoc = pShell->GetDocument(); @@ -1145,7 +1142,7 @@ bool XclExpXmlStream::exportDocument() return new ::oox::xls::ExcelVbaProject( getComponentContext(), Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) ); } -OUString XclExpXmlStream::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString XclExpXmlStream::getImplementationName() { return OUString( "TODO" ); } diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index e815cbaf339c..35ae5dfaa350 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -79,23 +79,23 @@ public: explicit PaletteIndex( const ColorDataVec& rColorDataTable ) : maColorData( rColorDataTable ) {} // Methods XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount() override { return maColorData.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 { //--Index; // apparently the palette is already 1 based return uno::makeAny( sal_Int32( maColorData[ Index ] ) ); } // 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 (maColorData.size() > 0); } diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index a169733dddd1..0d87691739b2 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -32,8 +32,7 @@ class ExcelFilter : public ::oox::core::XmlFilterBase public: /// @throws css::uno::RuntimeException explicit ExcelFilter( - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - throw( css::uno::RuntimeException ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ExcelFilter() override; void registerWorkbookGlobals( WorkbookGlobals& rBookGlob ); @@ -49,12 +48,12 @@ public: virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override; virtual void useInternalChartDataTable( bool bInternal ) override; - virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) override; private: virtual GraphicHelper* implCreateGraphicHelper() const override; virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; WorkbookGlobals* mpBookGlob; }; diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index eaf1a113607e..fb4821ca2d20 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -47,40 +47,35 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- virtual ::rtl::OUString SAL_CALL - getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& rService ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const ::rtl::OUString& rService ) override; virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL - getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // com.sun.star.lang.XInitialization interface ---------------------------- virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& rArgs ) - throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::uno::Any >& rArgs ) override; // com.sun.star.sheet.XFilterFormulaParser interface ---------------------- virtual ::rtl::OUString SAL_CALL - getSupportedNamespace() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedNamespace() override; // com.sun.star.sheet.XFormulaParser interface ---------------------------- virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL parseFormula( const ::rtl::OUString& rFormula, - const css::table::CellAddress& rReferencePos ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::table::CellAddress& rReferencePos ) override; virtual ::rtl::OUString SAL_CALL printFormula( const css::uno::Sequence< css::sheet::FormulaToken >& rTokens, - const css::table::CellAddress& rReferencePos ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::table::CellAddress& rReferencePos ) override; private: typedef std::shared_ptr< OOXMLFormulaParserImpl > ParserImplRef; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 600b1442903a..754187b46ea2 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -318,10 +318,7 @@ public: OUString* pRelationshipId = nullptr ); // ignore - virtual bool exportDocument() - throw (css::uno::RuntimeException, - css::ucb::ContentCreationException, - std::exception) override; + virtual bool exportDocument() override; // only needed for import; ignore virtual bool importDocument() throw() override; @@ -361,7 +358,7 @@ public: private: virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; ScDocShell *getDocShell(); sax_fastparser::FSHelperPtr& WriteAttributesInternal( sal_Int32 nAttribute, ... ); diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 8cda915f6b74..e624e34b426a 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -40,7 +40,7 @@ using namespace ::oox::core; using ::oox::drawingml::table::TableStyleListPtr; -ExcelFilter::ExcelFilter( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : +ExcelFilter::ExcelFilter( const Reference< XComponentContext >& rxContext ) : XmlFilterBase( rxContext ), mpBookGlob( nullptr ) { @@ -149,7 +149,7 @@ GraphicHelper* ExcelFilter::implCreateGraphicHelper() const return new ExcelVbaProject( getComponentContext(), Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) ); } -sal_Bool SAL_CALL ExcelFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ExcelFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) { if ( XmlFilterBase::filter( rDescriptor ) ) return true; @@ -174,7 +174,7 @@ sal_Bool SAL_CALL ExcelFilter::filter( const css::uno::Sequence< css::beans::Pro return false; } -OUString ExcelFilter::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString ExcelFilter::getImplementationName() { return OUString( "com.sun.star.comp.oox.xls.ExcelFilter" ); } diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 720c27707bc2..6491560d6d8f 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -108,17 +108,17 @@ OOXMLFormulaParser::~OOXMLFormulaParser() } // com.sun.star.lang.XServiceInfo interface ----------------------------------- -OUString SAL_CALL OOXMLFormulaParser::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL OOXMLFormulaParser::getImplementationName() { return OUString( "com.sun.star.comp.oox.xls.FormulaParser"); } -sal_Bool SAL_CALL OOXMLFormulaParser::supportsService( const OUString& rService ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL OOXMLFormulaParser::supportsService( const OUString& rService ) { return cppu::supportsService(this, rService); } -Sequence< OUString > SAL_CALL OOXMLFormulaParser::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL OOXMLFormulaParser::getSupportedServiceNames() { Sequence< OUString > aServiceNames { "com.sun.star.sheet.FilterFormulaParser" }; return aServiceNames; @@ -126,7 +126,7 @@ Sequence< OUString > SAL_CALL OOXMLFormulaParser::getSupportedServiceNames() thr // com.sun.star.lang.XInitialization interface -------------------------------- -void SAL_CALL OOXMLFormulaParser::initialize( const Sequence< Any >& rArgs ) throw( Exception, RuntimeException, std::exception ) +void SAL_CALL OOXMLFormulaParser::initialize( const Sequence< Any >& rArgs ) { OSL_ENSURE( rArgs.hasElements(), "OOXMLFormulaParser::initialize - missing arguments" ); if( !rArgs.hasElements() ) @@ -136,7 +136,7 @@ void SAL_CALL OOXMLFormulaParser::initialize( const Sequence< Any >& rArgs ) thr // com.sun.star.sheet.XFilterFormulaParser interface -------------------------- -OUString SAL_CALL OOXMLFormulaParser::getSupportedNamespace() throw( RuntimeException, std::exception ) +OUString SAL_CALL OOXMLFormulaParser::getSupportedNamespace() { return OUString( "http://schemas.microsoft.com/office/excel/formula"); } @@ -144,7 +144,7 @@ OUString SAL_CALL OOXMLFormulaParser::getSupportedNamespace() throw( RuntimeExce // com.sun.star.sheet.XFormulaParser interface -------------------------------- Sequence< FormulaToken > SAL_CALL OOXMLFormulaParser::parseFormula( - const OUString& rFormula, const CellAddress& rReferencePos ) throw( RuntimeException, std::exception ) + const OUString& rFormula, const CellAddress& rReferencePos ) { if( !mxParserImpl ) { @@ -156,7 +156,7 @@ Sequence< FormulaToken > SAL_CALL OOXMLFormulaParser::parseFormula( } OUString SAL_CALL OOXMLFormulaParser::printFormula( - const Sequence< FormulaToken >& /*rTokens*/, const CellAddress& /*rReferencePos*/ ) throw( RuntimeException, std::exception ) + const Sequence< FormulaToken >& /*rTokens*/, const CellAddress& /*rReferencePos*/ ) { // not implemented throw RuntimeException(); diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx index 307ad59f4e1d..5c8c80b190d1 100644 --- a/sc/source/filter/orcus/filterdetect.cxx +++ b/sc/source/filter/orcus/filterdetect.cxx @@ -28,18 +28,14 @@ class OrcusFormatDetect : public ::cppu::WeakImplHelper< public: explicit OrcusFormatDetect(); - 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; + virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; virtual OUString SAL_CALL - detect( css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq ) - throw( css::uno::RuntimeException, std::exception ) override; + detect( css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq ) override; private: }; @@ -49,25 +45,21 @@ OrcusFormatDetect::OrcusFormatDetect() } OUString OrcusFormatDetect::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(""); } sal_Bool OrcusFormatDetect::supportsService(const OUString& /*rServiceName*/) - throw( css::uno::RuntimeException, std::exception ) { return false; } css::uno::Sequence<OUString> OrcusFormatDetect::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return css::uno::Sequence<OUString>(); } OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue>& rMediaDescSeq) - throw( css::uno::RuntimeException, std::exception ) { utl::MediaDescriptor aMediaDescriptor( rMediaDescSeq ); bool bAborted = aMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ABORTED(), false); diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index db4c1ea25ec6..bb05210c22ab 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -59,7 +59,6 @@ XMLCodeNameProvider::~XMLCodeNameProvider() } sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName ) - throw (uno::RuntimeException, std::exception ) { if( aName == msDocName ) return !mpDoc->GetCodeName().isEmpty(); @@ -79,8 +78,6 @@ sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName ) } uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName ) - throw (container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRet; uno::Sequence<beans::PropertyValue> aProps(1); @@ -110,7 +107,6 @@ uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames( ) - throw (uno::RuntimeException, std::exception) { SCTAB nCount = mpDoc->GetTableCount() + 1; std::vector< OUString > aNames; @@ -134,13 +130,11 @@ uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames( ) } uno::Type SAL_CALL XMLCodeNameProvider::getElementType( ) - throw (uno::RuntimeException, std::exception) { return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } sal_Bool SAL_CALL XMLCodeNameProvider::hasElements() - throw (uno::RuntimeException, std::exception ) { if( !mpDoc->GetCodeName().isEmpty() ) return true; diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 4b249782caa8..e0e2156b7e15 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -38,22 +38,15 @@ public: explicit XMLCodeNameProvider(ScDocument* pDoc); virtual ~XMLCodeNameProvider() override; - 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; - 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; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; - virtual css::uno::Type SAL_CALL getElementType( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasElements() override; static void set( const css::uno::Reference< css::container::XNameAccess>& xNameAccess, ScDocument *pDoc ); }; diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index f108b439a14c..e7fa6a6d6532 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.cxx @@ -33,7 +33,6 @@ ScXMLEmptyContext::~ScXMLEmptyContext() css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLEmptyContext::createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList > & /*xAttrList*/ ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { SvXMLImportContext *pContext = new ScXMLEmptyContext( GetScImport(), nElement ); diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index e003cde0d33a..49679d2dda4b 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -33,8 +33,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - 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; }; #endif diff --git a/sc/source/filter/xml/importcontext.cxx b/sc/source/filter/xml/importcontext.cxx index 56196ea98f69..d0bceeddbcd7 100644 --- a/sc/source/filter/xml/importcontext.cxx +++ b/sc/source/filter/xml/importcontext.cxx @@ -31,17 +31,14 @@ const ScXMLImport& ScXMLImportContext::GetScImport() const } void SAL_CALL ScXMLImportContext::startFastElement(sal_Int32 /*nElement*/, const css::uno::Reference< css::xml::sax::XFastAttributeList > & /*xAttrList*/) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { } void SAL_CALL ScXMLImportContext::endFastElement(sal_Int32 /*nElement*/) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { } void SAL_CALL ScXMLImportContext::characters(const OUString &) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { } diff --git a/sc/source/filter/xml/importcontext.hxx b/sc/source/filter/xml/importcontext.hxx index 0d9a13609eee..089b6c1027cb 100644 --- a/sc/source/filter/xml/importcontext.hxx +++ b/sc/source/filter/xml/importcontext.hxx @@ -27,14 +27,11 @@ public: ScXMLImportContext( SvXMLImport& rImport ); virtual void SAL_CALL startFastElement (sal_Int32 nElement, - 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; - 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 void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; protected: ScXMLImport& GetScImport(); diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index f31079d79010..486cea560fed 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -198,7 +198,6 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLBodyContext::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) @@ -237,7 +236,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL } void SAL_CALL ScXMLBodyContext::characters(const OUString &) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) @@ -250,7 +248,6 @@ void SAL_CALL ScXMLBodyContext::characters(const OUString &) } void SAL_CALL ScXMLBodyContext::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index b5176cc15aad..b80bbd8cd044 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -52,14 +52,11 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - 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; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; - 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; }; #endif diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 3559cc814b0b..0f6292c3fff7 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -1497,7 +1497,6 @@ bool ScXMLTableRowCellContext::IsPossibleErrorString() const } void SAL_CALL ScXMLTableRowCellContext::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { HasSpecialCaseFormulaText(); if( bFormulaTextResult && (mbPossibleErrorCell || mbCheckWithCompilerForError) ) diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 845bdc07dfc9..284c8ffe1136 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -150,8 +150,7 @@ public: void SetDetectiveObj( const ScAddress& rPosition ); void SetCellRangeSource( const ScAddress& rPosition ); - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; #endif diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 64d2ff96ee02..35a5e92c3b57 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -5040,7 +5040,6 @@ sal_uInt32 ScXMLExport::exportDoc( enum XMLTokenEnum eClass ) // XExporter void SAL_CALL ScXMLExport::setSourceDocument( const uno::Reference<lang::XComponent>& xComponent ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SvXMLExport::setSourceDocument( xComponent ); @@ -5070,7 +5069,6 @@ void SAL_CALL ScXMLExport::setSourceDocument( const uno::Reference<lang::XCompon // XFilter sal_Bool SAL_CALL ScXMLExport::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDoc) @@ -5082,7 +5080,6 @@ sal_Bool SAL_CALL ScXMLExport::filter( const css::uno::Sequence< css::beans::Pro } void SAL_CALL ScXMLExport::cancel() - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDoc) @@ -5092,7 +5089,6 @@ void SAL_CALL ScXMLExport::cancel() // XInitialization void SAL_CALL ScXMLExport::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SvXMLExport::initialize(aArguments); @@ -5100,7 +5096,6 @@ void SAL_CALL ScXMLExport::initialize( const css::uno::Sequence< css::uno::Any > // XUnoTunnel sal_Int64 SAL_CALL ScXMLExport::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return SvXMLExport::getSomething(aIdentifier); diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 833163db6cbb..65f6efe54e2a 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -260,17 +260,17 @@ public: virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) 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; // 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; // 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; // 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 void DisposingModel() override; }; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index bb4748006a2e..4ec2acdfa287 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -115,7 +115,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw( } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_ALL); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_getImplementationName(), SvXMLImportFlags::ALL )); @@ -133,7 +133,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() t } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_META); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META )); @@ -151,7 +151,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlagsSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS)); @@ -169,7 +169,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames( } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::META|SvXMLImportFlags::STYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::SETTINGS|SvXMLImportFlags::FONTDECLS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Content_getImplementationName(), SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS)); @@ -187,7 +187,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::SETTINGS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Settings_getImplementationName(), SvXMLImportFlags::SETTINGS )); @@ -244,18 +244,14 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - 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; virtual void SAL_CALL startFastElement (sal_Int32 nElement, - 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; - 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 void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -292,16 +288,13 @@ public: const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) override; virtual void SAL_CALL startFastElement (sal_Int32 nElement, - 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; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - 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; }; ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, @@ -342,7 +335,6 @@ SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext( uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLFlatDocContext_Impl::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if ( nElement != ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_META ) ) return ScXMLDocContext_Impl::createFastChildContext( nElement, xAttrList ); @@ -352,13 +344,11 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL void SAL_CALL ScXMLFlatDocContext_Impl::startFastElement(sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { SvXMLMetaDocumentContext::startFastElement( nElement, xAttrList ); } void SAL_CALL ScXMLFlatDocContext_Impl::endFastElement(sal_Int32 nElement) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { SvXMLMetaDocumentContext::endFastElement( nElement ); } @@ -371,8 +361,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - 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; }; ScXMLBodyContext_Impl::ScXMLBodyContext_Impl( ScXMLImport& rImport, sal_Int32 /*nElement*/, @@ -384,7 +373,6 @@ ScXMLImportContext( rImport ) uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLBodyContext_Impl::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { return GetScImport().CreateBodyContext( nElement, xAttrList ); } @@ -437,7 +425,6 @@ SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDocContext_Impl::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { SvXMLImportContext *pContext(nullptr); @@ -463,17 +450,14 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL void SAL_CALL ScXMLDocContext_Impl::startFastElement(sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { } void SAL_CALL ScXMLDocContext_Impl::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { } void SAL_CALL ScXMLDocContext_Impl::characters(const OUString &) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { } @@ -2335,7 +2319,6 @@ ScXMLImport::~ScXMLImport() throw() } void ScXMLImport::initialize( const css::uno::Sequence<css::uno::Any>& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { SvXMLImport::initialize(aArguments); @@ -3068,7 +3051,6 @@ void ScXMLImport::SetStylesToRangesFinished() // XImporter void SAL_CALL ScXMLImport::setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) -throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ScXMLImport::MutexGuard aGuard(*this); SvXMLImport::setTargetDocument( xDoc ); @@ -3090,7 +3072,6 @@ throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exce // css::xml::sax::XDocumentHandler void SAL_CALL ScXMLImport::startDocument() -throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) { ScXMLImport::MutexGuard aGuard(*this); SvXMLImport::startDocument(); @@ -3300,9 +3281,6 @@ void ScXMLImport::SetStringRefSyntaxIfMissing() } void SAL_CALL ScXMLImport::endDocument() - throw(css::xml::sax::SAXException, - css::uno::RuntimeException, - std::exception) { ScXMLImport::MutexGuard aGuard(*this); if (getImportFlags() & SvXMLImportFlags::CONTENT) diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index c09dff58feac..fce8191bba1d 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -968,8 +968,7 @@ public: virtual ~ScXMLImport() throw() 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; // namespace office // NB: in contrast to other CreateFooContexts, this particular one handles @@ -1155,14 +1154,10 @@ public: void SetStylesToRangesFinished(); // XImporter - virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - - 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 setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override; + + virtual void SAL_CALL startDocument() override; + virtual void SAL_CALL endDocument() override; virtual void DisposingModel() override; diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 130843211c9d..a8409582444d 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -107,7 +107,6 @@ ScXMLTableRowContext::~ScXMLTableRowContext() uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTableRowContext::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { SvXMLImportContext *pContext(nullptr); @@ -143,7 +142,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL } void SAL_CALL ScXMLTableRowContext::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScXMLImport& rXMLImport(GetScImport()); if (!bHasCell && nRepeatedRows > 1) @@ -253,7 +251,6 @@ ScXMLTableRowsContext::~ScXMLTableRowsContext() uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTableRowsContext::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { SvXMLImportContext *pContext(nullptr); @@ -287,7 +284,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL } void SAL_CALL ScXMLTableRowsContext::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScXMLImport& rXMLImport(GetScImport()); if (bHeader) diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index 5c3ab2920d87..1b3839349dc2 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -40,13 +40,11 @@ public: virtual ~ScXMLTableRowContext() override; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - 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 ScXMLTableRowsContext : public ScXMLImportContext @@ -67,11 +65,9 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - 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; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index 6093c5225dce..f482b13fee24 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -323,7 +323,6 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTableContext::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { const SvXMLTokenMap& rTokenMap(GetScImport().GetTableElemTokenMap()); sal_uInt16 nToken = rTokenMap.Get( nElement ); @@ -365,7 +364,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL } void SAL_CALL ScXMLTableContext::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScXMLImport::MutexGuard aMutexGuard(GetScImport()); ScXMLImport& rImport = GetScImport(); diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 0dfa46d2d2b7..ada786019320 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -59,11 +59,9 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - 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; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; class ScXMLTableProtectionContext : public ScXMLImportContext diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 460a1f76cc8c..1ed01b3121e2 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -131,13 +131,11 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( ScAccessibleCell, ScAccessibleCellBase, Access uno::Reference< XAccessible > SAL_CALL ScAccessibleCell::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException, std::exception) { return AccessibleStaticTextBase::getAccessibleAtPoint(rPoint); } void SAL_CALL ScAccessibleCell::grabFocus( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -153,7 +151,6 @@ void SAL_CALL ScAccessibleCell::grabFocus( ) } Rectangle ScAccessibleCell::GetBoundingBoxOnScreen() const - throw (uno::RuntimeException, std::exception) { Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) @@ -170,7 +167,6 @@ Rectangle ScAccessibleCell::GetBoundingBoxOnScreen() const } Rectangle ScAccessibleCell::GetBoundingBox() const - throw (uno::RuntimeException, std::exception) { Rectangle aCellRect; if (mpViewShell) @@ -215,22 +211,18 @@ Rectangle ScAccessibleCell::GetBoundingBox() const sal_Int32 SAL_CALL ScAccessibleCell::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { return AccessibleStaticTextBase::getAccessibleChildCount(); } uno::Reference< XAccessible > SAL_CALL ScAccessibleCell::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, - lang::IndexOutOfBoundsException, std::exception) { return AccessibleStaticTextBase::getAccessibleChild(nIndex); } uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleCell::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -286,7 +278,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleCell::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -303,14 +294,12 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleCell::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleCell"); } uno::Sequence< OUString> SAL_CALL ScAccessibleCell::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -509,9 +498,6 @@ static OUString ReplaceFourChar(const OUString& oldOUString) } uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -543,7 +529,7 @@ uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes() } // cell has its own ParaIndent property, so when calling character attributes on cell, the ParaIndent should replace the ParaLeftMargin if its value is not zero. -uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) +uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 890908afecb8..521732d27b19 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -75,7 +75,6 @@ ScAccessibleCellBase::~ScAccessibleCellBase() //===== XAccessibleComponent ============================================ bool SAL_CALL ScAccessibleCellBase::isVisible() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -95,7 +94,6 @@ bool SAL_CALL ScAccessibleCellBase::isVisible() } sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -135,7 +133,6 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground() } sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -179,7 +176,6 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground() //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessibleCellBase::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException, std::exception) { uno::Any aAny (ScAccessibleCellBaseImpl::queryInterface(rType)); return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType); @@ -201,7 +197,6 @@ void SAL_CALL ScAccessibleCellBase::release() sal_Int32 ScAccessibleCellBase::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -210,7 +205,6 @@ sal_Int32 OUString SAL_CALL ScAccessibleCellBase::createAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OUString sDescription = OUString(ScResId(STR_ACC_CELL_DESCR)); @@ -219,7 +213,6 @@ OUString SAL_CALL OUString SAL_CALL ScAccessibleCellBase::createAccessibleName() - throw (uno::RuntimeException, std::exception) { // Document not needed, because only the cell address, but not the tablename is needed // always us OOO notation @@ -230,7 +223,6 @@ OUString SAL_CALL uno::Any SAL_CALL ScAccessibleCellBase::getCurrentValue() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -244,7 +236,6 @@ uno::Any SAL_CALL sal_Bool SAL_CALL ScAccessibleCellBase::setCurrentValue( const uno::Any& aNumber ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -269,14 +260,12 @@ sal_Bool SAL_CALL uno::Any SAL_CALL ScAccessibleCellBase::getMaximumValue( ) - throw (uno::RuntimeException, std::exception) { return uno::Any(DBL_MAX); } uno::Any SAL_CALL ScAccessibleCellBase::getMinimumValue( ) - throw (uno::RuntimeException, std::exception) { return uno::Any(-DBL_MAX); } @@ -284,7 +273,6 @@ uno::Any SAL_CALL //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleCellBase::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleCellBase"); } @@ -292,14 +280,12 @@ OUString SAL_CALL ScAccessibleCellBase::getImplementationName() //===== XTypeProvider =================================================== uno::Sequence< uno::Type > SAL_CALL ScAccessibleCellBase::getTypes() - throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessibleCellBaseImpl::getTypes(), ScAccessibleContextBase::getTypes()); } uno::Sequence<sal_Int8> SAL_CALL ScAccessibleCellBase::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -314,7 +300,6 @@ bool ScAccessibleCellBase::IsEditable( } OUString SAL_CALL ScAccessibleCellBase::GetNote() - throw (css::uno::RuntimeException) { SolarMutexGuard aGuard; IsObjectValid(); @@ -361,7 +346,6 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote() } OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -442,7 +426,6 @@ OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() } OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -592,7 +575,6 @@ OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() //end of cell attributes OUString SAL_CALL ScAccessibleCellBase::GetAllDisplayNote() - throw (css::uno::RuntimeException, std::exception) { OUString strNote; OUString strTrackText; diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 3bf756a1c36f..13b541f4e891 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -104,7 +104,6 @@ void SAL_CALL ScAccessibleContextBase::disposing() //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessibleContextBase::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException, std::exception) { uno::Any aAny (ScAccessibleContextBaseWeakImpl::queryInterface(rType)); return aAny.hasValue() ? aAny : ScAccessibleContextBaseImplEvent::queryInterface(rType); @@ -137,7 +136,6 @@ void ScAccessibleContextBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference< XAccessibleContext> SAL_CALL ScAccessibleContextBase::getAccessibleContext() - throw (uno::RuntimeException, std::exception) { return this; } @@ -145,7 +143,6 @@ uno::Reference< XAccessibleContext> SAL_CALL //===== XAccessibleComponent ================================================ sal_Bool SAL_CALL ScAccessibleContextBase::containsPoint(const awt::Point& rPoint ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -154,14 +151,12 @@ sal_Bool SAL_CALL ScAccessibleContextBase::containsPoint(const awt::Point& rPoin uno::Reference< XAccessible > SAL_CALL ScAccessibleContextBase::getAccessibleAtPoint( const awt::Point& /* rPoint */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return uno::Reference<XAccessible>(); } awt::Rectangle SAL_CALL ScAccessibleContextBase::getBounds( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -169,7 +164,6 @@ awt::Rectangle SAL_CALL ScAccessibleContextBase::getBounds( ) } awt::Point SAL_CALL ScAccessibleContextBase::getLocation( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -177,7 +171,6 @@ awt::Point SAL_CALL ScAccessibleContextBase::getLocation( ) } awt::Point SAL_CALL ScAccessibleContextBase::getLocationOnScreen( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -185,7 +178,6 @@ awt::Point SAL_CALL ScAccessibleContextBase::getLocationOnScreen( ) } awt::Size SAL_CALL ScAccessibleContextBase::getSize( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -193,7 +185,6 @@ awt::Size SAL_CALL ScAccessibleContextBase::getSize( ) } bool SAL_CALL ScAccessibleContextBase::isShowing( ) - throw (uno::RuntimeException) { SolarMutexGuard aGuard; IsObjectValid(); @@ -212,25 +203,21 @@ bool SAL_CALL ScAccessibleContextBase::isShowing( ) } bool SAL_CALL ScAccessibleContextBase::isVisible() - throw (uno::RuntimeException, std::exception) { return true; } void SAL_CALL ScAccessibleContextBase::grabFocus( ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } sal_Int32 SAL_CALL ScAccessibleContextBase::getForeground( ) - throw (uno::RuntimeException, std::exception) { return COL_BLACK; } sal_Int32 SAL_CALL ScAccessibleContextBase::getBackground( ) - throw (uno::RuntimeException, std::exception) { return COL_WHITE; } @@ -238,7 +225,6 @@ sal_Int32 SAL_CALL ScAccessibleContextBase::getBackground( ) //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); return 0; @@ -246,8 +232,6 @@ sal_Int32 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount() uno::Reference<XAccessible> SAL_CALL ScAccessibleContextBase::getAccessibleChild(sal_Int32 /* nIndex */) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, - std::exception) { OSL_FAIL("should be implemented in the abrevated class"); return uno::Reference<XAccessible>(); @@ -255,14 +239,12 @@ uno::Reference<XAccessible> SAL_CALL uno::Reference<XAccessible> SAL_CALL ScAccessibleContextBase::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { return mxParent; } sal_Int32 SAL_CALL ScAccessibleContextBase::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -296,14 +278,12 @@ sal_Int32 SAL_CALL sal_Int16 SAL_CALL ScAccessibleContextBase::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { return maRole; } OUString SAL_CALL ScAccessibleContextBase::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -329,7 +309,6 @@ OUString SAL_CALL OUString SAL_CALL ScAccessibleContextBase::getAccessibleName() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -356,22 +335,18 @@ OUString SAL_CALL uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleContextBase::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { return new utl::AccessibleRelationSetHelper(); } uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleContextBase::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { return uno::Reference<XAccessibleStateSet>(); } lang::Locale SAL_CALL ScAccessibleContextBase::getLocale() - throw (IllegalAccessibleComponentStateException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -393,7 +368,6 @@ lang::Locale SAL_CALL void SAL_CALL ScAccessibleContextBase::addAccessibleEventListener( const uno::Reference<XAccessibleEventListener>& xListener) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -411,7 +385,6 @@ void SAL_CALL void SAL_CALL ScAccessibleContextBase::removeAccessibleEventListener( const uno::Reference<XAccessibleEventListener>& xListener) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -436,7 +409,6 @@ void SAL_CALL void SAL_CALL ScAccessibleContextBase::disposing( const lang::EventObject& rSource ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (rSource.Source == mxParent) @@ -445,26 +417,22 @@ void SAL_CALL ScAccessibleContextBase::disposing( void SAL_CALL ScAccessibleContextBase::notifyEvent( const AccessibleEventObject& /* aEvent */ ) - throw (uno::RuntimeException, std::exception) { } // XServiceInfo OUString SAL_CALL ScAccessibleContextBase::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleContextBase"); } sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString& sServiceName) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } uno::Sequence< OUString> SAL_CALL ScAccessibleContextBase::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { return {"com.sun.star.accessibility.Accessible", "com.sun.star.accessibility.AccessibleContext"}; @@ -473,14 +441,12 @@ uno::Sequence< OUString> SAL_CALL //===== XTypeProvider ======================================================= uno::Sequence< uno::Type > SAL_CALL ScAccessibleContextBase::getTypes() - throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessibleContextBaseWeakImpl::getTypes(), ScAccessibleContextBaseImplEvent::getTypes()); } uno::Sequence<sal_Int8> SAL_CALL ScAccessibleContextBase::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -489,14 +455,12 @@ uno::Sequence<sal_Int8> SAL_CALL OUString SAL_CALL ScAccessibleContextBase::createAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); return OUString(); } OUString SAL_CALL ScAccessibleContextBase::createAccessibleName() - throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); return OUString(); @@ -533,21 +497,18 @@ void ScAccessibleContextBase::CommitFocusLost() const } Rectangle ScAccessibleContextBase::GetBoundingBoxOnScreen() const - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return Rectangle(); } Rectangle ScAccessibleContextBase::GetBoundingBox() const - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return Rectangle(); } void ScAccessibleContextBase::IsObjectValid() const - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) throw lang::DisposedException(); diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 39ab0c4817df..428a440fd398 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -104,20 +104,19 @@ void SAL_CALL ScAccessibleCsvControl::disposing() // XAccessibleComponent ------------------------------------------------------- Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint( const css::awt::Point& /* rPoint */ ) - throw( RuntimeException, std::exception ) { ensureAlive(); return nullptr; } -bool SAL_CALL ScAccessibleCsvControl::isVisible() throw( RuntimeException, std::exception ) +bool SAL_CALL ScAccessibleCsvControl::isVisible() { SolarMutexGuard aGuard; ensureAlive(); return implGetControl().IsVisible(); } -void SAL_CALL ScAccessibleCsvControl::grabFocus() throw( RuntimeException, std::exception ) +void SAL_CALL ScAccessibleCsvControl::grabFocus() { SolarMutexGuard aGuard; ensureAlive(); @@ -172,21 +171,21 @@ void ScAccessibleCsvControl::SendRemoveColumnEvent( sal_uInt32 /* nFirstColumn * // helpers -------------------------------------------------------------------- -Rectangle ScAccessibleCsvControl::GetBoundingBoxOnScreen() const throw( RuntimeException, std::exception ) +Rectangle ScAccessibleCsvControl::GetBoundingBoxOnScreen() const { SolarMutexGuard aGuard; ensureAlive(); return implGetControl().GetWindowExtentsRelative( nullptr ); } -Rectangle ScAccessibleCsvControl::GetBoundingBox() const throw( RuntimeException, std::exception ) +Rectangle ScAccessibleCsvControl::GetBoundingBox() const { SolarMutexGuard aGuard; ensureAlive(); return implGetControl().GetWindowExtentsRelative( implGetControl().GetAccessibleParentWindow() ); } -void ScAccessibleCsvControl::ensureAlive() const throw( DisposedException ) +void ScAccessibleCsvControl::ensureAlive() const { if( !implIsAlive() ) throw DisposedException(); @@ -199,7 +198,7 @@ ScCsvControl& ScAccessibleCsvControl::implGetControl() const } Reference< XAccessible > ScAccessibleCsvControl::implGetChildByRole( - const Reference< XAccessible >& rxParentObj, sal_uInt16 nRole ) throw( RuntimeException ) + const Reference< XAccessible >& rxParentObj, sal_uInt16 nRole ) { Reference< XAccessible > xAccObj; if( rxParentObj.is() ) @@ -342,7 +341,6 @@ ScAccessibleCsvRuler::~ScAccessibleCsvRuler() // XAccessibleComponent ----------------------------------------------------- sal_Int32 SAL_CALL ScAccessibleCsvRuler::getForeground( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -350,7 +348,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getForeground( ) } sal_Int32 SAL_CALL ScAccessibleCsvRuler::getBackground( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -359,21 +356,19 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getBackground( ) // XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvRuler::getAccessibleChildCount() { ensureAlive(); return 0; } Reference< XAccessible > SAL_CALL ScAccessibleCsvRuler::getAccessibleChild( sal_Int32 /* nIndex */ ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); throw IndexOutOfBoundsException(); } Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleRelationSet() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -389,7 +384,6 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvRuler::getAccessible } Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleStateSet() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; AccessibleStateSetHelper* pStateSet = implCreateStateSet(); @@ -405,7 +399,7 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleSta // XAccessibleText ------------------------------------------------------------ -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() { SolarMutexGuard aGuard; ensureAlive(); @@ -413,7 +407,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeExcept } sal_Bool SAL_CALL ScAccessibleCsvRuler::setCaretPosition( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -425,7 +418,6 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::setCaretPosition( sal_Int32 nIndex ) } sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -435,7 +427,6 @@ sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex ) Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& /* aRequestedAttributes */ ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -446,7 +437,6 @@ Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes( } css::awt::Rectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBounds( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -463,7 +453,7 @@ css::awt::Rectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBounds( sal_Int32 return aRect; } -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() { SolarMutexGuard aGuard; ensureAlive(); @@ -471,7 +461,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeExcep } sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const css::awt::Point& rPoint ) - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -480,32 +469,31 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const css::awt::Point& return lcl_GetApiPos( ::std::min( ::std::max( rRuler.GetPosFromX( rPoint.X ), static_cast<sal_Int32>(0) ), rRuler.GetPosCount() ) ); } -OUString SAL_CALL ScAccessibleCsvRuler::getSelectedText() throw( RuntimeException, std::exception ) +OUString SAL_CALL ScAccessibleCsvRuler::getSelectedText() { ensureAlive(); return OUString(); } -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionStart() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionStart() { ensureAlive(); return -1; } -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionEnd() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionEnd() { ensureAlive(); return -1; } sal_Bool SAL_CALL ScAccessibleCsvRuler::setSelection( sal_Int32 /* nStartIndex */, sal_Int32 /* nEndIndex */ ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); return false; } -OUString SAL_CALL ScAccessibleCsvRuler::getText() throw( RuntimeException, std::exception ) +OUString SAL_CALL ScAccessibleCsvRuler::getText() { SolarMutexGuard aGuard; ensureAlive(); @@ -513,7 +501,6 @@ OUString SAL_CALL ScAccessibleCsvRuler::getText() throw( RuntimeException, std:: } OUString SAL_CALL ScAccessibleCsvRuler::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -522,7 +509,6 @@ OUString SAL_CALL ScAccessibleCsvRuler::getTextRange( sal_Int32 nStartIndex, sal } TextSegment SAL_CALL ScAccessibleCsvRuler::getTextAtIndex( sal_Int32 nIndex, sal_Int16 nTextType ) - throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -587,7 +573,6 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextAtIndex( sal_Int32 nIndex, sal } TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 nTextType ) - throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -640,7 +625,6 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBeforeIndex( sal_Int32 nIndex, } TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 nTextType ) - throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -694,7 +678,6 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBehindIndex( sal_Int32 nIndex, } sal_Bool SAL_CALL ScAccessibleCsvRuler::copyText( sal_Int32 /* nStartIndex */, sal_Int32 /* nEndIndex */ ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); return false; @@ -703,7 +686,6 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::copyText( sal_Int32 /* nStartIndex */, s // XInterface ----------------------------------------------------------------- Any SAL_CALL ScAccessibleCsvRuler::queryInterface( const css::uno::Type& rType ) - throw( RuntimeException, std::exception ) { Any aAny( ScAccessibleCsvRulerImpl::queryInterface( rType ) ); return aAny.hasValue() ? aAny : ScAccessibleCsvControl::queryInterface( rType ); @@ -721,21 +703,21 @@ void SAL_CALL ScAccessibleCsvRuler::release() throw () // XServiceInfo --------------------------------------------------------------- -OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() { return OUString( RULER_IMPL_NAME ); } // XTypeProvider -------------------------------------------------------------- -Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception ) +Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() { Sequence< css::uno::Type > aSeq( 1 ); aSeq[ 0 ] = cppu::UnoType<XAccessibleText>::get(); return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq ); } -Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -757,32 +739,29 @@ void ScAccessibleCsvRuler::SendCaretEvent() // helpers -------------------------------------------------------------------- -OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName() throw( RuntimeException, std::exception ) +OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName() { return OUString( ScResId( STR_ACC_CSVRULER_NAME ) ); } -OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleDescription() throw( RuntimeException, std::exception ) +OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleDescription() { return OUString( ScResId( STR_ACC_CSVRULER_DESCR ) ); } void ScAccessibleCsvRuler::ensureValidIndex( sal_Int32 nIndex ) const - throw( IndexOutOfBoundsException ) { if( (nIndex < 0) || (nIndex >= implGetTextLength()) ) throw IndexOutOfBoundsException(); } void ScAccessibleCsvRuler::ensureValidIndexWithEnd( sal_Int32 nIndex ) const - throw( IndexOutOfBoundsException ) { if( (nIndex < 0) || (nIndex > implGetTextLength()) ) throw IndexOutOfBoundsException(); } void ScAccessibleCsvRuler::ensureValidRange( sal_Int32& rnStartIndex, sal_Int32& rnEndIndex ) const - throw( IndexOutOfBoundsException ) { if( rnStartIndex > rnEndIndex ) ::std::swap( rnStartIndex, rnEndIndex ); @@ -795,7 +774,7 @@ ScCsvRuler& ScAccessibleCsvRuler::implGetRuler() const return static_cast< ScCsvRuler& >( implGetControl() ); } -void ScAccessibleCsvRuler::constructStringBuffer() throw( RuntimeException ) +void ScAccessibleCsvRuler::constructStringBuffer() { SolarMutexGuard aGuard; ensureAlive(); @@ -877,7 +856,6 @@ void ScAccessibleCsvGrid::disposing() // XAccessibleComponent ------------------------------------------------------- Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw( RuntimeException, std::exception ) { Reference< XAccessible > xRet; if( containsPoint( rPoint ) ) @@ -897,7 +875,6 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( con } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getForeground( ) -throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -905,7 +882,6 @@ throw (RuntimeException, std::exception) } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getBackground( ) -throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -914,7 +890,7 @@ throw (RuntimeException, std::exception) // XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() { SolarMutexGuard aGuard; ensureAlive(); @@ -938,7 +914,6 @@ Reference<XAccessible> ScAccessibleCsvGrid::getAccessibleCell(sal_Int32 nRow, sa } Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -948,7 +923,6 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_I } Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleRelationSet() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -964,7 +938,6 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleR } Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStateSet() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; AccessibleStateSetHelper* pStateSet = implCreateStateSet(); @@ -983,14 +956,14 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStat // XAccessibleTable ----------------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowCount() { SolarMutexGuard aGuard; ensureAlive(); return implGetRowCount(); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount() { SolarMutexGuard aGuard; ensureAlive(); @@ -998,7 +971,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount() throw( Runtim } OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleRowDescription( sal_Int32 nRow ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1007,7 +979,6 @@ OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleRowDescription( sal_Int32 nR } OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1016,7 +987,6 @@ OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnDescription( sal_Int32 } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); ensureValidPosition( nRow, nColumn ); @@ -1024,7 +994,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowExtentAt( sal_Int32 nRow } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); ensureValidPosition( nRow, nColumn ); @@ -1032,28 +1001,24 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnExtentAt( sal_Int32 n } Reference< XAccessibleTable > SAL_CALL ScAccessibleCsvGrid::getAccessibleRowHeaders() - throw( RuntimeException, std::exception ) { ensureAlive(); return nullptr; } Reference< XAccessibleTable > SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnHeaders() - throw( RuntimeException, std::exception ) { ensureAlive(); return nullptr; } Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleRows() - throw( RuntimeException, std::exception ) { ensureAlive(); return Sequence< sal_Int32 >(); } Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleColumns() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1071,14 +1036,12 @@ Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleColumns } sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleRowSelected( sal_Int32 /* nRow */ ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); return false; } sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1087,7 +1050,6 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleColumnSelected( sal_Int32 nCo } Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1096,27 +1058,23 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleCellAt( sal_ } Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleCaption() - throw( RuntimeException, std::exception ) { ensureAlive(); return nullptr; } Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleSummary() - throw( RuntimeException, std::exception ) { ensureAlive(); return nullptr; } sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleSelected( sal_Int32 /* nRow */, sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { return isAccessibleColumnSelected( nColumn ); } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1125,7 +1083,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_ } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1134,7 +1091,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1145,7 +1101,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildInd // XAccessibleSelection ------------------------------------------------------- void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1158,7 +1113,6 @@ void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex } sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1167,19 +1121,19 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int32 nChi return implIsColumnSelected( nColumn ); } -void SAL_CALL ScAccessibleCsvGrid::clearAccessibleSelection() throw( RuntimeException, std::exception ) +void SAL_CALL ScAccessibleCsvGrid::clearAccessibleSelection() { SolarMutexGuard aGuard; ensureAlive(); implGetGrid().SelectAll( false ); } -void SAL_CALL ScAccessibleCsvGrid::selectAllAccessibleChildren() throw( RuntimeException, std::exception ) +void SAL_CALL ScAccessibleCsvGrid::selectAllAccessibleChildren() { selectAccessibleChild( 0 ); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() { SolarMutexGuard aGuard; ensureAlive(); @@ -1187,7 +1141,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() throw( } Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1201,7 +1154,6 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChil } void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1218,7 +1170,6 @@ void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedC // XInterface ----------------------------------------------------------------- Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const css::uno::Type& rType ) - throw( RuntimeException, std::exception ) { Any aAny( ScAccessibleCsvGridImpl::queryInterface( rType ) ); return aAny.hasValue() ? aAny : ScAccessibleCsvControl::queryInterface( rType ); @@ -1236,14 +1187,14 @@ void SAL_CALL ScAccessibleCsvGrid::release() throw () // XServiceInfo --------------------------------------------------------------- -OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() { return OUString( GRID_IMPL_NAME ); } // XTypeProvider -------------------------------------------------------------- -Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception ) +Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() { Sequence< css::uno::Type > aSeq( 2 ); aSeq[ 0 ] = cppu::UnoType<XAccessibleTable>::get(); @@ -1251,7 +1202,7 @@ Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( Runti return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq ); } -Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -1316,25 +1267,23 @@ void ScAccessibleCsvGrid::SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uI // helpers -------------------------------------------------------------------- -OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName() throw( RuntimeException, std::exception ) +OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName() { return OUString( ScResId( STR_ACC_CSVGRID_NAME ) ); } -OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleDescription() throw( RuntimeException, std::exception ) +OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleDescription() { return OUString( ScResId( STR_ACC_CSVGRID_DESCR ) ); } void ScAccessibleCsvGrid::ensureValidIndex( sal_Int32 nIndex ) const - throw( IndexOutOfBoundsException ) { if( (nIndex < 0) || (nIndex >= implGetCellCount()) ) throw IndexOutOfBoundsException(); } void ScAccessibleCsvGrid::ensureValidPosition( sal_Int32 nRow, sal_Int32 nColumn ) const - throw( IndexOutOfBoundsException ) { if( (nRow < 0) || (nRow >= implGetRowCount()) || (nColumn < 0) || (nColumn >= implGetColumnCount()) ) throw IndexOutOfBoundsException(); @@ -1434,7 +1383,7 @@ void SAL_CALL ScAccessibleCsvCell::disposing() // XAccessibleComponent ------------------------------------------------------- -void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException, std::exception ) +void SAL_CALL ScAccessibleCsvCell::grabFocus() { SolarMutexGuard aGuard; ensureAlive(); @@ -1443,7 +1392,6 @@ void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException, std::exc } sal_Int32 SAL_CALL ScAccessibleCsvCell::getForeground( ) -throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -1451,7 +1399,6 @@ throw (RuntimeException, std::exception) } sal_Int32 SAL_CALL ScAccessibleCsvCell::getBackground( ) -throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -1460,18 +1407,17 @@ throw (RuntimeException, std::exception) // XAccessibleContext ----------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleChildCount() { return AccessibleStaticTextBase::getAccessibleChildCount(); } Reference< XAccessible > SAL_CALL ScAccessibleCsvCell::getAccessibleChild( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { return AccessibleStaticTextBase::getAccessibleChild( nIndex ); } -sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() { SolarMutexGuard aGuard; ensureAlive(); @@ -1479,7 +1425,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() throw( Runt } Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvCell::getAccessibleRelationSet() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1487,7 +1432,6 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvCell::getAccessibleR } Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvCell::getAccessibleStateSet() - throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; AccessibleStateSetHelper* pStateSet = implCreateStateSet(); @@ -1515,14 +1459,14 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScAccessibleCsvCell, ScAccessibleCsvControl, A // XServiceInfo --------------------------------------------------------------- -OUString SAL_CALL ScAccessibleCsvCell::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL ScAccessibleCsvCell::getImplementationName() { return OUString( CELL_IMPL_NAME ); } // helpers -------------------------------------------------------------------- -Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const throw( RuntimeException, std::exception ) +Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const { SolarMutexGuard aGuard; ensureAlive(); @@ -1531,19 +1475,19 @@ Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const throw( RuntimeExce return aRect; } -Rectangle ScAccessibleCsvCell::GetBoundingBox() const throw( RuntimeException, std::exception ) +Rectangle ScAccessibleCsvCell::GetBoundingBox() const { SolarMutexGuard aGuard; ensureAlive(); return implGetBoundingBox(); } -OUString SAL_CALL ScAccessibleCsvCell::createAccessibleName() throw( RuntimeException, std::exception ) +OUString SAL_CALL ScAccessibleCsvCell::createAccessibleName() { return maCellText; } -OUString SAL_CALL ScAccessibleCsvCell::createAccessibleDescription() throw( RuntimeException ) +OUString SAL_CALL ScAccessibleCsvCell::createAccessibleDescription() { return OUString(); } diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 2416aa27b510..6ee818cb4aa1 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -266,14 +266,12 @@ public: const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (css::uno::RuntimeException) 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; + GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape) override; ///===== Internal ======================================================== void SetDrawBroadcaster(); @@ -464,7 +462,6 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const SfxHint& rHint) bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentChild, const css::uno::Reference< css::drawing::XShape >& _rxShape, const long /*_nIndex*/, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo) - throw (uno::RuntimeException) { // create the new child rtl::Reference< ::accessibility::AccessibleShape > pReplacement(::accessibility::ShapeTypeHandler::Instance().CreateAccessibleObject ( @@ -507,7 +504,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC return bResult; } -::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException) +::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) { sal_Int32 count = GetCount(); for (sal_Int32 index=0;index<count;index++) @@ -529,7 +526,6 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC css::uno::Reference < css::accessibility::XAccessible > ScChildrenShapes::GetAccessibleCaption (const css::uno::Reference < css::drawing::XShape>& xShape) - throw (css::uno::RuntimeException) { sal_Int32 count = GetCount(); for (sal_Int32 index=0;index<count;index++) @@ -1468,7 +1464,6 @@ void SAL_CALL ScAccessibleDocument::disposing() } void SAL_CALL ScAccessibleDocument::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { disposing(); } @@ -1648,7 +1643,6 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } void SAL_CALL ScAccessibleDocument::selectionChanged( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException, std::exception) { bool bSelectionChanged(false); if (mpAccessibleSpreadsheet.is()) @@ -1678,7 +1672,6 @@ void SAL_CALL ScAccessibleDocument::selectionChanged( const lang::EventObject& / //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessibleDocument::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException, std::exception) { uno::Any aAnyTmp; if(rType == cppu::UnoType<XAccessibleGetAccFlowTo>::get()) @@ -1707,7 +1700,6 @@ void SAL_CALL ScAccessibleDocument::release() uno::Reference< XAccessible > SAL_CALL ScAccessibleDocument::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xAccessible = nullptr; if (containsPoint(rPoint)) @@ -1737,7 +1729,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocument::getAccessibleAtPoin } void SAL_CALL ScAccessibleDocument::grabFocus( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1763,7 +1754,6 @@ void SAL_CALL ScAccessibleDocument::grabFocus( ) /// Return the number of currently visible children. sal_Int32 SAL_CALL ScAccessibleDocument::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1780,8 +1770,6 @@ sal_Int32 SAL_CALL /// Return the specified child or NULL if index is invalid. uno::Reference<XAccessible> SAL_CALL ScAccessibleDocument::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, - lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1812,7 +1800,6 @@ uno::Reference<XAccessible> SAL_CALL /// Return the set of current states. uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocument::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -1839,7 +1826,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL OUString SAL_CALL ScAccessibleDocument::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1875,7 +1861,6 @@ OUString SAL_CALL void SAL_CALL ScAccessibleDocument::selectAccessibleChild( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1909,7 +1894,6 @@ void SAL_CALL sal_Bool SAL_CALL ScAccessibleDocument::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1942,7 +1926,6 @@ sal_Bool SAL_CALL void SAL_CALL ScAccessibleDocument::clearAccessibleSelection( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1953,7 +1936,6 @@ void SAL_CALL void SAL_CALL ScAccessibleDocument::selectAllAccessibleChildren( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1970,7 +1952,6 @@ void SAL_CALL sal_Int32 SAL_CALL ScAccessibleDocument::getSelectedAccessibleChildCount( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1990,7 +1971,6 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible > SAL_CALL ScAccessibleDocument::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -2018,7 +1998,6 @@ uno::Reference<XAccessible > SAL_CALL void SAL_CALL ScAccessibleDocument::deselectAccessibleChild( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -2051,14 +2030,12 @@ void SAL_CALL OUString SAL_CALL ScAccessibleDocument::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleDocument"); } uno::Sequence< OUString> SAL_CALL ScAccessibleDocument::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -2072,14 +2049,12 @@ uno::Sequence< OUString> SAL_CALL //===== XTypeProvider ======================================================= uno::Sequence< uno::Type > SAL_CALL ScAccessibleDocument::getTypes() - throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessibleDocumentImpl::getTypes(), ScAccessibleContextBase::getTypes()); } uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDocument::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -2149,7 +2124,6 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA OUString SAL_CALL ScAccessibleDocument::createAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OUString sDescription = OUString(ScResId(STR_ACC_DOC_DESCR)); return sDescription; @@ -2157,7 +2131,6 @@ OUString SAL_CALL OUString SAL_CALL ScAccessibleDocument::createAccessibleName() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -2168,7 +2141,6 @@ OUString SAL_CALL } Rectangle ScAccessibleDocument::GetBoundingBoxOnScreen() const - throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) @@ -2181,7 +2153,6 @@ Rectangle ScAccessibleDocument::GetBoundingBoxOnScreen() const } Rectangle ScAccessibleDocument::GetBoundingBox() const - throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) @@ -2307,7 +2278,6 @@ ScAddress ScAccessibleDocument::GetCurCellAddress() const } uno::Any SAL_CALL ScAccessibleDocument::getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -2384,7 +2354,6 @@ css::uno::Sequence< css::uno::Any > ScAccessibleDocument::GetScAccFlowToSequence css::uno::Sequence< css::uno::Any > SAL_CALL ScAccessibleDocument::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) - throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -2480,13 +2449,11 @@ css::uno::Sequence< css::uno::Any > } sal_Int32 SAL_CALL ScAccessibleDocument::getForeground( ) - throw (uno::RuntimeException, std::exception) { return COL_BLACK; } sal_Int32 SAL_CALL ScAccessibleDocument::getBackground( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index f8f55086484c..56d300981b29 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -622,7 +622,7 @@ public: const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (css::uno::RuntimeException) override; + ) override; ///===== Internal ======================================================== @@ -824,7 +824,6 @@ void ScShapeChildren::VisAreaChanged() const bool ScShapeChildren::ReplaceChild (::accessibility::AccessibleShape* /* pCurrentChild */, const css::uno::Reference< css::drawing::XShape >& /* _rxShape */, const long /* _nIndex */, const ::accessibility::AccessibleShapeTreeInfo& /* _rShapeTreeInfo */) - throw (uno::RuntimeException) { OSL_FAIL("should not be called in the page preview"); return false; @@ -1312,7 +1311,6 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint //===== XAccessibleComponent ============================================ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xAccessible; if (containsPoint(rPoint)) @@ -1373,7 +1371,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces return xAccessible; } -void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() { SolarMutexGuard aGuard; IsObjectValid(); @@ -1391,7 +1389,6 @@ void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() throw (uno::RuntimeEx //===== XAccessibleContext ============================================== sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1407,7 +1404,6 @@ sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount() } uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1470,7 +1466,6 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi /// Return the set of current states. uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -1498,13 +1493,11 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleDocumentPagePreview"); } uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -1519,7 +1512,6 @@ uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedS uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDocumentPagePreview::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1527,20 +1519,18 @@ uno::Sequence<sal_Int8> SAL_CALL //===== internal ======================================================== OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OUString sDescription = OUString(ScResId(STR_ACC_PREVIEWDOC_DESCR)); return sDescription; } OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName() - throw (uno::RuntimeException, std::exception) { OUString sName = OUString(ScResId(STR_ACC_PREVIEWDOC_NAME)); return sName; } -Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) +Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const { Rectangle aRect; if (mpViewShell) @@ -1552,7 +1542,7 @@ Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const throw return aRect; } -Rectangle ScAccessibleDocumentPagePreview::GetBoundingBox() const throw (uno::RuntimeException, std::exception) +Rectangle ScAccessibleDocumentPagePreview::GetBoundingBox() const { Rectangle aRect; if (mpViewShell) @@ -1598,7 +1588,6 @@ ScShapeChildren* ScAccessibleDocumentPagePreview::GetShapeChildren() } OUString ScAccessibleDocumentPagePreview::getAccessibleName() -throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 878ee603d219..6393c872f253 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -128,7 +128,6 @@ void ScAccessibleEditObject::GotFocus() css::uno::Any SAL_CALL ScAccessibleEditObject::queryInterface (const css::uno::Type & rType) - throw (css::uno::RuntimeException, std::exception) { css::uno::Any aReturn = ScAccessibleContextBase::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -153,7 +152,6 @@ void SAL_CALL uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; if (containsPoint(rPoint)) @@ -170,7 +168,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPo } Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen() const - throw (uno::RuntimeException, std::exception) { Rectangle aScreenBounds; @@ -199,7 +196,6 @@ Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen() const } Rectangle ScAccessibleEditObject::GetBoundingBox() const - throw (uno::RuntimeException, std::exception) { Rectangle aBounds( GetBoundingBoxOnScreen() ); @@ -234,7 +230,6 @@ Rectangle ScAccessibleEditObject::GetBoundingBox() const sal_Int32 SAL_CALL ScAccessibleEditObject::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -244,8 +239,6 @@ sal_Int32 SAL_CALL uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, - lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -255,7 +248,6 @@ uno::Reference< XAccessible > SAL_CALL uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleEditObject::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -283,7 +275,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL OUString SAL_CALL ScAccessibleEditObject::createAccessibleDescription() - throw (uno::RuntimeException) { // OSL_FAIL("Should never be called, because is set in the constructor.") return OUString(); @@ -291,7 +282,6 @@ OUString SAL_CALL OUString SAL_CALL ScAccessibleEditObject::createAccessibleName() - throw (uno::RuntimeException, std::exception) { OSL_FAIL("Should never be called, because is set in the constructor."); return OUString(); @@ -301,7 +291,6 @@ OUString SAL_CALL void SAL_CALL ScAccessibleEditObject::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener) - throw (uno::RuntimeException, std::exception) { CreateTextHelper(); @@ -312,7 +301,6 @@ void SAL_CALL void SAL_CALL ScAccessibleEditObject::removeAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener) - throw (uno::RuntimeException, std::exception) { CreateTextHelper(); @@ -324,7 +312,6 @@ void SAL_CALL //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleEditObject::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleEditObject"); } @@ -333,7 +320,6 @@ OUString SAL_CALL ScAccessibleEditObject::getImplementationName() uno::Sequence<sal_Int8> SAL_CALL ScAccessibleEditObject::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -393,13 +379,11 @@ void ScAccessibleEditObject::CreateTextHelper() } sal_Int32 SAL_CALL ScAccessibleEditObject::getForeground( ) - throw (css::uno::RuntimeException, std::exception) { return GetFgBgColor(SC_UNONAME_CCOLOR); } sal_Int32 SAL_CALL ScAccessibleEditObject::getBackground( ) - throw (css::uno::RuntimeException, std::exception) { return GetFgBgColor(SC_UNONAME_CELLBACK); } @@ -444,13 +428,10 @@ sal_Int32 ScAccessibleEditObject::GetFgBgColor( const OUString &strPropColor) //===== XAccessibleSelection ============================================ void SAL_CALL ScAccessibleEditObject::selectAccessibleChild( sal_Int32 ) -throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { } sal_Bool SAL_CALL ScAccessibleEditObject::isAccessibleChildSelected( sal_Int32 nChildIndex ) -throw ( IndexOutOfBoundsException, - RuntimeException, std::exception ) { uno::Reference<XAccessible> xAcc = getAccessibleChild( nChildIndex ); uno::Reference<XAccessibleContext> xContext; @@ -472,17 +453,14 @@ throw ( IndexOutOfBoundsException, } void SAL_CALL ScAccessibleEditObject::clearAccessibleSelection( ) -throw ( RuntimeException, std::exception ) { } void SAL_CALL ScAccessibleEditObject::selectAllAccessibleChildren( ) -throw ( RuntimeException, std::exception ) { } sal_Int32 SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChildCount() -throw ( RuntimeException, std::exception ) { sal_Int32 nCount = 0; sal_Int32 TotalCount = getAccessibleChildCount(); @@ -492,7 +470,6 @@ throw ( RuntimeException, std::exception ) } uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) -throw ( IndexOutOfBoundsException, RuntimeException, std::exception) { if ( nSelectedChildIndex > getSelectedAccessibleChildCount() ) throw IndexOutOfBoundsException(); @@ -509,13 +486,10 @@ throw ( IndexOutOfBoundsException, RuntimeException, std::exception) void SAL_CALL ScAccessibleEditObject::deselectAccessibleChild( sal_Int32 ) - throw ( IndexOutOfBoundsException, - RuntimeException, std::exception ) { } uno::Reference< XAccessibleRelationSet > ScAccessibleEditObject::getAccessibleRelationSet( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; vcl::Window* pWindow = mpWindow; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index 178b40a85ec8..ca38874eb626 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -93,29 +93,25 @@ ScAccessibleFilterMenu::~ScAccessibleFilterMenu() // XAccessibleComponent Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleAtPoint( const css::awt::Point& /*rPoint*/ ) - throw (RuntimeException, std::exception) { return this; } -bool ScAccessibleFilterMenu::isVisible() throw (RuntimeException, std::exception) +bool ScAccessibleFilterMenu::isVisible() { return mpWindow->IsVisible(); } void ScAccessibleFilterMenu::grabFocus() - throw (RuntimeException, std::exception) { } sal_Int32 ScAccessibleFilterMenu::getForeground() - throw (RuntimeException, std::exception) { return 0; } sal_Int32 ScAccessibleFilterMenu::getBackground() - throw (RuntimeException, std::exception) { return 0; } @@ -123,13 +119,11 @@ sal_Int32 ScAccessibleFilterMenu::getBackground() // XAccessibleContext sal_Int32 ScAccessibleFilterMenu::getAccessibleChildCount() - throw (RuntimeException, std::exception) { return getMenuItemCount(); } Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nIndex) - throw (RuntimeException, IndexOutOfBoundsException, std::exception) { if (maMenuItems.size() <= static_cast<size_t>(nIndex)) throw IndexOutOfBoundsException(); @@ -138,14 +132,12 @@ Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nInd } Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet() - throw (RuntimeException, std::exception) { updateStates(); return mxStateSet; } OUString ScAccessibleFilterMenu::getImplementationName() - throw (RuntimeException, std::exception) { return OUString("ScAccessibleFilterMenu"); } @@ -154,7 +146,6 @@ OUString ScAccessibleFilterMenu::getImplementationName() void ScAccessibleFilterMenu::addAccessibleEventListener( const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) - throw (css::uno::RuntimeException, std::exception) { ScAccessibleContextBase::addAccessibleEventListener(xListener); for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, true)); @@ -162,7 +153,6 @@ void ScAccessibleFilterMenu::addAccessibleEventListener( void ScAccessibleFilterMenu::removeAccessibleEventListener( const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) - throw (css::uno::RuntimeException, std::exception) { ScAccessibleContextBase::removeAccessibleEventListener(xListener); for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, false)); @@ -171,7 +161,6 @@ void ScAccessibleFilterMenu::removeAccessibleEventListener( // XAccessibleSelection void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) throw IndexOutOfBoundsException(); @@ -180,7 +169,6 @@ void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex) } sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) throw IndexOutOfBoundsException(); @@ -188,24 +176,23 @@ sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex return mpWindow->isMenuItemSelected(static_cast<size_t>(nChildIndex)); } -void ScAccessibleFilterMenu::clearAccessibleSelection() throw (RuntimeException, std::exception) +void ScAccessibleFilterMenu::clearAccessibleSelection() { mpWindow->clearSelectedMenuItem(); } -void ScAccessibleFilterMenu::selectAllAccessibleChildren() throw (RuntimeException, std::exception) +void ScAccessibleFilterMenu::selectAllAccessibleChildren() { // not supported - this is a menu, you can't select all menu items. } -sal_Int32 ScAccessibleFilterMenu::getSelectedAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 ScAccessibleFilterMenu::getSelectedAccessibleChildCount() { // Since this is a menu, either one menu item is selected, or none at all. return mpWindow->getSelectedMenuItem() == ScMenuFloatingWindow::MENU_NOT_SELECTED ? 0 : 1; } Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_Int32 nChildIndex) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) throw IndexOutOfBoundsException(); @@ -213,7 +200,7 @@ Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_In return maMenuItems[nChildIndex]; } -void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) throw IndexOutOfBoundsException(); @@ -224,7 +211,6 @@ void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex) thro // XInterface uno::Any SAL_CALL ScAccessibleFilterMenu::queryInterface( uno::Type const & rType ) - throw (RuntimeException, std::exception) { Any any = ScAccessibleContextBase::queryInterface(rType); if (any.hasValue()) @@ -246,13 +232,11 @@ void SAL_CALL ScAccessibleFilterMenu::release() throw () // XTypeProvider Sequence<sal_Int8> ScAccessibleFilterMenu::getImplementationId() - throw (RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const - throw (RuntimeException, std::exception) { if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED) return Rectangle(); @@ -275,7 +259,6 @@ Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const } Rectangle ScAccessibleFilterMenu::GetBoundingBox() const - throw (RuntimeException, std::exception) { if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED) return Rectangle(); diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index 634bb7fc39bc..1b2174ecbdcb 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx @@ -53,58 +53,51 @@ ScAccessibleFilterMenuItem::~ScAccessibleFilterMenuItem() } sal_Int32 ScAccessibleFilterMenuItem::getAccessibleChildCount() - throw (RuntimeException, std::exception) { return 0; } Reference<XAccessible> ScAccessibleFilterMenuItem::getAccessibleChild(sal_Int32 /*nIndex*/) - throw (RuntimeException, IndexOutOfBoundsException, std::exception) { throw IndexOutOfBoundsException(); } Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet() - throw (RuntimeException, std::exception) { updateStateSet(); return mxStateSet; } OUString ScAccessibleFilterMenuItem::getImplementationName() - throw (RuntimeException, std::exception) { return OUString("ScAccessibleFilterMenuItem"); } // XAccessibleAction -sal_Int32 ScAccessibleFilterMenuItem::getAccessibleActionCount() throw (RuntimeException, std::exception) +sal_Int32 ScAccessibleFilterMenuItem::getAccessibleActionCount() { return 1; } sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { mpWindow->executeMenuItem(mnMenuPos); return true; } OUString ScAccessibleFilterMenuItem::getAccessibleActionDescription(sal_Int32 /*nIndex*/) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return OUString("click"); } Reference<XAccessibleKeyBinding> ScAccessibleFilterMenuItem::getAccessibleActionKeyBinding( - sal_Int32 /*nIndex*/) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Int32 /*nIndex*/) { return Reference<XAccessibleKeyBinding>(); } Any SAL_CALL ScAccessibleFilterMenuItem::queryInterface( uno::Type const & rType ) - throw (RuntimeException, std::exception) { Any any = ScAccessibleContextBase::queryInterface(rType); if (any.hasValue()) @@ -134,7 +127,6 @@ void ScAccessibleFilterMenuItem::setEnabled(bool bEnabled) } Rectangle ScAccessibleFilterMenuItem::GetBoundingBoxOnScreen() const - throw (RuntimeException, std::exception) { if (!mpWindow->IsVisible()) return Rectangle(); @@ -148,7 +140,6 @@ Rectangle ScAccessibleFilterMenuItem::GetBoundingBoxOnScreen() const } Rectangle ScAccessibleFilterMenuItem::GetBoundingBox() const - throw (RuntimeException, std::exception) { if (!mpWindow->IsVisible()) return Rectangle(); diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index 0d24e7093152..958ce1cbea16 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -42,14 +42,14 @@ ScAccessibleFilterTopWindow::~ScAccessibleFilterTopWindow() // XAccessibleContext -sal_Int32 ScAccessibleFilterTopWindow::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 ScAccessibleFilterTopWindow::getAccessibleChildCount() { sal_Int32 nMenuCount = getMenuItemCount(); return nMenuCount + 6; } Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild( - sal_Int32 nIndex) throw (RuntimeException, IndexOutOfBoundsException, std::exception) + sal_Int32 nIndex) { if (nIndex >= getAccessibleChildCount()) throw IndexOutOfBoundsException(); @@ -82,7 +82,7 @@ Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild( return Reference<XAccessible>(); } -OUString ScAccessibleFilterTopWindow::getImplementationName() throw (RuntimeException, std::exception) +OUString ScAccessibleFilterTopWindow::getImplementationName() { return OUString("ScAccessibleFilterTopWindow"); } diff --git a/sc/source/ui/Accessibility/AccessibleGlobal.cxx b/sc/source/ui/Accessibility/AccessibleGlobal.cxx index 8d37a8aa005a..19e23a7e0444 100644 --- a/sc/source/ui/Accessibility/AccessibleGlobal.cxx +++ b/sc/source/ui/Accessibility/AccessibleGlobal.cxx @@ -33,19 +33,18 @@ ScAccessibleStateSet::~ScAccessibleStateSet() // XAccessibleStateSet -sal_Bool SAL_CALL ScAccessibleStateSet::isEmpty() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ScAccessibleStateSet::isEmpty() { return maStates.empty(); } sal_Bool SAL_CALL ScAccessibleStateSet::contains(sal_Int16 nState) - throw (RuntimeException, std::exception) { return maStates.count(nState) != 0; } sal_Bool SAL_CALL ScAccessibleStateSet::containsAll( - const Sequence<sal_Int16>& aStateSet) throw (RuntimeException, std::exception) + const Sequence<sal_Int16>& aStateSet) { sal_Int32 n = aStateSet.getLength(); for (sal_Int32 i = 0; i < n; ++i) @@ -59,7 +58,6 @@ sal_Bool SAL_CALL ScAccessibleStateSet::containsAll( } Sequence<sal_Int16> SAL_CALL ScAccessibleStateSet::getStates() - throw (RuntimeException, std::exception) { Sequence<sal_Int16> aSeq(0); set<sal_Int16>::const_iterator itr = maStates.begin(), itrEnd = maStates.end(); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 1d5976679294..55ca0b0248e1 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -144,7 +144,6 @@ void ScAccessiblePageHeader::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) //===== XAccessibleComponent ============================================ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; @@ -172,7 +171,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleAtPo return xRet; } -void SAL_CALL ScAccessiblePageHeader::grabFocus() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScAccessiblePageHeader::grabFocus() { SolarMutexGuard aGuard; IsObjectValid(); @@ -186,7 +185,7 @@ void SAL_CALL ScAccessiblePageHeader::grabFocus() throw (uno::RuntimeException, //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -217,7 +216,6 @@ sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno: } uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChild( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -248,13 +246,12 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChil return xRet; } -sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent() { return mnIndex; } uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -280,13 +277,12 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccess //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() { return OUString("ScAccessiblePageHeader"); } uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -300,20 +296,18 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceName //==== internal ========================================================= OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OUString sDesc(SC_RESSTR(mbHeader ? STR_ACC_HEADER_DESCR : STR_ACC_FOOTER_DESCR)); return sDesc.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN)); } OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName() - throw (uno::RuntimeException, std::exception) { OUString sName(SC_RESSTR(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME)); return sName.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN)); } -Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) +Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const { Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) @@ -329,7 +323,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::Run return aCellRect; } -Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeException, std::exception) +Rectangle ScAccessiblePageHeader::GetBoundingBox() const { Rectangle aRect; if (mpViewShell) diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 662b6d3d285e..9d698889ac41 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -109,7 +109,6 @@ void ScAccessiblePageHeaderArea::Notify( SfxBroadcaster& rBC, const SfxHint& rHi uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; if (containsPoint(rPoint)) @@ -130,7 +129,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessible sal_Int32 SAL_CALL ScAccessiblePageHeaderArea::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -141,8 +139,6 @@ sal_Int32 SAL_CALL uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, - lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -153,7 +149,6 @@ uno::Reference< XAccessible > SAL_CALL uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePageHeaderArea::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -181,14 +176,12 @@ uno::Reference<XAccessibleStateSet> SAL_CALL OUString SAL_CALL ScAccessiblePageHeaderArea::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString("ScAccessiblePageHeaderArea"); } uno::Sequence< OUString> SAL_CALL ScAccessiblePageHeaderArea::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -203,14 +196,12 @@ uno::Sequence< OUString> SAL_CALL uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePageHeaderArea::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } //===== internal ============================================================== OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription() - throw(uno::RuntimeException, std::exception) { OUString sDesc; switch (meAdjust) @@ -232,7 +223,6 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription() } OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName() - throw (uno::RuntimeException, std::exception) { OUString sName; switch (meAdjust) @@ -254,7 +244,6 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName() } Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen() const - throw(css::uno::RuntimeException, std::exception) { Rectangle aRect; if (mxParent.is()) @@ -271,7 +260,6 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen() const } Rectangle ScAccessiblePageHeaderArea::GetBoundingBox() const - throw (css::uno::RuntimeException, std::exception) { Rectangle aRect; if (mxParent.is()) diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index f7f457ff4446..a931018fd28f 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -95,7 +95,6 @@ void ScAccessiblePreviewCell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint //===== XAccessibleComponent ============================================ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; if (containsPoint(rPoint)) @@ -112,7 +111,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleAtP return xRet; } -void SAL_CALL ScAccessiblePreviewCell::grabFocus() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScAccessiblePreviewCell::grabFocus() { SolarMutexGuard aGuard; IsObjectValid(); @@ -126,7 +125,7 @@ void SAL_CALL ScAccessiblePreviewCell::grabFocus() throw (uno::RuntimeException, //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -136,7 +135,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() throw(uno: } uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -146,7 +144,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChi } uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessibleStateSet() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -178,13 +175,12 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessi //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() { return OUString("ScAccessiblePreviewCell"); } uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -199,14 +195,13 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNam uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewCell::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } //==== internal ========================================================= -Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) +Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const { Rectangle aCellRect; if (mpViewShell) @@ -223,7 +218,7 @@ Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const throw (uno::Ru return aCellRect; } -Rectangle ScAccessiblePreviewCell::GetBoundingBox() const throw (uno::RuntimeException, std::exception) +Rectangle ScAccessiblePreviewCell::GetBoundingBox() const { Rectangle aCellRect; if (mpViewShell) diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index de1ba2790abc..06dc5b76689a 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -135,7 +135,6 @@ void ScAccessiblePreviewHeaderCell::Notify( SfxBroadcaster& rBC, const SfxHint& //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException, std::exception) { uno::Any aAny (ScAccessiblePreviewHeaderCellImpl::queryInterface(rType)); return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType); @@ -155,7 +154,7 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::release() //===== XAccessibleValue ================================================ -uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() { SolarMutexGuard aGuard; IsObjectValid(); @@ -170,13 +169,12 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::R } sal_Bool SAL_CALL ScAccessiblePreviewHeaderCell::setCurrentValue( const uno::Any& /* aNumber */ ) - throw (uno::RuntimeException, std::exception) { // it is not possible to set a value return false; } -uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue() { SolarMutexGuard aGuard; IsObjectValid(); @@ -189,7 +187,7 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue() throw (uno::R return uno::Any(fValue); } -uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMinimumValue() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMinimumValue() { double fValue(0.0); return uno::Any(fValue); @@ -198,7 +196,6 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMinimumValue() throw (uno::R //===== XAccessibleComponent ============================================ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; if (containsPoint(rPoint)) @@ -215,7 +212,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessi return xRet; } -void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() { SolarMutexGuard aGuard; IsObjectValid(); @@ -229,7 +226,7 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() throw (uno::RuntimeExce //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -239,7 +236,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() thro } uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -248,13 +244,12 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessi return mpTextHelper->GetChild(nIndex); } -sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent() { return mnIndex; } uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleStateSet() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -282,13 +277,12 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getA //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() { return OUString("ScAccessiblePreviewHeaderCell"); } uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -302,21 +296,19 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServ //===== XTypeProvider ======================================================= uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewHeaderCell::getTypes() - throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessiblePreviewHeaderCellImpl::getTypes(), ScAccessibleContextBase::getTypes()); } uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } //==== internal ========================================================= -Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) +Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const { Rectangle aCellRect; @@ -343,7 +335,7 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (u return aCellRect; } -Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::RuntimeException, std::exception) +Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const { FillTableInfo(); @@ -370,13 +362,13 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::Runt return Rectangle(); } -OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() { OUString sDescription = OUString(ScResId(STR_ACC_HEADERCELL_DESCR)); return sDescription; } -OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() { OUString sName = OUString(ScResId(STR_ACC_HEADERCELL_NAME)); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index ac7deac10917..d9235cb972a1 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -107,7 +107,6 @@ void ScAccessiblePreviewTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessiblePreviewTable::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException, std::exception) { uno::Any aAny (ScAccessiblePreviewTableImpl::queryInterface(rType)); return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType); @@ -128,7 +127,6 @@ void SAL_CALL ScAccessiblePreviewTable::release() //===== XAccessibleTable ================================================ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -142,7 +140,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowCount() } sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -156,7 +153,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnCount() } OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sal_Int32 nRow ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; FillTableInfo(); @@ -167,7 +163,6 @@ OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sal_Int } OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; FillTableInfo(); @@ -178,7 +173,6 @@ OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( sal_ } sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -212,7 +206,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32 } sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -245,32 +238,31 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnExtentAt( sal_In return nColumns; } -uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleRowHeaders() throw (uno::RuntimeException, std::exception) +uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleRowHeaders() { //! missing return nullptr; } -uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnHeaders() throw (uno::RuntimeException, std::exception) +uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnHeaders() { //! missing return nullptr; } -uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleRows() throw (uno::RuntimeException, std::exception) +uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleRows() { // in the page preview, there is no selection return uno::Sequence<sal_Int32>(0); } -uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleColumns() throw (uno::RuntimeException, std::exception) +uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleColumns() { // in the page preview, there is no selection return uno::Sequence<sal_Int32>(0); } sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleRowSelected( sal_Int32 nRow ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { // in the page preview, there is no selection @@ -283,7 +275,6 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleRowSelected( sal_Int32 n } sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { // in the page preview, there is no selection @@ -296,7 +287,6 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleColumnSelected( sal_Int3 } uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -336,20 +326,19 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCe return xRet; } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCaption() throw (uno::RuntimeException, std::exception) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCaption() { //! missing return nullptr; } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleSummary() throw (uno::RuntimeException, std::exception) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleSummary() { //! missing return nullptr; } sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { // in the page preview, there is no selection SolarMutexGuard aGuard; @@ -368,7 +357,6 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow } sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -388,7 +376,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, } sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -407,7 +394,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildI } sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumn( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -428,7 +414,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumn( sal_Int32 nChi //===== XAccessibleComponent ============================================ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; if (containsPoint(aPoint)) @@ -476,7 +461,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleAt return xRet; } -void SAL_CALL ScAccessiblePreviewTable::grabFocus() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScAccessiblePreviewTable::grabFocus() { SolarMutexGuard aGuard; IsObjectValid(); @@ -491,7 +476,6 @@ void SAL_CALL ScAccessiblePreviewTable::grabFocus() throw (uno::RuntimeException //===== XAccessibleContext ============================================== sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -505,7 +489,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() } uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleChild( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -532,13 +515,12 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCh return xRet; } -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent() { return mnIndex; } uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -565,13 +547,12 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAcce //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() { return OUString("ScAccessiblePreviewTable"); } uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -585,13 +566,11 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNa //===== XTypeProvider =================================================== uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewTable::getTypes() - throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessiblePreviewTableImpl::getTypes(), ScAccessibleContextBase::getTypes()); } uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -599,14 +578,12 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId() //==== internal ========================================================= OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OUString sDesc(ScResId(STR_ACC_TABLE_DESCR)); return sDesc; } OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName() - throw (uno::RuntimeException, std::exception) { OUString sName(SC_RESSTR(STR_ACC_TABLE_NAME)); @@ -625,7 +602,7 @@ OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName() return sName; } -Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) +Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const { Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) @@ -642,7 +619,6 @@ Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::R } Rectangle ScAccessiblePreviewTable::GetBoundingBox() const - throw (uno::RuntimeException, std::exception) { FillTableInfo(); diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 203a048bb0a4..4c15bcf4a65e 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -767,7 +767,6 @@ void ScAccessibleSpreadsheet::CommitFocusCell(const ScAddress &aNewCell) //===== XAccessibleTable ================================================ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessibleRowHeaders( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -786,7 +785,6 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessib } uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessibleColumnHeaders( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -805,7 +803,6 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessib } uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleRows( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -836,7 +833,6 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessib } uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleColumns( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -861,7 +857,6 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessib } sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleRowSelected( sal_Int32 nRow ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -883,7 +878,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleRowSelected( sal_Int32 nR } sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -930,7 +924,6 @@ rtl::Reference<ScAccessibleCell> ScAccessibleSpreadsheet::GetAccessibleCellAt(sa } uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -947,7 +940,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleCel } sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -973,7 +965,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleSelected( sal_Int32 nRow, //===== XAccessibleComponent ============================================ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleAtPoint(const awt::Point& rPoint) - throw (uno::RuntimeException, std::exception) { uno::Reference< XAccessible > xAccessible; if (containsPoint(rPoint)) @@ -998,7 +989,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleAtP } void SAL_CALL ScAccessibleSpreadsheet::grabFocus( ) - throw (uno::RuntimeException, std::exception) { if (getAccessibleParent().is()) { @@ -1009,13 +999,11 @@ void SAL_CALL ScAccessibleSpreadsheet::grabFocus( ) } sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getForeground( ) - throw (uno::RuntimeException, std::exception) { return COL_BLACK; } sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1025,7 +1013,6 @@ sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground( ) //===== XAccessibleContext ============================================== uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) { utl::AccessibleRelationSetHelper* pRelationSet = nullptr; if(mpAccDoc) @@ -1037,7 +1024,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAcce uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -1074,7 +1060,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ///===== XAccessibleSelection =========================================== void SAL_CALL ScAccessibleSpreadsheet::selectAccessibleChild( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1092,7 +1077,6 @@ void SAL_CALL ScAccessibleSpreadsheet::selectAccessibleChild( sal_Int32 nChildIn void SAL_CALL ScAccessibleSpreadsheet::clearAccessibleSelection( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1104,7 +1088,6 @@ void SAL_CALL } void SAL_CALL ScAccessibleSpreadsheet::selectAllAccessibleChildren( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1125,7 +1108,6 @@ void SAL_CALL ScAccessibleSpreadsheet::selectAllAccessibleChildren( ) sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleChildCount( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1154,7 +1136,6 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1193,7 +1174,6 @@ uno::Reference<XAccessible > SAL_CALL } void SAL_CALL ScAccessibleSpreadsheet::deselectAccessibleChild( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1294,14 +1274,12 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleSpreadsheet"); } uno::Sequence< OUString> SAL_CALL ScAccessibleSpreadsheet::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -1316,7 +1294,6 @@ uno::Sequence< OUString> SAL_CALL uno::Sequence<sal_Int8> SAL_CALL ScAccessibleSpreadsheet::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1324,7 +1301,6 @@ uno::Sequence<sal_Int8> SAL_CALL ///===== XAccessibleEventBroadcaster ===================================== void SAL_CALL ScAccessibleSpreadsheet::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1335,7 +1311,6 @@ void SAL_CALL ScAccessibleSpreadsheet::addAccessibleEventListener(const uno::Ref //==== internal ========================================================= Rectangle ScAccessibleSpreadsheet::GetBoundingBoxOnScreen() const - throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) @@ -1348,7 +1323,6 @@ Rectangle ScAccessibleSpreadsheet::GetBoundingBoxOnScreen() const } Rectangle ScAccessibleSpreadsheet::GetBoundingBox() const - throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) @@ -1451,7 +1425,6 @@ Rectangle ScAccessibleSpreadsheet::GetVisCells(const Rectangle& rVisArea) } sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1469,7 +1442,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row ) } sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1487,7 +1459,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column ) } sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( sal_Int32 row ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1506,7 +1477,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( sal_Int32 row ) } sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectColumn( sal_Int32 column ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index c3c557d7707b..a70dfff350bc 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -62,7 +62,6 @@ void SAL_CALL ScAccessibleTableBase::disposing() //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessibleTableBase::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException, std::exception) { if ( rType == cppu::UnoType<XAccessibleTableSelection>::get()) { @@ -90,7 +89,6 @@ void SAL_CALL ScAccessibleTableBase::release() //===== XAccessibleTable ================================================ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowCount( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -98,7 +96,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowCount( ) } sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -106,7 +103,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) } OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32 nRow ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { OSL_FAIL("Here should be a implementation to fill the description"); @@ -118,7 +114,6 @@ OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32 } OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { OSL_FAIL("Here should be a implementation to fill the description"); @@ -130,7 +125,6 @@ OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int } sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -164,7 +158,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nR } sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -198,7 +191,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnExtentAt( sal_Int32 } uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessibleRowHeaders( ) - throw (uno::RuntimeException, std::exception) { uno::Reference< XAccessibleTable > xAccessibleTable; OSL_FAIL("Here should be a implementation to fill the row headers"); @@ -208,7 +200,6 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible } uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessibleColumnHeaders( ) - throw (uno::RuntimeException, std::exception) { uno::Reference< XAccessibleTable > xAccessibleTable; OSL_FAIL("Here should be a implementation to fill the column headers"); @@ -218,7 +209,6 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible } uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessibleRows( ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); uno::Sequence< sal_Int32 > aSequence; @@ -226,7 +216,6 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessible } uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessibleColumns( ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); uno::Sequence< sal_Int32 > aSequence; @@ -234,21 +223,18 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessible } sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleRowSelected( sal_Int32 /* nRow */ ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { OSL_FAIL("not implemented yet"); return false; } sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleColumnSelected( sal_Int32 /* nColumn */ ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { OSL_FAIL("not implemented yet"); return false; } uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCellAt( sal_Int32 /* nRow */, sal_Int32 /* nColumn */ ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { OSL_FAIL("not implemented yet"); uno::Reference< XAccessible > xAccessible; @@ -256,7 +242,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCellA } uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCaption( ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); uno::Reference< XAccessible > xAccessible; @@ -264,7 +249,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCapti } uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleSummary( ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); uno::Reference< XAccessible > xAccessible; @@ -272,7 +256,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleSumma } sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow */, sal_Int32 /* nColumn */ ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { OSL_FAIL("not implemented yet"); return false; @@ -281,7 +264,6 @@ sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow // ===== XAccessibleExtendedTable ======================================== sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -298,7 +280,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sa } sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildIndex ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -310,7 +291,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildInde } sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -324,7 +304,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildI // ===== XAccessibleContext ============================================== sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -342,9 +321,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount() uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, - lang::IndexOutOfBoundsException, - std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -365,14 +341,12 @@ uno::Reference< XAccessible > SAL_CALL OUString SAL_CALL ScAccessibleTableBase::createAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OUString sDesc(ScResId(STR_ACC_TABLE_DESCR)); return sDesc; } OUString SAL_CALL ScAccessibleTableBase::createAccessibleName() - throw (uno::RuntimeException, std::exception) { OUString sName(SC_RESSTR(STR_ACC_TABLE_NAME)); OUString sCoreName; @@ -383,7 +357,6 @@ OUString SAL_CALL ScAccessibleTableBase::createAccessibleName() uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleTableBase::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); return uno::Reference<XAccessibleRelationSet>(); @@ -391,7 +364,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleTableBase::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); uno::Reference< XAccessibleStateSet > xAccessibleStateSet; @@ -401,13 +373,11 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ///===== XAccessibleSelection =========================================== void SAL_CALL ScAccessibleTableBase::selectAccessibleChild( sal_Int32 /* nChildIndex */ ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { } sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { // I don't need to guard, because the called functions have a guard if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) @@ -417,18 +387,15 @@ sal_Bool SAL_CALL void SAL_CALL ScAccessibleTableBase::clearAccessibleSelection( ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL ScAccessibleTableBase::selectAllAccessibleChildren() - throw (uno::RuntimeException, std::exception) { } sal_Int32 SAL_CALL ScAccessibleTableBase::getSelectedAccessibleChildCount( ) - throw (uno::RuntimeException, std::exception) { sal_Int32 nResult(0); return nResult; @@ -436,21 +403,18 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible > SAL_CALL ScAccessibleTableBase::getSelectedAccessibleChild( sal_Int32 /* nSelectedChildIndex */ ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { uno::Reference < XAccessible > xAccessible; return xAccessible; } void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int32 /* nSelectedChildIndex */ ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { } //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleTableBase::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleTableBase"); } @@ -458,14 +422,12 @@ OUString SAL_CALL ScAccessibleTableBase::getImplementationName() //===== XTypeProvider =================================================== uno::Sequence< uno::Type > SAL_CALL ScAccessibleTableBase::getTypes() - throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessibleTableBaseImpl::getTypes(), ScAccessibleContextBase::getTypes()); } uno::Sequence<sal_Int8> SAL_CALL ScAccessibleTableBase::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -488,29 +450,21 @@ void ScAccessibleTableBase::CommitTableModelChange(sal_Int32 nStartRow, sal_Int3 } sal_Bool SAL_CALL ScAccessibleTableBase::selectRow( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, - std::exception) { return true; } sal_Bool SAL_CALL ScAccessibleTableBase::selectColumn( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, - std::exception) { return true; } sal_Bool SAL_CALL ScAccessibleTableBase::unselectRow( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, - std::exception) { return true; } sal_Bool SAL_CALL ScAccessibleTableBase::unselectColumn( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, - std::exception) { return true; } diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx index a38c08cd27de..1c858f1de77a 100644 --- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx +++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx @@ -40,13 +40,11 @@ ScDrawModelBroadcaster::~ScDrawModelBroadcaster() } void SAL_CALL ScDrawModelBroadcaster::addEventListener( const uno::Reference< document::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { maEventListeners.addInterface( xListener ); } void SAL_CALL ScDrawModelBroadcaster::removeEventListener( const uno::Reference< document::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { maEventListeners.removeInterface( xListener ); } diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 8c8d24b15683..1c0a506e1cda 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -779,7 +779,7 @@ const css::uno::Sequence< sal_Int8 >& ScDrawTransferObj::getUnoTunnelId() return theScDrawTransferObjUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; if( ( rId.getLength() == 16 ) && diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 21ee669859a8..34fa4e0a58b7 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -869,7 +869,7 @@ const css::uno::Sequence< sal_Int8 >& ScTransferObj::getUnoTunnelId() return theScTransferUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL ScTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL ScTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; if( ( rId.getLength() == 16 ) && diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 8009d0c99603..808c28d80852 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -106,18 +106,18 @@ class VBAProjectListener : public ContainerListenerHelper public: explicit VBAProjectListener( ScMacroManager* pMacroMgr ) : mpMacroMgr( pMacroMgr ) {} // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException, std::exception) override {} + virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) override {} // XContainerListener - virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception) override {} - virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) throw(RuntimeException, std::exception) override + virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) override {} + virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) override { OUString sModuleName; Event.Accessor >>= sModuleName; mpMacroMgr->InitUserFuncData(); mpMacroMgr->BroadcastModuleUpdate(sModuleName); } - virtual void SAL_CALL elementRemoved( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception) override {} + virtual void SAL_CALL elementRemoved( const container::ContainerEvent& /*Event*/ ) override {} }; diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 11dc542f219c..68adf6cd2ab7 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -85,20 +85,16 @@ public: ///===== XAccessibleComponent ============================================ virtual css::uno::Reference< css::accessibility::XAccessible > - SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override; - virtual void SAL_CALL grabFocus( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) override; protected: /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; /// Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const override; public: ///===== XAccessibleContext ============================================== @@ -106,49 +102,38 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand 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 the set of current states. virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRelationSet() 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; /** Returns a list of all supported services. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() 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; // Override this method to handle cell's ParaIndent attribute specially. - 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::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; private: ScTabViewShell* mpViewShell; ScAccessibleDocument* mpAccDoc; diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 7322d74bd4e9..f37252032c81 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -44,14 +44,12 @@ protected: virtual ~ScAccessibleCellBase() override; public: - virtual bool SAL_CALL isVisible() - throw (css::uno::RuntimeException, std::exception) override; + virtual bool SAL_CALL isVisible() override; ///===== XInterface ===================================================== 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; @@ -59,70 +57,57 @@ public: ///===== XAccessibleComponent ============================================ - virtual sal_Int32 SAL_CALL getForeground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; - virtual sal_Int32 SAL_CALL getBackground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; ///===== XAccessibleContext ============================================== /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleIndexInParent() override; protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + createAccessibleDescription() override; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + createAccessibleName() override; public: ///===== XAccessibleValue ================================================ virtual css::uno::Any SAL_CALL - getCurrentValue() - throw (css::uno::RuntimeException, - std::exception) override; + getCurrentValue() override; virtual sal_Bool SAL_CALL - setCurrentValue( const css::uno::Any& aNumber ) - throw (css::uno::RuntimeException, std::exception) override; + setCurrentValue( const css::uno::Any& aNumber ) override; virtual css::uno::Any SAL_CALL - getMaximumValue( ) - throw (css::uno::RuntimeException, std::exception) override; + getMaximumValue( ) override; virtual css::uno::Any SAL_CALL - getMinimumValue( ) - throw (css::uno::RuntimeException, std::exception) override; + getMinimumValue( ) 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; ///===== XTypeProvider =================================================== /// returns the possible types virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; protected: ScAddress maCellAddress; @@ -136,18 +121,14 @@ private: const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); protected: /// @throw css::uno::RuntimeException - OUString SAL_CALL GetNote() - throw (css::uno::RuntimeException); + OUString SAL_CALL GetNote(); /// @throw css::uno::RuntimeException - OUString SAL_CALL GetAllDisplayNote() - throw (css::uno::RuntimeException, std::exception); + OUString SAL_CALL GetAllDisplayNote(); /// @throw css::uno::RuntimeException - OUString SAL_CALL getShadowAttrs() - throw (css::uno::RuntimeException, std::exception); + OUString SAL_CALL getShadowAttrs(); /// @throw css::uno::RuntimeException - OUString SAL_CALL getBorderAttrs() - throw (css::uno::RuntimeException, std::exception); + OUString SAL_CALL getBorderAttrs(); public: const ScAddress& GetCellAddress() const { return maCellAddress; } }; diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index e1431d2b3e41..bb444c2e984e 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -79,12 +79,10 @@ protected: public: /// @throws css::uno::RuntimeException - bool SAL_CALL isShowing( ) - throw (css::uno::RuntimeException); + bool SAL_CALL isShowing( ); /// @throws css::uno::RuntimeException - virtual bool SAL_CALL isVisible() - throw (css::uno::RuntimeException, std::exception); + virtual bool SAL_CALL isVisible(); ///===== SfxListener ===================================================== @@ -93,8 +91,7 @@ public: ///===== XInterface ===================================================== 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; @@ -104,95 +101,73 @@ public: /// Return the XAccessibleContext. virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleContext() override; ///===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL containsPoint( - const css::awt::Point& rPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const css::awt::Point& rPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) 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 getForeground( ) override; - virtual sal_Int32 SAL_CALL getBackground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) 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::uno::RuntimeException, - css::accessibility::IllegalAccessibleComponentStateException, std::exception) override; + getLocale() override; ///===== XAccessibleEventBroadcaster ===================================== @@ -201,87 +176,73 @@ public: */ 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; // Remove an existing event listener. 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; ///===== XAccessibleEventListener ======================================== virtual void SAL_CALL - disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + disposing( const css::lang::EventObject& Source ) override; virtual void SAL_CALL notifyEvent( - const css::accessibility::AccessibleEventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::accessibility::AccessibleEventObject& aEvent ) 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 and Accessible service. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; ///===== XTypeProvider =================================================== /// returns the possible types virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; protected: /// Return this object's description. /// /// @throws css::uno::RuntimeException virtual OUString SAL_CALL - createAccessibleDescription() - throw (css::uno::RuntimeException, std::exception); + createAccessibleDescription(); /// Return the object's current name. /// /// @throws css::uno::RuntimeException virtual OUString SAL_CALL - createAccessibleName() - throw (css::uno::RuntimeException, - std::exception); + createAccessibleName(); /// Return the object's current bounding box relative to the desktop. /// /// @throws css::uno::RuntimeException - virtual Rectangle GetBoundingBoxOnScreen() const - throw (css::uno::RuntimeException, std::exception); + virtual Rectangle GetBoundingBoxOnScreen() const; /// Return the object's current bounding box relative to the parent object. /// /// @throws css::uno::RuntimeException - virtual Rectangle GetBoundingBox() const - throw (css::uno::RuntimeException, std::exception); + virtual Rectangle GetBoundingBox() const; public: /// Calls all Listener to tell they the change. @@ -298,8 +259,7 @@ protected: bool IsDefunc() const { return rBHelper.bDisposed; } /// @throws css::lang::DisposedException - void IsObjectValid() const - throw (css::lang::DisposedException); + void IsObjectValid() const; /// Use this method to set initial Name without notification void SetName(const OUString& rName) { msName = rName; } diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 4794360e1db4..836addd33957 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -53,16 +53,15 @@ public: virtual void SAL_CALL disposing() override; /** Returns true, if the control is visible. */ - virtual bool SAL_CALL isVisible() throw( css::uno::RuntimeException, std::exception ) override; + virtual bool SAL_CALL isVisible() override; // XAccessibleComponent --------------------------------------------------- /** Returns the child at the specified point (cell returns NULL). */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override; /** Sets the focus to this control. */ - virtual void SAL_CALL grabFocus() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; // events ----------------------------------------------------------------- public: @@ -84,15 +83,15 @@ public: // helpers ---------------------------------------------------------------- protected: /** Returns this object's current bounding box relative to the desktop. */ - virtual Rectangle GetBoundingBoxOnScreen() const throw( css::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; /** Returns this object's current bounding box relative to the parent object. */ - virtual Rectangle GetBoundingBox() const throw( css::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBox() const override; /** Returns whether the object is alive. Must be called with locked mutex. */ inline bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; } /** @throws css::lang::DisposedException if the object is disposed/disposing or any pointer is missing. Should be used with locked mutex! */ - void ensureAlive() const throw( css::lang::DisposedException ); + void ensureAlive() const; /** Returns the VCL control. Assumes a living object. */ ScCsvControl& implGetControl() const; @@ -101,8 +100,7 @@ protected: @throws css::uno::RuntimeException */ - static css::uno::Reference< css::accessibility::XAccessible > implGetChildByRole( const css::uno::Reference< css::accessibility::XAccessible >& rxParentObj, sal_uInt16 nRole ) - throw( css::uno::RuntimeException ); + static css::uno::Reference< css::accessibility::XAccessible > implGetChildByRole( const css::uno::Reference< css::accessibility::XAccessible >& rxParentObj, sal_uInt16 nRole ); /** Creates a StateSetHelper and fills it with DEFUNC, OPAQUE, ENABLED, SHOWING and VISIBLE. */ ::utl::AccessibleStateSetHelper* implCreateStateSet(); @@ -129,91 +127,76 @@ public: // XAccessibleComponent ----------------------------------------------------- - virtual sal_Int32 SAL_CALL getForeground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; - virtual sal_Int32 SAL_CALL getBackground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleContext ----------------------------------------------------- /** Returns the child count (the ruler does not have children). */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** Throws an exception (the ruler does not have children). */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override; /** Returns the relation to the grid control. */ - 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; /** Returns the current set of states. */ - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override; // XAccessibleText -------------------------------------------------------- /** Return the position of the caret. */ - virtual sal_Int32 SAL_CALL getCaretPosition() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; /** Sets the position of the caret. */ - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; /** Returns the specified character. */ - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; /** Returns the attributes of the specified character. */ - 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::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; /** Returns the screen coordinates of the specified character. */ - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; /** Returns the count of characters. */ - virtual sal_Int32 SAL_CALL getCharacterCount() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCharacterCount() override; /** Returns the character index at the specified coordinate (object's coordinate system). */ - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& rPoint ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& rPoint ) override; /** Returns the selected text (ruler returns empty string). */ - virtual OUString SAL_CALL getSelectedText() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getSelectedText() override; /** Returns the start index of the selection (ruler returns -1). */ - virtual sal_Int32 SAL_CALL getSelectionStart() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectionStart() override; /** Returns the end index of the selection (ruler returns -1). */ - virtual sal_Int32 SAL_CALL getSelectionEnd() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectionEnd() override; /** Selects a part of the text (ruler does nothing). */ - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; /** Returns the entire text. */ - virtual OUString SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getText() override; /** Returns the specified range [Start,End) of the text. */ - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; /** Returns the specified text portion. */ - 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 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; /** Copies the specified text range into the clipboard (ruler does nothing). */ - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XInterface ------------------------------------------------------------- - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() throw() override; @@ -222,18 +205,15 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; // XTypeProvider ---------------------------------------------------------- /** Returns a sequence with all supported interface types. */ - 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; /** Returns an implementation ID. */ - 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; // events ----------------------------------------------------------------- public: @@ -243,22 +223,17 @@ public: // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ - virtual OUString SAL_CALL createAccessibleName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL createAccessibleName() override; /** Returns this object's description. */ - virtual OUString SAL_CALL createAccessibleDescription() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL createAccessibleDescription() override; /** @throws css::lang::IndexOutOfBoundsException if the specified character position is invalid (outside 0..len-1). */ - void ensureValidIndex( sal_Int32 nIndex ) const - throw( css::lang::IndexOutOfBoundsException ); + void ensureValidIndex( sal_Int32 nIndex ) const; /** @throws css::lang::IndexOutOfBoundsException if the specified character position is invalid (outside 0..len). */ - void ensureValidIndexWithEnd( sal_Int32 nIndex ) const - throw( css::lang::IndexOutOfBoundsException ); + void ensureValidIndexWithEnd( sal_Int32 nIndex ) const; /** @throws css::lang::IndexOutOfBoundsException if the specified character range [Start,End) is invalid. @descr If Start>End, swaps Start and End before checking. */ - void ensureValidRange( sal_Int32& rnStartIndex, sal_Int32& rnEndIndex ) const - throw( css::lang::IndexOutOfBoundsException ); + void ensureValidRange( sal_Int32& rnStartIndex, sal_Int32& rnEndIndex ) const; /** Returns the VCL ruler control. Assumes a living object. */ ScCsvRuler& implGetRuler() const; @@ -267,7 +242,7 @@ private: @throws css::uno::RuntimeException */ - void constructStringBuffer() throw( css::uno::RuntimeException ); + void constructStringBuffer(); /** Returns the character count of the text. */ sal_Int32 implGetTextLength() const; @@ -306,147 +281,113 @@ public: // XAccessibleComponent --------------------------------------------------- /** Returns the cell at the specified point. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override; - virtual sal_Int32 SAL_CALL getForeground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; - virtual sal_Int32 SAL_CALL getBackground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleContext ----------------------------------------------------- /** Returns the child count (count of cells in the table). */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** Returns the specified child cell. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override; /** Returns the relation to the ruler control. */ - 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; /** Returns the current set of states. */ - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override; // XAccessibleTable ------------------------------------------------------- /** Returns the number of rows in the table. */ - virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleRowCount() override; /** Returns the number of columns in the table. */ - virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnCount() override; /** Returns the description of the specified row in the table. */ - virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override; /** Returns the description text of the specified column in the table. */ - virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override; /** Returns the number of rows occupied at a specified row and column. @descr Returns always 1 (Merged cells not supported). */ - virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** Returns the number of rows occupied at a specified row and column. @descr Returns always 1 (Merged cells not supported). */ - virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** Returns the row headers as an AccessibleTable. */ - virtual XAccessibleTableRef SAL_CALL getAccessibleRowHeaders() - throw( css::uno::RuntimeException, std::exception ) override; + virtual XAccessibleTableRef SAL_CALL getAccessibleRowHeaders() override; /** Returns the column headers as an AccessibleTable. */ - virtual XAccessibleTableRef SAL_CALL getAccessibleColumnHeaders() - throw( css::uno::RuntimeException, std::exception ) override; + virtual XAccessibleTableRef SAL_CALL getAccessibleColumnHeaders() override; /** Returns the selected rows as a sequence. */ - virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() override; /** Returns the selected columns as a sequence. */ - virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() override; /** Returns true, if the specified row is selected. */ - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override; /** Returns true, if the specified column is selected. */ - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override; /** Returns the accessible cell object at the specified position. */ - 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; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** Returns the caption object of the table. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption() override; /** Returns the summary description object of the table. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary() override; /** Returns true, if the cell at a specified position is selected. */ - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; /** Returns the child index of the cell at the specified position. */ - 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 getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; /** Returns the row index of the specified child. */ - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; /** Returns the column index of the specified child. */ - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; // XAccessibleSelection --------------------------------------------------- /** Selects the specified child (selects the entire column or the entire table). */ - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; /** Returns true, if the specified child is selected. */ - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; /** Deselects all cells. */ - virtual void SAL_CALL clearAccessibleSelection() - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL clearAccessibleSelection() override; /** Selects all cells. */ - virtual void SAL_CALL selectAllAccessibleChildren() - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAllAccessibleChildren() override; /** Returns the count of selected children. */ - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override; /** Returns the child with the specified index in all selected children. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; /** Deselects the child with the specified index in all selected children. */ - 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; // XInterface ------------------------------------------------------------- - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() throw() override; @@ -455,18 +396,15 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; // XTypeProvider ---------------------------------------------------------- /** Returns a sequence with all supported interface types. */ - 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; /** Returns an implementation ID. */ - 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; // events ----------------------------------------------------------------- public: @@ -482,18 +420,14 @@ public: // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ - virtual OUString SAL_CALL createAccessibleName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL createAccessibleName() override; /** Returns this object's description. */ - virtual OUString SAL_CALL createAccessibleDescription() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL createAccessibleDescription() override; /** @throws css::lang::IndexOutOfBoundsException if nIndex is not a valid child index. */ - void ensureValidIndex( sal_Int32 nIndex ) const - throw( css::lang::IndexOutOfBoundsException ); + void ensureValidIndex( sal_Int32 nIndex ) const; /** @Throws css::lang::IndexOutOfBoundsException if the specified position is invalid. */ - void ensureValidPosition( sal_Int32 nRow, sal_Int32 nColumn ) const - throw( css::lang::IndexOutOfBoundsException ); + void ensureValidPosition( sal_Int32 nRow, sal_Int32 nColumn ) const; /** Returns the VCL grid control. Assumes a living object. */ ScCsvGrid& implGetGrid() const; @@ -554,35 +488,28 @@ public: // XAccessibleComponent --------------------------------------------------- /** Sets the focus to the column of this cell. */ - 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 getForeground( ) override; - virtual sal_Int32 SAL_CALL getBackground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleContext ----------------------------------------------------- /** Returns the child count. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** Returns the specified child. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override; /** Returns the index of this cell in the table. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; /** Returns the relation to the ruler control. */ - 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; /** Returns the current set of states. */ - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override; // XInterface ------------------------------------------------------------- @@ -595,23 +522,20 @@ public: // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; // helpers ---------------------------------------------------------------- protected: /** Returns this object's current bounding box relative to the desktop. */ - virtual Rectangle GetBoundingBoxOnScreen() const throw( css::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; /** Returns this object's current bounding box relative to the parent object. */ - virtual Rectangle GetBoundingBox() const throw( css::uno::RuntimeException, std::exception ) override; + virtual Rectangle GetBoundingBox() const override; private: /** Returns this object's name. */ - virtual OUString SAL_CALL createAccessibleName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL createAccessibleName() override; /** Returns this object's description. */ - virtual OUString SAL_CALL createAccessibleDescription() - throw( css::uno::RuntimeException ) override; + virtual OUString SAL_CALL createAccessibleDescription() override; /** Returns the VCL grid control. Assumes a living object. */ ScCsvGrid& implGetGrid() const; diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 9a2807d54336..6a01e699a197 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -83,8 +83,7 @@ public: ///===== XInterface ===================================================== 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; @@ -94,106 +93,81 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const css::awt::Point& rPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) override; - virtual void SAL_CALL grabFocus( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) override; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + 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 the set of current states. virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; virtual OUString SAL_CALL - getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleName() 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 ; ///===== XAccessibleSelection =========================================== virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + selectAccessibleChild( sal_Int32 nChildIndex ) override; virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + isAccessibleChildSelected( sal_Int32 nChildIndex ) override; virtual void SAL_CALL - clearAccessibleSelection( ) - throw (css::uno::RuntimeException, std::exception) override; + clearAccessibleSelection( ) override; virtual void SAL_CALL - selectAllAccessibleChildren( ) - throw (css::uno::RuntimeException, std::exception) override; + selectAllAccessibleChildren( ) override; virtual sal_Int32 SAL_CALL - getSelectedAccessibleChildCount( ) - throw (css::uno::RuntimeException, std::exception) override; + 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; + getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + deselectAccessibleChild( sal_Int32 nChildIndex ) override; ///===== XSelectionListener ============================================= - 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; - 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; ///===== XServiceInfo =================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; /** Returns a list of all supported services. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; ///===== XTypeProvider =================================================== /// returns the possible types virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; ///===== IAccessibleViewForwarder ======================================== @@ -239,21 +213,17 @@ public: protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + createAccessibleDescription() override; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + createAccessibleName() override; /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; /// Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const override; private: ScTabViewShell* mpViewShell; @@ -289,14 +259,11 @@ public: ScAddress GetCurCellAddress() const; //===== XAccessibleGetAccFromXShape ============================================ 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; - virtual sal_Int32 SAL_CALL getForeground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; - virtual sal_Int32 SAL_CALL getBackground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; }; #endif diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 3129a2ce34c3..450c51c1ed0e 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -58,77 +58,62 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const css::awt::Point& rPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) override; - virtual void SAL_CALL grabFocus( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) 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 the set of current states. virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName() 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; /** Returns a list of all supported services. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; ///===== internal ======================================================== protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + createAccessibleDescription() override; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + createAccessibleName() override; public: // needed in ScShapeChildren /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; protected: /// Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 1b35218fcfd5..962a36af1daa 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -72,8 +72,7 @@ public: ///===== XInterface ===================================================== 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; @@ -82,17 +81,14 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const css::awt::Point& rPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) override; protected: /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; /// Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const override; public: ///===== XAccessibleContext ============================================== @@ -100,57 +96,40 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand 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 the set of current states. virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() 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; virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 nSelectedChildIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription() - throw (css::uno::RuntimeException) override; + createAccessibleDescription() override; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + createAccessibleName() override; public: ///===== XAccessibleEventBroadcaster ===================================== @@ -160,30 +139,26 @@ public: */ 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; // Remove an existing event listener. 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; ///===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; private: std::unique_ptr<accessibility::AccessibleTextHelper> mpTextHelper; @@ -200,11 +175,9 @@ private: ScAddress m_curCellAddress; ///===== XAccessibleComponent ============================================ - virtual sal_Int32 SAL_CALL getForeground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; - virtual sal_Int32 SAL_CALL getBackground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; sal_Int32 GetFgBgColor( const rtl::OUString &strPropColor) ; }; diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index 6a8645f735ea..a5ad2cec6aa2 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -51,34 +51,29 @@ public: //===== XAccessibleComponent ============================================ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus() override; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL 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; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChild( sal_Int32 i ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() 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; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleDescription() override; + virtual OUString SAL_CALL createAccessibleName() override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; + virtual Rectangle GetBoundingBox() const override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 25067fbf7431..c66d84a80dfe 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -57,59 +57,51 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const css::awt::Point& rPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) override; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand 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 the set of current states. virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() 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; /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleDescription() override; + virtual OUString SAL_CALL createAccessibleName() override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; + virtual Rectangle GetBoundingBox() const override; private: EditTextObject* mpEditObj; diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index 061330b3e5c2..ba9212ead0b5 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -53,40 +53,34 @@ public: //===== XAccessibleComponent ============================================ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus() override; //===== XAccessibleContext ============================================== // override to calculate this on demand - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL 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 css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() 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; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; protected: - virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; + virtual Rectangle GetBoundingBox() const override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 142b58c6e116..381b45032711 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -62,8 +62,7 @@ public: ///===== XInterface ===================================================== 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; @@ -71,55 +70,47 @@ public: //===== XAccessibleValue ================================================ - virtual css::uno::Any SAL_CALL getCurrentValue() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMaximumValue() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMinimumValue() 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 ) override; + virtual css::uno::Any SAL_CALL getMaximumValue() override; + virtual css::uno::Any SAL_CALL getMinimumValue() override; //===== XAccessibleComponent ============================================ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus() override; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL 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; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChild( sal_Int32 i ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() 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; ///===== XTypeProvider =================================================== virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleDescription() override; + virtual OUString SAL_CALL createAccessibleName() override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; + virtual Rectangle GetBoundingBox() const override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 36bc0d716549..adb5b5908a15 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -54,8 +54,7 @@ public: ///===== XInterface ===================================================== 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; @@ -63,116 +62,64 @@ public: //===== 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 OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; - virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - 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 ) override; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRowHeaders() override; virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw (css::uno::RuntimeException, std::exception) 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; + getAccessibleColumnHeaders() override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL 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; - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) 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; + getAccessibleSummary() override; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndex( 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; //===== XAccessibleComponent ============================================ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus() override; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, - std::exception) override; + virtual sal_Int32 SAL_CALL 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; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChild( sal_Int32 i ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() 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; //===== XTypeProvider =================================================== virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; - 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; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL createAccessibleName() - throw (css::uno::RuntimeException, - std::exception) override; + virtual OUString SAL_CALL createAccessibleDescription() override; + virtual OUString SAL_CALL createAccessibleName() override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; + virtual Rectangle GetBoundingBox() const override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 210d7dfd43a7..5cc6a6baf9af 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -102,130 +102,98 @@ private: /// Returns the row headers as an AccessibleTable. virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders( ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRowHeaders( ) override; /// Returns the column headers as an AccessibleTable. virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders( ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleColumnHeaders( ) override; /// Returns the selected rows in a table. virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleRows( ) - throw (css::uno::RuntimeException, std::exception) override; + getSelectedAccessibleRows( ) override; /// Returns the selected columns in a table. virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleColumns( ) - throw (css::uno::RuntimeException, std::exception) override; + getSelectedAccessibleColumns( ) override; /// Returns a boolean value indicating whether the specified row is selected. virtual sal_Bool SAL_CALL - isAccessibleRowSelected( sal_Int32 nRow ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; + isAccessibleRowSelected( sal_Int32 nRow ) override; /// Returns a boolean value indicating whether the specified column is selected. virtual sal_Bool SAL_CALL - isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; + isAccessibleColumnSelected( sal_Int32 nColumn ) override; /// Returns the Accessible at a specified row and column in the table. virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; + getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override; rtl::Reference<ScAccessibleCell> GetAccessibleCellAt(sal_Int32 nRow, sal_Int32 nColumn); /// Returns a boolean value indicating whether the accessible at a specified row and column is selected. virtual sal_Bool SAL_CALL - isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; + isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; ///===== XAccessibleComponent ============================================ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const css::awt::Point& rPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& rPoint ) 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 getForeground( ) override; - virtual sal_Int32 SAL_CALL getBackground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; ///===== XAccessibleContext ============================================== /// 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; ///===== XAccessibleSelection =========================================== virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + selectAccessibleChild( sal_Int32 nChildIndex ) override; virtual void SAL_CALL - clearAccessibleSelection( ) - throw (css::uno::RuntimeException, std::exception) override; + clearAccessibleSelection( ) override; virtual void SAL_CALL - selectAllAccessibleChildren( ) - throw (css::uno::RuntimeException, std::exception) override; + selectAllAccessibleChildren( ) override; virtual sal_Int32 SAL_CALL - getSelectedAccessibleChildCount( ) - throw (css::uno::RuntimeException, std::exception) override; + 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; + getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + deselectAccessibleChild( sal_Int32 nChildIndex ) 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; /** Returns a list of all supported services. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; ///===== XTypeProvider =================================================== /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; ///===== XAccessibleEventBroadcaster ===================================== @@ -234,30 +202,19 @@ private: */ 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; //===== 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; protected: /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBoxOnScreen() const override; /// Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox() const - throw (css::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const override; private: ScTabViewShell* mpViewShell; ScRangeList* mpMarkedRanges; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 362bb032031e..63f1bb6b98a5 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -58,8 +58,7 @@ public: ///===== XInterface ===================================================== 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; @@ -69,239 +68,161 @@ public: /// Returns the number of rows in the table. virtual sal_Int32 SAL_CALL - getAccessibleRowCount( ) - throw (css::uno::RuntimeException, - std::exception) override; + getAccessibleRowCount( ) override; /// Returns the number of columns in the table. virtual sal_Int32 SAL_CALL - getAccessibleColumnCount( ) - throw (css::uno::RuntimeException, - std::exception) override; + getAccessibleColumnCount( ) override; /// Returns the description of the specified row in the table. virtual OUString SAL_CALL - getAccessibleRowDescription( sal_Int32 nRow ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + getAccessibleRowDescription( sal_Int32 nRow ) override; /// Returns the description text of the specified column in the table. virtual OUString SAL_CALL - getAccessibleColumnDescription( sal_Int32 nColumn ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + getAccessibleColumnDescription( sal_Int32 nColumn ) override; /** Returns the number of rows occupied by the Accessible at a specified row and column in the table. Returns 1 if it is only a cell and the number of rows the cell is merged if the cell is a merged cell. */ virtual sal_Int32 SAL_CALL - getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** Returns the number of columns occupied by the Accessible at a specified row and column in the table. Returns 1 if it is only a cell and the number of columns the cell is merged if the cell is a merged cell. */ virtual sal_Int32 SAL_CALL - getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /// Returns the row headers as an AccessibleTable. virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders( ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRowHeaders( ) override; /// Returns the column headers as an AccessibleTable. virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders( ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleColumnHeaders( ) override; /// Returns the selected rows in a table. virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleRows( ) - throw (css::uno::RuntimeException, std::exception) override; + getSelectedAccessibleRows( ) override; /// Returns the selected columns in a table. virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleColumns( ) - throw (css::uno::RuntimeException, std::exception) override; + getSelectedAccessibleColumns( ) override; /// Returns a boolean value indicating whether the specified row is selected. virtual sal_Bool SAL_CALL - isAccessibleRowSelected( sal_Int32 nRow ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + isAccessibleRowSelected( sal_Int32 nRow ) override; /// Returns a boolean value indicating whether the specified column is selected. virtual sal_Bool SAL_CALL - isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + isAccessibleColumnSelected( sal_Int32 nColumn ) override; /// Returns the Accessible at a specified row and column in the table. virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /// Returns the caption for the table. virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCaption( ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleCaption( ) override; /// Returns the summary description of the table. virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleSummary( ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleSummary( ) override; /// Returns a boolean value indicating whether the accessible at a specified row and column is selected. virtual sal_Bool SAL_CALL - isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; ///===== XAccessibleExtendedTable ======================================== /// Returns the index of the cell on the given position. virtual sal_Int32 SAL_CALL - getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; /// Returns the row number of an index in the table. virtual sal_Int32 SAL_CALL - getAccessibleRow( sal_Int32 nChildIndex ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + getAccessibleRow( sal_Int32 nChildIndex ) override; /// Returns the column number of an index in the table. virtual sal_Int32 SAL_CALL - getAccessibleColumn( sal_Int32 nChildIndex ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; + getAccessibleColumn( sal_Int32 nChildIndex ) override; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount() - throw (css::uno::RuntimeException, - std::exception) override; + getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild(sal_Int32 nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, - std::exception) override; - 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; + getAccessibleChild(sal_Int32 nIndex) 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; protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + createAccessibleDescription() override; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName() - throw (css::uno::RuntimeException, - std::exception) override; + createAccessibleName() override; public: /// 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. // perhaps sometimes to be implemented virtual css::uno::Reference<css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; ///===== XAccessibleSelection =========================================== virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + selectAccessibleChild( sal_Int32 nChildIndex ) override; virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + isAccessibleChildSelected( sal_Int32 nChildIndex ) override; virtual void SAL_CALL - clearAccessibleSelection( ) - throw (css::uno::RuntimeException, std::exception) override; + clearAccessibleSelection( ) override; virtual void SAL_CALL - selectAllAccessibleChildren( ) - throw (css::uno::RuntimeException, std::exception) override; + selectAllAccessibleChildren( ) override; virtual sal_Int32 SAL_CALL - getSelectedAccessibleChildCount( ) - throw (css::uno::RuntimeException, std::exception) override; + 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; + getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) 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; ///===== XTypeProvider =================================================== /// returns the possible types virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; protected: /// contains the range of the table, because it could be a subrange of the complete table diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index 912bf2774003..cdba0dbb00bb 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -42,26 +42,21 @@ public: protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XSelectionChangeListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component virtual void SAL_CALL disposing() 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& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: ScTabViewShell * m_pViewShell; diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index 3e42d6f12283..6c014da85713 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -39,10 +39,8 @@ public: ScDrawModelBroadcaster( SdrModel *pDrawModel ); virtual ~ScDrawModelBroadcaster() override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx index ab7ab4e9f229..9a1a95c4e7b9 100644 --- a/sc/source/ui/inc/condformatuno.hxx +++ b/sc/source/ui/inc/condformatuno.hxx @@ -59,20 +59,13 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; // XConditionalFormats - virtual sal_Int32 SAL_CALL createByRange(const uno::Reference<sheet::XSheetCellRanges>& xRanges) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL createByRange(const uno::Reference<sheet::XSheetCellRanges>& xRanges) override; - virtual void SAL_CALL removeByID( const sal_Int32 nID ) - throw(css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL removeByID( const sal_Int32 nID ) override; - virtual uno::Sequence< uno::Reference< sheet::XConditionalFormat > > SAL_CALL getConditionalFormats() - throw(css::uno::RuntimeException, - std::exception) override; + virtual uno::Sequence< uno::Reference< sheet::XConditionalFormat > > SAL_CALL getConditionalFormats() override; - virtual sal_Int32 SAL_CALL getLength() - throw(css::uno::RuntimeException, - std::exception) override; + virtual sal_Int32 SAL_CALL getLength() override; ScConditionalFormatList* getCoreObject(); @@ -92,67 +85,35 @@ public: ScDocShell* getDocShell(); // XConditionalFormat - virtual void SAL_CALL createEntry(const sal_Int32 nType, const sal_Int32 nPos) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createEntry(const sal_Int32 nType, const sal_Int32 nPos) override; - virtual void SAL_CALL removeByIndex(const sal_Int32 nIndex) - throw(css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL removeByIndex(const sal_Int32 nIndex) override; // XIndexAccess - virtual uno::Type SAL_CALL getElementType() - throw(css::uno::RuntimeException, - std::exception) override; + virtual uno::Type SAL_CALL getElementType() override; - virtual sal_Bool SAL_CALL hasElements() - throw(css::uno::RuntimeException, - std::exception) override; + virtual sal_Bool SAL_CALL hasElements() override; - virtual sal_Int32 SAL_CALL getCount() - throw(css::uno::RuntimeException, - std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; - virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) - throw(css::uno::RuntimeException, - std::exception) override; + virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; // 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; ScConditionalFormat* getCoreObject(); @@ -175,45 +136,23 @@ public: ScCondFormatEntry* getCoreObject(); // XConditionEntry - virtual sal_Int32 SAL_CALL getType() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getType() override; // 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; private: ScDocShell* mpDocShell; @@ -231,48 +170,26 @@ public: virtual ~ScColorScaleFormatObj() override; // XConditionEntry - virtual sal_Int32 SAL_CALL getType() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getType() override; ScColorScaleFormat* getCoreObject(); // 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; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -287,23 +204,17 @@ public: virtual ~ScColorScaleEntryObj() override; - virtual css::util::Color SAL_CALL getColor() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL getColor() override; - virtual void SAL_CALL setColor(css::util::Color aColor) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setColor(css::util::Color aColor) override; - virtual sal_Int32 SAL_CALL getType() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getType() override; - virtual void SAL_CALL setType(sal_Int32 nType) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setType(sal_Int32 nType) override; - virtual OUString SAL_CALL getFormula() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula() override; - virtual void SAL_CALL setFormula(const OUString& rString) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormula(const OUString& rString) override; private: ScColorScaleEntry* getCoreObject(); @@ -323,45 +234,23 @@ public: ScDataBarFormat* getCoreObject(); // XConditionEntry - virtual sal_Int32 SAL_CALL getType() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getType() override; // 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; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -376,17 +265,13 @@ public: virtual ~ScDataBarEntryObj() override; - virtual sal_Int32 SAL_CALL getType() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getType() override; - virtual void SAL_CALL setType(sal_Int32 nType) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setType(sal_Int32 nType) override; - virtual OUString SAL_CALL getFormula() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula() override; - virtual void SAL_CALL setFormula(const OUString& rString) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormula(const OUString& rString) override; private: ScColorScaleEntry* getCoreObject(); @@ -406,45 +291,23 @@ public: ScIconSetFormat* getCoreObject(); // XConditionEntry - virtual sal_Int32 SAL_CALL getType() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getType() override; // 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; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -459,17 +322,13 @@ public: virtual ~ScIconSetEntryObj() override; - virtual sal_Int32 SAL_CALL getType() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getType() override; - virtual void SAL_CALL setType(sal_Int32 nType) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setType(sal_Int32 nType) override; - virtual OUString SAL_CALL getFormula() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula() override; - virtual void SAL_CALL setFormula(const OUString& rString) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormula(const OUString& rString) override; private: ScColorScaleEntry* getCoreObject(); @@ -490,45 +349,23 @@ public: ScCondDateFormatEntry* getCoreObject(); // XConditionEntry - virtual sal_Int32 SAL_CALL getType() - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getType() override; // 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; private: rtl::Reference<ScCondFormatObj> mxParent; diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 24e14a732b5d..300e99425002 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -96,7 +96,7 @@ public: ScDragSrc GetDragSourceFlags() const { return nDragSourceFlags; } static ScDrawTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); - 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; static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); const ScRangeListVector& GetProtectedChartRangesVector() const { return m_aProtectedChartRangesVector; } diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 593a5e0ee40b..30d5ea8b9412 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -108,7 +108,7 @@ public: static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); static SfxObjectShell* SetDrawClipDoc( bool bAnyOle ); // update ScGlobal::xDrawClipDocShellRef - virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) override; static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); }; diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index 95740e46731f..4052d5edde8e 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -54,10 +54,6 @@ ScPanelFactory::~ScPanelFactory() Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw( - container::NoSuchElementException, - lang::IllegalArgumentException, - RuntimeException, std::exception) { Reference<ui::XUIElement> xElement; @@ -124,19 +120,16 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( } OUString ScPanelFactory::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("org.apache.openoffice.comp.sc.sidebar.ScPanelFactory"); } sal_Bool ScPanelFactory::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> ScPanelFactory::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence<OUString> aServiceNames { "com.sun.star.ui.UIElementFactory" }; return aServiceNames; diff --git a/sc/source/ui/sidebar/ScPanelFactory.hxx b/sc/source/ui/sidebar/ScPanelFactory.hxx index 476dd6da26b8..1e08c43281e9 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.hxx +++ b/sc/source/ui/sidebar/ScPanelFactory.hxx @@ -47,20 +47,13 @@ public: // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( const ::rtl::OUString& rsResourceURL, - const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw( - css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; } } // end of namespace sc::sidebar diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx index f4686de887e9..e90b32192256 100644 --- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx +++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx @@ -44,7 +44,6 @@ ScChartRangeSelectionListener::~ScChartRangeSelectionListener() // ____ XModifyListener ____ void SAL_CALL ScChartRangeSelectionListener::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::data::XRangeHighlighter > xRangeHighlighter( aEvent.Source, uno::UNO_QUERY ); if( xRangeHighlighter.is()) @@ -62,7 +61,6 @@ void SAL_CALL ScChartRangeSelectionListener::selectionChanged( const lang::Event // ____ XEventListener ____ void SAL_CALL ScChartRangeSelectionListener::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException, std::exception) { } diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index ea22d9b824d5..46087c12903e 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -93,7 +93,6 @@ bool ScAddressConversionObj::ParseUIString( const OUString& rUIString, ::formula // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -130,9 +129,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp } void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if ( !pDocShell ) throw uno::RuntimeException(); @@ -215,8 +211,6 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropert } uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if ( !pDocShell ) throw uno::RuntimeException(); @@ -285,19 +279,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAddressConversionObj ) // lang::XServiceInfo -OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAddressConversionObj::getImplementationName() { return OUString("ScAddressConversionObj" ); } sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScAddressConversionObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { if (bIsRange) return {SC_SERVICENAME_RANGEADDRESS}; diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index d6efeac255c0..6e42bc44e8c5 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -201,9 +201,6 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const OUString& aName) // container::XNameContainer void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno::Any& aElement ) - throw (lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -255,8 +252,6 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno:: } void SAL_CALL ScAutoFormatsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; //! zusammenfassen? @@ -265,8 +260,6 @@ void SAL_CALL ScAutoFormatsObj::replaceByName( const OUString& aName, const uno: } void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -288,7 +281,6 @@ void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName ) // container::XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); @@ -296,15 +288,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumera // container::XIndexAccess -sal_Int32 SAL_CALL ScAutoFormatsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAutoFormatsObj::getCount() { SolarMutexGuard aGuard; return ScGlobal::GetOrCreateAutoFormat()->size(); } uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< container::XNamed > xFormat(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -313,13 +303,13 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex ) return uno::makeAny(xFormat); } -uno::Type SAL_CALL ScAutoFormatsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScAutoFormatsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<container::XNamed>::get(); // muss zu getByIndex passen } -sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -328,8 +318,6 @@ sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException, s // container::XNameAccess uno::Any SAL_CALL ScAutoFormatsObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< container::XNamed > xFormat(GetObjectByName_Impl(aName)); @@ -339,7 +327,6 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScAutoFormatsObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -354,7 +341,6 @@ uno::Sequence<OUString> SAL_CALL ScAutoFormatsObj::getElementNames() } sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nDummy; @@ -392,7 +378,7 @@ void ScAutoFormatObj::InitFormat( sal_uInt16 nNewIndex ) // XUnoTunnel sal_Int64 SAL_CALL ScAutoFormatObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -435,7 +421,6 @@ ScAutoFormatFieldObj* ScAutoFormatObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) // container::XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); @@ -443,7 +428,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumerat // container::XIndexAccess -sal_Int32 SAL_CALL ScAutoFormatObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAutoFormatObj::getCount() { SolarMutexGuard aGuard; if (IsInserted()) @@ -453,8 +438,6 @@ sal_Int32 SAL_CALL ScAutoFormatObj::getCount() throw(uno::RuntimeException, std: } uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -466,13 +449,13 @@ uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex ) return uno::Any(); } -uno::Type SAL_CALL ScAutoFormatObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScAutoFormatObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<beans::XPropertySet>::get(); // muss zu getByIndex passen } -sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScAutoFormatObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -480,7 +463,7 @@ sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException, st // container::XNamed -OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAutoFormatObj::getName() { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -491,7 +474,6 @@ OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException, std::e } void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -534,7 +516,6 @@ void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName ) // beans::XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); @@ -543,9 +524,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatObj::getPropertySet void SAL_CALL ScAutoFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -576,8 +554,6 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue( } uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aAny; @@ -629,7 +605,6 @@ ScAutoFormatFieldObj::~ScAutoFormatFieldObj() // beans::XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatFieldObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); @@ -638,9 +613,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatFieldObj::getProper void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -742,8 +714,6 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( } uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aVal; diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 242b8a03fd8b..f5b0e77ef683 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -199,7 +199,7 @@ uno::Sequence<OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() return aRet; } -bool ScSpreadsheetSettings::getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException) +bool ScSpreadsheetSettings::getPropertyBool(const OUString& aPropertyName) { uno::Any any = getPropertyValue(aPropertyName); bool b = false; @@ -207,7 +207,7 @@ bool ScSpreadsheetSettings::getPropertyBool(const OUString& aPropertyName) throw return b; } -sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException) +sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString& aPropertyName) { uno::Any any = getPropertyValue(aPropertyName); sal_Int16 b = 0; @@ -218,7 +218,6 @@ sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString& aPropertyName) // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettings::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -228,9 +227,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettings::getPrope void SAL_CALL ScSpreadsheetSettings::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -386,8 +382,6 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( } uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -472,7 +466,6 @@ ScRecentFunctionsObj_get_implementation(css::uno::XComponentContext*, css::uno:: // XRecentFunctions uno::Sequence<sal_Int32> SAL_CALL ScRecentFunctionsObj::getRecentFunctionIds() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScAppOptions& rOpt = SC_MOD()->GetAppOptions(); @@ -491,7 +484,6 @@ uno::Sequence<sal_Int32> SAL_CALL ScRecentFunctionsObj::getRecentFunctionIds() void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( const uno::Sequence<sal_Int32>& aRecentFunctionIds ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = (sal_uInt16) std::min( aRecentFunctionIds.getLength(), (sal_Int32) LRU_MAX ); @@ -507,7 +499,7 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( pScMod->SetAppOptions(aNewOpts); } -sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() { return LRU_MAX; } @@ -587,7 +579,6 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co // XFunctionDescriptions uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int32 nId ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); @@ -614,8 +605,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int // XNameAccess uno::Any SAL_CALL ScFunctionListObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); @@ -642,7 +631,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const OUString& aName ) // XIndexAccess -sal_Int32 SAL_CALL ScFunctionListObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScFunctionListObj::getCount() { SolarMutexGuard aGuard; sal_Int32 nCount = 0; @@ -653,8 +642,6 @@ sal_Int32 SAL_CALL ScFunctionListObj::getCount() throw(uno::RuntimeException, st } uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); @@ -680,7 +667,6 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); @@ -688,19 +674,19 @@ uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumer // XElementAccess -uno::Type SAL_CALL ScFunctionListObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScFunctionListObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } -sal_Bool SAL_CALL ScFunctionListObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScFunctionListObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() > 0 ); } -uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames() { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); @@ -721,7 +707,6 @@ uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno: } sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index c17c239a4a72..d826d75e8e16 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -92,7 +92,7 @@ namespace calc // TODO: clean up here whatever you need to clean up (e.g. revoking listeners etc.) } - Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo( ) { return createPropertySetInfo( getInfoHelper() ) ; } @@ -132,17 +132,17 @@ namespace calc // TODO: error message } - OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OCellListSource::getImplementationName( ) { return OUString( "com.sun.star.comp.sheet.OCellListSource" ); } - sal_Bool SAL_CALL OCellListSource::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OCellListSource::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) { return {"com.sun.star.table.CellRangeListSource", "com.sun.star.form.binding.ListEntrySource"}; @@ -172,7 +172,7 @@ namespace calc return sText; } - sal_Int32 SAL_CALL OCellListSource::getListEntryCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OCellListSource::getListEntryCount( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(); @@ -182,7 +182,7 @@ namespace calc return aAddress.EndRow - aAddress.StartRow + 1; } - OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(); @@ -194,7 +194,7 @@ namespace calc return getCellTextContent_noCheck( _nPosition ); } - Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(); @@ -210,7 +210,7 @@ namespace calc return aAllEntries; } - void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(); @@ -222,7 +222,7 @@ namespace calc m_aListEntryListeners.addInterface( _rxListener ); } - void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(); @@ -234,7 +234,7 @@ namespace calc m_aListEntryListeners.removeInterface( _rxListener ); } - void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception) + void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ ) { notifyModified(); } @@ -263,7 +263,7 @@ namespace calc } - void SAL_CALL OCellListSource::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OCellListSource::disposing( const EventObject& aEvent ) { Reference<XInterface> xRangeInt( m_xRange, UNO_QUERY ); if ( xRangeInt == aEvent.Source ) @@ -273,7 +273,7 @@ namespace calc } } - void SAL_CALL OCellListSource::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL OCellListSource::initialize( const Sequence< Any >& _rArguments ) { if ( m_bInitialized ) throw Exception(); diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 9f9aa76d26ac..2763c768bc2d 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -85,22 +85,22 @@ namespace calc DECLARE_XTYPEPROVIDER() // XListEntrySource - virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getListEntryCount( ) override; + virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) override; + virtual void SAL_CALL addListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) override; + virtual void SAL_CALL removeListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) override; // OComponentHelper/XComponent virtual void SAL_CALL disposing() 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 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; @@ -110,11 +110,11 @@ namespace calc virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) 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; private: void checkDisposed( ) const; diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 536e227a9d94..f387325c6faf 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1750,7 +1750,6 @@ void ScCellRangesBase::SetCursorOnly( bool bSet ) } uno::Any SAL_CALL ScCellRangesBase::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( beans::XPropertySet ) SC_QUERYINTERFACE( beans::XMultiPropertySet ) @@ -1782,7 +1781,7 @@ void SAL_CALL ScCellRangesBase::release() throw() OWeakObject::release(); } -uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -1807,7 +1806,6 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes() throw(uno::Runtim } uno::Sequence<sal_Int8> SAL_CALL ScCellRangesBase::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1821,7 +1819,6 @@ void ScCellRangesBase::PaintGridRanges_Impl( ) // XSheetOperation double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunction ) - throw(uno::Exception, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScMarkData aMark(*GetMarkData()); @@ -1841,7 +1838,7 @@ double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunct return fVal; } -void SAL_CALL ScCellRangesBase::clearContents( sal_Int32 nContentFlags ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangesBase::clearContents( sal_Int32 nContentFlags ) { SolarMutexGuard aGuard; if ( !aRanges.empty() ) @@ -1943,7 +1940,6 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( sal_uInt16 nItemWhic } beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aRanges.empty() ) @@ -1958,7 +1954,6 @@ beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const OUString uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates( const uno::Sequence<OUString>& aPropertyNames ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1977,7 +1972,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates } void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -2022,8 +2016,6 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyN } uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { //! mit getPropertyValue zusammenfassen @@ -2130,7 +2122,6 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropert // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangesBase::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -2250,9 +2241,6 @@ static void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const void SAL_CALL ScCellRangesBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2268,7 +2256,6 @@ void SAL_CALL ScCellRangesBase::setPropertyValue( } void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -2466,8 +2453,6 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE } uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2485,7 +2470,6 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyN } void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -2635,8 +2619,6 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aRanges.empty() ) @@ -2647,8 +2629,6 @@ void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const OUString& /* aP void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aRanges.empty() ) @@ -2659,16 +2639,12 @@ void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const OUString& /* void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -2677,10 +2653,6 @@ void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const OUString&, void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) - throw (beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2767,7 +2739,6 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2785,20 +2756,17 @@ uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues( void SAL_CALL ScCellRangesBase::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -2818,7 +2786,6 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, const SfxHint&, rHint, void ) // XTolerantMultiPropertySet uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::setPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2937,7 +2904,6 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set } uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::getPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2967,7 +2933,6 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get } uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBase::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3006,7 +2971,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas // XIndent -void SAL_CALL ScCellRangesBase::decrementIndent() throw(css::uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangesBase::decrementIndent() { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) // leer = nichts zu tun @@ -3018,7 +2983,7 @@ void SAL_CALL ScCellRangesBase::decrementIndent() throw(css::uno::RuntimeExcepti } } -void SAL_CALL ScCellRangesBase::incrementIndent() throw(css::uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangesBase::incrementIndent() { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) // leer = nichts zu tun @@ -3082,7 +3047,6 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const } uno::Sequence< uno::Sequence<double> > SAL_CALL ScCellRangesBase::getData() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl()); @@ -3143,7 +3107,6 @@ ScRangeListRef ScCellRangesBase::GetLimitedChartRanges_Impl( long nDataColumns, } void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<double> >& aData ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3196,7 +3159,6 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub } uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl()); @@ -3215,7 +3177,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() void SAL_CALL ScCellRangesBase::setRowDescriptions( const uno::Sequence<OUString>& aRowDescriptions ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3267,7 +3228,6 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( } uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl()); @@ -3286,7 +3246,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() void SAL_CALL ScCellRangesBase::setColumnDescriptions( const uno::Sequence<OUString>& aColumnDescriptions ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3361,7 +3320,6 @@ void ScCellRangesBase::ForceChartListener_Impl() void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Reference< chart::XChartDataChangeEventListener >& aListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) @@ -3385,7 +3343,6 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::Reference< chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) @@ -3396,13 +3353,13 @@ void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::R } } -double SAL_CALL ScCellRangesBase::getNotANumber() throw(css::uno::RuntimeException, std::exception) +double SAL_CALL ScCellRangesBase::getNotANumber() { // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will return DBL_MIN; } -sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) { // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will return (nNumber == DBL_MIN); @@ -3411,7 +3368,6 @@ sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) throw(uno::Ru // XModifyBroadcaster void SAL_CALL ScCellRangesBase::addModifyListener(const uno::Reference<util::XModifyListener>& aListener) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aRanges.empty() ) @@ -3433,7 +3389,6 @@ void SAL_CALL ScCellRangesBase::addModifyListener(const uno::Reference<util::XMo } void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util::XModifyListener>& aListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3468,7 +3423,6 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util: // XCellRangesQuery uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3508,7 +3462,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC } uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3544,7 +3497,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentCells( sal_Int16 nContentFlags ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3634,7 +3586,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaCells( sal_Int32 nResultFlags ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3772,21 +3723,21 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl( } uno::Reference<sheet::XSheetCellRanges > SAL_CALL ScCellRangesBase::queryColumnDifferences( - const table::CellAddress& aCompare ) throw(uno::RuntimeException, std::exception) + const table::CellAddress& aCompare ) { SolarMutexGuard aGuard; return QueryDifferences_Impl( aCompare, true ); } uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryRowDifferences( - const table::CellAddress& aCompare ) throw(uno::RuntimeException, std::exception) + const table::CellAddress& aCompare ) { SolarMutexGuard aGuard; return QueryDifferences_Impl( aCompare, false ); } uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersection( - const table::CellRangeAddress& aRange ) throw(uno::RuntimeException, std::exception) + const table::CellRangeAddress& aRange ) { SolarMutexGuard aGuard; ScRange aMask( (SCCOL)aRange.StartColumn, (SCROW)aRange.StartRow, aRange.Sheet, @@ -3811,7 +3762,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersec // XFormulaQuery uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPrecedents( - sal_Bool bRecursive ) throw(uno::RuntimeException, std::exception) + sal_Bool bRecursive ) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -3860,7 +3811,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden } uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependents( - sal_Bool bRecursive ) throw(uno::RuntimeException, std::exception) + sal_Bool bRecursive ) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -3921,7 +3872,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen // XSearchable uno::Reference<util::XSearchDescriptor> SAL_CALL ScCellRangesBase::createSearchDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScCellSearchObj; @@ -3929,8 +3879,6 @@ uno::Reference<util::XSearchDescriptor> SAL_CALL ScCellRangesBase::createSearchD uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll( const uno::Reference<util::XSearchDescriptor>& xDesc ) - throw(uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; // Wenn nichts gefunden wird, soll Null zurueckgegeben werden (?) @@ -4016,7 +3964,6 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl( uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findFirst( const uno::Reference<util::XSearchDescriptor>& xDesc ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return Find_Impl( xDesc, nullptr ); @@ -4025,7 +3972,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findFirst( uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findNext( const uno::Reference<uno::XInterface>& xStartAt, const uno::Reference<util::XSearchDescriptor >& xDesc ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xStartAt.is() ) @@ -4047,15 +3993,12 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findNext( // XReplaceable uno::Reference<util::XReplaceDescriptor> SAL_CALL ScCellRangesBase::createReplaceDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScCellSearchObj; } sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSearchDescriptor>& xDesc ) - throw(uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; sal_Int32 nReplaced = 0; @@ -4139,7 +4082,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea // XUnoTunnel sal_Int64 SAL_CALL ScCellRangesBase::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -4194,7 +4137,6 @@ void ScCellRangesObj::RefChanged() } uno::Any SAL_CALL ScCellRangesObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( sheet::XSheetCellRangeContainer ) SC_QUERYINTERFACE( sheet::XSheetCellRanges ) @@ -4218,7 +4160,7 @@ void SAL_CALL ScCellRangesObj::release() throw() ScCellRangesBase::release(); } -uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -4240,7 +4182,6 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() throw(uno::Runtime } uno::Sequence<sal_Int8> SAL_CALL ScCellRangesObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -4264,7 +4205,6 @@ ScCellRangeObj* ScCellRangesObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const } uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddresses() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -4287,7 +4227,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddress } uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4304,7 +4243,6 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells } OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aString; @@ -4319,7 +4257,6 @@ OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() void SAL_CALL ScCellRangesObj::addRangeAddress( const table::CellRangeAddress& rRange, sal_Bool bMergeRanges ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aRange(static_cast<SCCOL>(rRange.StartColumn), @@ -4340,8 +4277,6 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const ScR } void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress& rRange ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -4389,7 +4324,6 @@ void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::CellRangeAddress >& rRanges, sal_Bool bMergeRanges ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Int32 nCount(rRanges.getLength()); @@ -4410,8 +4344,6 @@ void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::Cel } void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table::CellRangeAddress >& rRangeSeq ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { // use sometimes a better/faster implementation sal_uInt32 nCount(rRangeSeq.getLength()); @@ -4436,9 +4368,6 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const OUS } void SAL_CALL ScCellRangesObj::insertByName( const OUString& aName, const uno::Any& aElement ) - throw (lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -4564,8 +4493,6 @@ static bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, } void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -4629,8 +4556,6 @@ void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName ) // XNameReplace void SAL_CALL ScCellRangesObj::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; //! zusammenfassen? @@ -4641,8 +4566,6 @@ void SAL_CALL ScCellRangesObj::replaceByName( const OUString& aName, const uno:: // XNameAccess uno::Any SAL_CALL ScCellRangesObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -4679,7 +4602,6 @@ static bool lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries, } uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4710,7 +4632,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getElementNames() } sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -4723,7 +4644,6 @@ sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); @@ -4731,7 +4651,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumerat // XIndexAccess -sal_Int32 SAL_CALL ScCellRangesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScCellRangesObj::getCount() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -4739,8 +4659,6 @@ sal_Int32 SAL_CALL ScCellRangesObj::getCount() throw(uno::RuntimeException, std: } uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xRange(GetObjectByIndex_Impl(nIndex)); @@ -4750,13 +4668,13 @@ uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScCellRangesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScCellRangesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XCellRange>::get(); } -sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellRangesObj::hasElements() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -4764,19 +4682,17 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException, st } // XServiceInfo -OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellRangesObj::getImplementationName() { return OUString( "ScCellRangesObj" ); } sal_Bool SAL_CALL ScCellRangesObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCSHEETCELLRANGES_SERVICE, SCCELLPROPERTIES_SERVICE, @@ -4819,7 +4735,6 @@ void ScCellRangeObj::RefChanged() } uno::Any SAL_CALL ScCellRangeObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( sheet::XCellRangeAddressable ) SC_QUERYINTERFACE( table::XCellRange ) @@ -4854,7 +4769,7 @@ void SAL_CALL ScCellRangeObj::release() throw() ScCellRangesBase::release(); } -uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -4890,7 +4805,6 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() throw(uno::RuntimeE } uno::Sequence<sal_Int8> SAL_CALL ScCellRangeObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -4902,7 +4816,6 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangeObj::getImplementationId() uno::Reference<table::XCell> ScCellRangeObj::GetCellByPosition_Impl( sal_Int32 nColumn, sal_Int32 nRow ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException) { ScDocShell* pDocSh = GetDocShell(); if (!pDocSh) @@ -4925,7 +4838,6 @@ uno::Reference<table::XCell> ScCellRangeObj::GetCellByPosition_Impl( uno::Reference<table::XCell> SAL_CALL ScCellRangeObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4934,7 +4846,6 @@ uno::Reference<table::XCell> SAL_CALL ScCellRangeObj::getCellByPosition( uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4962,13 +4873,13 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPositio } uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByName( - const OUString& aName ) throw(uno::RuntimeException, std::exception) + const OUString& aName ) { return getCellRangeByName( aName, ScAddress::detailsOOOa1 ); } uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( - const OUString& aName, const ScAddress::Details& rDetails ) throw(uno::RuntimeException) + const OUString& aName, const ScAddress::Details& rDetails ) { // name refers to the whole document (with the range's table as default), // valid only if the range is within this range @@ -5020,7 +4931,7 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( // XColumnRowRange -uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() throw(uno::RuntimeException, std::exception) +uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5032,7 +4943,7 @@ uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() throw return nullptr; } -uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() throw(uno::RuntimeException, std::exception) +uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5046,7 +4957,7 @@ uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() throw(uno:: // XAddressableCellRange -table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress() throw(uno::RuntimeException, std::exception) +table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress() { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -5057,7 +4968,6 @@ table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress() throw(uno::Ru // XSheetCellRange uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5070,7 +4980,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet() // XArrayFormulaRange -OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellRangeObj::getArrayFormula() { SolarMutexGuard aGuard; @@ -5104,7 +5014,6 @@ OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException, void ScCellRangeObj::SetArrayFormula_Impl(const OUString& rFormula, const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar) - throw (uno::RuntimeException, std::exception) { ScDocShell* pDocSh = GetDocShell(); if (pDocSh) @@ -5131,7 +5040,6 @@ void ScCellRangeObj::SetArrayFormula_Impl(const OUString& rFormula, } void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // GRAM_API for API compatibility. @@ -5140,7 +5048,6 @@ void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula ) // XArrayFormulaTokens uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5174,7 +5081,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens() return aSequence; } -void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5210,7 +5117,6 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula // XCellRangeData uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5238,7 +5144,6 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray() void SAL_CALL ScCellRangeObj::setDataArray( const uno::Sequence< uno::Sequence<uno::Any> >& aArray ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5257,7 +5162,6 @@ void SAL_CALL ScCellRangeObj::setDataArray( // XCellRangeFormula uno::Sequence< uno::Sequence<OUString> > SAL_CALL ScCellRangeObj::getFormulaArray() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5299,7 +5203,6 @@ uno::Sequence< uno::Sequence<OUString> > SAL_CALL ScCellRangeObj::getFormulaArra void SAL_CALL ScCellRangeObj::setFormulaArray( const uno::Sequence< uno::Sequence<OUString> >& aArray ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5323,7 +5226,6 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress& sheet::TableOperationMode nMode, const table::CellAddress& aColumnCell, const table::CellAddress& aRowCell ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5366,7 +5268,7 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress& // XMergeable -void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5385,7 +5287,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti } } -sal_Bool SAL_CALL ScCellRangeObj::getIsMerged() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellRangeObj::getIsMerged() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5396,7 +5298,7 @@ sal_Bool SAL_CALL ScCellRangeObj::getIsMerged() throw(uno::RuntimeException, std void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, - double fStep, double fEndValue ) throw(uno::RuntimeException, std::exception) + double fStep, double fEndValue ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5471,7 +5373,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection, } void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection, - sal_Int32 nSourceCount ) throw(uno::RuntimeException, std::exception) + sal_Int32 nSourceCount ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5517,7 +5419,6 @@ void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection, // XAutoFormattable void SAL_CALL ScCellRangeObj::autoFormat( const OUString& aName ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5539,7 +5440,6 @@ void SAL_CALL ScCellRangeObj::autoFormat( const OUString& aName ) // XSortable uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSortParam aParam; @@ -5570,7 +5470,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescripto } void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& aDescriptor ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5625,7 +5524,7 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a // XFilterable uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFilterDescriptor( - sal_Bool bEmpty ) throw(uno::RuntimeException, std::exception) + sal_Bool bEmpty ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5658,7 +5557,6 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil } void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDescriptor>& xDescriptor ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5736,7 +5634,6 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFilterDescriptorByObject( const uno::Reference<sheet::XSheetFilterable>& xObject ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5798,7 +5695,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil // XSubTotalSource uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScCellRangeObj::createSubTotalDescriptor( - sal_Bool bEmpty ) throw(uno::RuntimeException, std::exception) + sal_Bool bEmpty ) { SolarMutexGuard aGuard; ScSubTotalDescriptor* pNew = new ScSubTotalDescriptor; @@ -5835,7 +5732,6 @@ uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScCellRangeObj::createSubTot void SAL_CALL ScCellRangeObj::applySubTotals( const uno::Reference<sheet::XSubTotalDescriptor>& xDescriptor, sal_Bool bReplace) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5877,7 +5773,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals( } } -void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangeObj::removeSubTotals() { SolarMutexGuard aGuard; @@ -5905,7 +5801,6 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException, std } uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createImportDescriptor( sal_Bool bEmpty ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScImportParam aParam; @@ -5924,7 +5819,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createImportDescrip } void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue>& aDescriptor ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5951,7 +5845,6 @@ void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue // XCellFormatRangesSupplier uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getCellFormatRanges() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5963,7 +5856,6 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getCellFormatRa // XUniqueCellFormatRangesSupplier uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getUniqueCellFormatRanges() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5975,7 +5867,6 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getUniqueCellFo // XPropertySet erweitert fuer Range-Properties uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangeObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -5984,7 +5875,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangeObj::getPropertySetI } void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { // Range has only Position and Size in addition to ScCellRangesBase, both are ReadOnly // -> nothing to do here @@ -5993,7 +5883,6 @@ void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEnt } void ScCellRangeObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -6036,19 +5925,17 @@ const SfxItemPropertyMap& ScCellRangeObj::GetItemPropertyMap() // XServiceInfo -OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellRangeObj::getImplementationName() { return OUString( "ScCellRangeObj" ); } sal_Bool SAL_CALL ScCellRangeObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCSHEETCELLRANGE_SERVICE, SCCELLRANGE_SERVICE, @@ -6110,7 +5997,7 @@ void ScCellObj::RefChanged() } } -uno::Any SAL_CALL ScCellObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScCellObj::queryInterface( const uno::Type& rType ) { SC_QUERYINTERFACE( table::XCell ) SC_QUERYINTERFACE( table::XCell2 ) @@ -6138,7 +6025,7 @@ void SAL_CALL ScCellObj::release() throw() ScCellRangeObj::release(); } -uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -6165,7 +6052,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() throw(uno::RuntimeExcept return aTypes; } -uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId() throw(uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -6283,7 +6170,6 @@ void ScCellObj::InputEnglishString( const OUString& rText ) // XText uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScCellTextCursor( *this ); @@ -6291,7 +6177,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursor() uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SvxUnoTextCursor* pCursor = new ScCellTextCursor( *this ); @@ -6312,13 +6197,13 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange( return xCursor; } -OUString SAL_CALL ScCellObj::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellObj::getString() { SolarMutexGuard aGuard; return GetOutputString_Impl(); } -void SAL_CALL ScCellObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setString( const OUString& aText ) { SolarMutexGuard aGuard; SetString_Impl(aText, false, false); // immer Text @@ -6330,7 +6215,6 @@ void SAL_CALL ScCellObj::setString( const OUString& aText ) throw(uno::RuntimeEx void SAL_CALL ScCellObj::insertString( const uno::Reference<text::XTextRange>& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { // special handling for ScCellTextCursor is no longer needed, // SvxUnoText::insertString checks for SvxUnoTextRangeBase instead of SvxUnoTextRange @@ -6341,7 +6225,6 @@ void SAL_CALL ScCellObj::insertString( const uno::Reference<text::XTextRange>& x void SAL_CALL ScCellObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetUnoText().insertControlCharacter(xRange, nControlCharacter, bAbsorb); @@ -6350,7 +6233,6 @@ void SAL_CALL ScCellObj::insertControlCharacter( const uno::Reference<text::XTex void SAL_CALL ScCellObj::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; ScDocShell* pDocSh = GetDocShell(); @@ -6402,7 +6284,6 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang } void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xContent.is() ) @@ -6418,38 +6299,37 @@ void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextCont GetUnoText().removeTextContent(xContent); } -uno::Reference<text::XText> SAL_CALL ScCellObj::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScCellObj::getText() { SolarMutexGuard aGuard; return this; } -uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getStart() { SolarMutexGuard aGuard; return GetUnoText().getStart(); } -uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getEnd() { SolarMutexGuard aGuard; return GetUnoText().getEnd(); } uno::Reference<container::XEnumeration> SAL_CALL ScCellObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return GetUnoText().createEnumeration(); } -uno::Type SAL_CALL ScCellObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScCellObj::getElementType() { SolarMutexGuard aGuard; return GetUnoText().getElementType(); } -sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellObj::hasElements() { SolarMutexGuard aGuard; return GetUnoText().hasElements(); @@ -6457,31 +6337,31 @@ sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException, std::exc // XCell -OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellObj::getFormula() { SolarMutexGuard aGuard; return GetInputString_Impl( true /* English */ ); } -void SAL_CALL ScCellObj::setFormula( const OUString& aFormula ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setFormula( const OUString& aFormula ) { SolarMutexGuard aGuard; SetString_Impl(aFormula, true, true); // Interpret as English } -double SAL_CALL ScCellObj::getValue() throw(uno::RuntimeException, std::exception) +double SAL_CALL ScCellObj::getValue() { SolarMutexGuard aGuard; return GetValue_Impl(); } -void SAL_CALL ScCellObj::setValue( double nValue ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setValue( double nValue ) { SolarMutexGuard aGuard; SetValue_Impl(nValue); } -void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) { SolarMutexGuard aGuard; ScDocShell *pDocSh = GetDocShell(); @@ -6492,7 +6372,7 @@ void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) throw(uno:: pDocSh->GetDocFunc().SetFormulaCell(aCellPos, pCell, false); } } -void SAL_CALL ScCellObj::setFormulaResult( double nValue ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setFormulaResult( double nValue ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6509,7 +6389,7 @@ void SAL_CALL ScCellObj::setFormulaResult( double nValue ) throw(uno::RuntimeExc } } -table::CellContentType SAL_CALL ScCellObj::getType() throw(uno::RuntimeException, std::exception) +table::CellContentType SAL_CALL ScCellObj::getType() { SolarMutexGuard aGuard; table::CellContentType eRet = table::CellContentType_EMPTY; @@ -6556,7 +6436,7 @@ table::CellContentType ScCellObj::GetResultType_Impl() return getType(); // wenn keine Formel } -sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScCellObj::getError() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6577,7 +6457,6 @@ sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException, std::excep // XFormulaTokens uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<sheet::FormulaToken> aSequence; @@ -6596,7 +6475,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens() return aSequence; } -void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6613,7 +6492,7 @@ void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rT // XCellAddressable -table::CellAddress SAL_CALL ScCellObj::getCellAddress() throw(uno::RuntimeException, std::exception) +table::CellAddress SAL_CALL ScCellObj::getCellAddress() { SolarMutexGuard aGuard; table::CellAddress aAdr; @@ -6626,7 +6505,6 @@ table::CellAddress SAL_CALL ScCellObj::getCellAddress() throw(uno::RuntimeExcept // XSheetAnnotationAnchor uno::Reference<sheet::XSheetAnnotation> SAL_CALL ScCellObj::getAnnotation() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6640,7 +6518,6 @@ uno::Reference<sheet::XSheetAnnotation> SAL_CALL ScCellObj::getAnnotation() // XFieldTypesSupplier uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellObj::getTextFields() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6654,7 +6531,6 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellObj::getTextFields( } uno::Reference<container::XNameAccess> SAL_CALL ScCellObj::getTextFieldMasters() - throw(uno::RuntimeException, std::exception) { // sowas gibts nicht im Calc (?) return nullptr; @@ -6663,7 +6539,6 @@ uno::Reference<container::XNameAccess> SAL_CALL ScCellObj::getTextFieldMasters() // XPropertySet erweitert fuer Zell-Properties uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -6672,7 +6547,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellObj::getPropertySetInfo() } void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -6694,7 +6568,6 @@ void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, c } void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -6720,19 +6593,17 @@ const SfxItemPropertyMap& ScCellObj::GetItemPropertyMap() // XServiceInfo -OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellObj::getImplementationName() { return OUString( "ScCellObj" ); } sal_Bool SAL_CALL ScCellObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCSHEETCELL_SERVICE, SCCELL_SERVICE, @@ -6745,13 +6616,13 @@ uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames() // XActionLockable -sal_Bool SAL_CALL ScCellObj::isActionLocked() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellObj::isActionLocked() { SolarMutexGuard aGuard; return nActionLockCount != 0; } -void SAL_CALL ScCellObj::addActionLock() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::addActionLock() { SolarMutexGuard aGuard; if (!nActionLockCount) @@ -6767,7 +6638,7 @@ void SAL_CALL ScCellObj::addActionLock() throw(uno::RuntimeException, std::excep nActionLockCount++; } -void SAL_CALL ScCellObj::removeActionLock() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::removeActionLock() { SolarMutexGuard aGuard; if (nActionLockCount > 0) @@ -6790,7 +6661,7 @@ void SAL_CALL ScCellObj::removeActionLock() throw(uno::RuntimeException, std::ex } } -void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) { SolarMutexGuard aGuard; if (mxUnoText.is()) @@ -6807,7 +6678,7 @@ void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeExc nActionLockCount = nLock; } -sal_Int16 SAL_CALL ScCellObj::resetActionLocks() throw(uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL ScCellObj::resetActionLocks() { SolarMutexGuard aGuard; sal_uInt16 nRet(nActionLockCount); @@ -6841,7 +6712,7 @@ void ScTableSheetObj::InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab) InitInsertRange( pDocSh, ScRange(0,0,nTab, MAXCOL,MAXROW,nTab) ); } -uno::Any SAL_CALL ScTableSheetObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScTableSheetObj::queryInterface( const uno::Type& rType ) { SC_QUERYINTERFACE( sheet::XSpreadsheet ) SC_QUERYINTERFACE( container::XNamed ) @@ -6875,7 +6746,7 @@ void SAL_CALL ScTableSheetObj::release() throw() ScCellRangeObj::release(); } -uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -6911,7 +6782,7 @@ uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() throw(uno::Runtime return aTypes; } -uno::Sequence<sal_Int8> SAL_CALL ScTableSheetObj::getImplementationId() throw(uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> SAL_CALL ScTableSheetObj::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -6932,7 +6803,7 @@ SCTAB ScTableSheetObj::GetTab_Impl() const // former XSheet -uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() throw(uno::RuntimeException, std::exception) +uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6944,7 +6815,6 @@ uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() throw( } uno::Reference<sheet::XDataPilotTables> SAL_CALL ScTableSheetObj::getDataPilotTables() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6955,7 +6825,7 @@ uno::Reference<sheet::XDataPilotTables> SAL_CALL ScTableSheetObj::getDataPilotTa return nullptr; } -uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() throw(uno::RuntimeException, std::exception) +uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6968,7 +6838,6 @@ uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() throw } uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotations() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6981,14 +6850,13 @@ uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotation } uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByName( - const OUString& rRange ) throw(uno::RuntimeException, std::exception) + const OUString& rRange ) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName( rRange ); } uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7003,7 +6871,6 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor() uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorByRange( const uno::Reference<sheet::XSheetCellRange>& xCellRange ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7023,7 +6890,6 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorBy // XSheetCellRange uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTableSheetObj::getSpreadsheet() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return this; //!??? @@ -7033,7 +6899,6 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTableSheetObj::getSpreadsheet() uno::Reference<table::XCell> SAL_CALL ScTableSheetObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ScCellRangeObj::GetCellByPosition_Impl(nColumn, nRow); @@ -7041,14 +6906,12 @@ uno::Reference<table::XCell> SAL_CALL ScTableSheetObj::getCellByPosition( uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByPosition(nLeft,nTop,nRight,nBottom); } uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPageBreaks() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7094,7 +6957,6 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage } uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBreaks() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7117,7 +6979,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBre return uno::Sequence<sheet::TablePageBreakData>(0); } -void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7149,7 +7011,7 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc // XNamed -OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableSheetObj::getName() { SolarMutexGuard aGuard; OUString aName; @@ -7160,7 +7022,6 @@ OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException, std::e } void SAL_CALL ScTableSheetObj::setName( const OUString& aNewName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7173,7 +7034,6 @@ void SAL_CALL ScTableSheetObj::setName( const OUString& aNewName ) // XDrawPageSupplier uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7197,7 +7057,7 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage() // XCellMovement void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRangeAddress, - sheet::CellInsertMode nMode ) throw(uno::RuntimeException, std::exception) + sheet::CellInsertMode nMode ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7228,7 +7088,7 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang } void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRangeAddress, - sheet::CellDeleteMode nMode ) throw(uno::RuntimeException, std::exception) + sheet::CellDeleteMode nMode ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7260,7 +7120,6 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRang void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& aDestination, const table::CellRangeAddress& aSource ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7276,7 +7135,6 @@ void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& aDestination void SAL_CALL ScTableSheetObj::copyRange( const table::CellAddress& aDestination, const table::CellRangeAddress& aSource ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7332,7 +7190,6 @@ void ScTableSheetObj::PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges ) } uno::Sequence<table::CellRangeAddress> SAL_CALL ScTableSheetObj::getPrintAreas() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7363,7 +7220,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScTableSheetObj::getPrintAreas() void SAL_CALL ScTableSheetObj::setPrintAreas( const uno::Sequence<table::CellRangeAddress>& aPrintAreas ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7394,7 +7250,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas( } } -sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7408,7 +7264,6 @@ sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() throw(uno::RuntimeExce } void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7436,7 +7291,7 @@ void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns } } -table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns() throw(uno::RuntimeException, std::exception) +table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns() { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -7456,7 +7311,6 @@ table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns() throw(uno::R } void SAL_CALL ScTableSheetObj::setTitleColumns( const table::CellRangeAddress& aTitleColumns ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7475,7 +7329,7 @@ void SAL_CALL ScTableSheetObj::setTitleColumns( const table::CellRangeAddress& a } } -sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7489,7 +7343,6 @@ sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() throw(uno::RuntimeExcepti } void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7517,7 +7370,7 @@ void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows ) } } -table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows() throw(uno::RuntimeException, std::exception) +table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows() { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -7537,7 +7390,6 @@ table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows() throw(uno::Runt } void SAL_CALL ScTableSheetObj::setTitleRows( const table::CellRangeAddress& aTitleRows ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7558,7 +7410,7 @@ void SAL_CALL ScTableSheetObj::setTitleRows( const table::CellRangeAddress& aTit // XSheetLinkable -sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() throw(uno::RuntimeException, std::exception) +sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() { SolarMutexGuard aGuard; sheet::SheetLinkMode eRet = sheet::SheetLinkMode_NONE; @@ -7575,7 +7427,6 @@ sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() throw(uno::RuntimeE } void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -7587,7 +7438,7 @@ void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode ) link( aUrl, aSheet, "", "", nLinkMode ); } -OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableSheetObj::getLinkUrl() { SolarMutexGuard aGuard; OUString aFile; @@ -7598,7 +7449,6 @@ OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException, std } void SAL_CALL ScTableSheetObj::setLinkUrl( const OUString& aLinkUrl ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -7610,7 +7460,7 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const OUString& aLinkUrl ) link( aLinkUrl, aSheet, "", "", eMode ); } -OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableSheetObj::getLinkSheetName() { SolarMutexGuard aGuard; OUString aSheet; @@ -7621,7 +7471,6 @@ OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeExceptio } void SAL_CALL ScTableSheetObj::setLinkSheetName( const OUString& aLinkSheetName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -7635,7 +7484,7 @@ void SAL_CALL ScTableSheetObj::setLinkSheetName( const OUString& aLinkSheetName void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aSheetName, const OUString& aFilterName, const OUString& aFilterOptions, - sheet::SheetLinkMode nMode ) throw(uno::RuntimeException, std::exception) + sheet::SheetLinkMode nMode ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7700,7 +7549,6 @@ void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aShee // XSheetAuditing sal_Bool SAL_CALL ScTableSheetObj::hideDependents( const table::CellAddress& aPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7715,7 +7563,6 @@ sal_Bool SAL_CALL ScTableSheetObj::hideDependents( const table::CellAddress& aPo } sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7730,7 +7577,6 @@ sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPo } sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7745,7 +7591,6 @@ sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPo } sal_Bool SAL_CALL ScTableSheetObj::showPrecedents( const table::CellAddress& aPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7760,7 +7605,6 @@ sal_Bool SAL_CALL ScTableSheetObj::showPrecedents( const table::CellAddress& aPo } sal_Bool SAL_CALL ScTableSheetObj::showErrors( const table::CellAddress& aPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7774,7 +7618,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showErrors( const table::CellAddress& aPositi return false; } -sal_Bool SAL_CALL ScTableSheetObj::showInvalid() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetObj::showInvalid() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7783,7 +7627,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showInvalid() throw(uno::RuntimeException, st return false; } -void SAL_CALL ScTableSheetObj::clearArrows() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScTableSheetObj::clearArrows() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7795,8 +7639,6 @@ void SAL_CALL ScTableSheetObj::clearArrows() throw(uno::RuntimeException, std::e void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rGroupRange, table::TableOrientation nOrientation ) - throw (uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7812,8 +7654,6 @@ void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rGroupRange void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rGroupRange, table::TableOrientation nOrientation ) - throw (uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7828,7 +7668,6 @@ void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rGroupRan } void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCellRange ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7842,7 +7681,6 @@ void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCell } void SAL_CALL ScTableSheetObj::clearOutline() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7855,7 +7693,6 @@ void SAL_CALL ScTableSheetObj::clearOutline() } void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellRange ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7869,7 +7706,6 @@ void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellR } void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellRange ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7883,7 +7719,6 @@ void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellR } void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientation nOrientation ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7899,7 +7734,6 @@ void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientat // XProtectable void SAL_CALL ScTableSheetObj::protect( const OUString& aPassword ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7911,7 +7745,6 @@ void SAL_CALL ScTableSheetObj::protect( const OUString& aPassword ) } void SAL_CALL ScTableSheetObj::unprotect( const OUString& aPassword ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7923,7 +7756,7 @@ void SAL_CALL ScTableSheetObj::unprotect( const OUString& aPassword ) } } -sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetObj::isProtected() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7936,7 +7769,7 @@ sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException, st // XScenario -sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7946,7 +7779,7 @@ sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException, return false; } -OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableSheetObj::getScenarioComment() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7962,7 +7795,6 @@ OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeExcept } void SAL_CALL ScTableSheetObj::setScenarioComment( const OUString& aScenarioComment ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7985,7 +7817,6 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const OUString& aScenarioComm } void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAddress>& rScenRanges ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -8022,7 +7853,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd } } -void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScTableSheetObj::apply() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -8047,7 +7878,6 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException, std::excepti // XScenarioEnhanced uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges( ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -8080,7 +7910,6 @@ uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges( ) // XExternalSheetName void ScTableSheetObj::setExternalName( const OUString& aUrl, const OUString& aSheetName ) - throw (container::ElementExistException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -8099,7 +7928,7 @@ void ScTableSheetObj::setExternalName( const OUString& aUrl, const OUString& aSh // XEventsSupplier -uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents() throw (uno::RuntimeException, std::exception) +uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -8112,7 +7941,6 @@ uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents() th // XPropertySet erweitert fuer Sheet-Properties uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableSheetObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -8121,8 +7949,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableSheetObj::getPropertySet } void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, - std::exception) { if ( pEntry ) { @@ -8454,8 +8280,6 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, - std::exception) { if ( pEntry ) { @@ -8605,19 +8429,17 @@ const SfxItemPropertyMap& ScTableSheetObj::GetItemPropertyMap() // XServiceInfo -OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableSheetObj::getImplementationName() { return OUString( "ScTableSheetObj" ); } sal_Bool SAL_CALL ScTableSheetObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCSPREADSHEET_SERVICE, SCSHEETCELLRANGE_SERVICE, @@ -8631,7 +8453,7 @@ uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames() // XUnoTunnel sal_Int64 SAL_CALL ScTableSheetObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -8672,7 +8494,7 @@ ScTableColumnObj::~ScTableColumnObj() { } -uno::Any SAL_CALL ScTableColumnObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScTableColumnObj::queryInterface( const uno::Type& rType ) { SC_QUERYINTERFACE( container::XNamed ) @@ -8689,7 +8511,7 @@ void SAL_CALL ScTableColumnObj::release() throw() ScCellRangeObj::release(); } -uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -8708,14 +8530,14 @@ uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() throw(uno::Runtim return aTypes; } -uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId() throw(uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XNamed -OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableColumnObj::getName() { SolarMutexGuard aGuard; @@ -8727,7 +8549,6 @@ OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException, std:: } void SAL_CALL ScTableColumnObj::setName( const OUString& /* aNewName */ ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; throw uno::RuntimeException(); // read-only @@ -8736,7 +8557,6 @@ void SAL_CALL ScTableColumnObj::setName( const OUString& /* aNewName */ ) // XPropertySet erweitert fuer Spalten-Properties uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -8745,8 +8565,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnObj::getPropertySe } void ScTableColumnObj::SetOnePropertyValue(const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue) - throw(lang::IllegalArgumentException, uno::RuntimeException, - std::exception) { if ( pEntry ) { @@ -8810,7 +8628,6 @@ void ScTableColumnObj::SetOnePropertyValue(const SfxItemPropertySimpleEntry* pEn } void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -8876,7 +8693,6 @@ ScTableRowObj::~ScTableRowObj() // XPropertySet erweitert fuer Zeilen-Properties uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -8885,7 +8701,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowObj::getPropertySetIn } void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -8960,7 +8775,6 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr } void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -9048,7 +8862,6 @@ void ScCellsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScCellsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -9056,13 +8869,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellsObj::createEnumeration() return nullptr; } -uno::Type SAL_CALL ScCellsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScCellsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XCell>::get(); } -sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellsObj::hasElements() { SolarMutexGuard aGuard; bool bHas = false; @@ -9184,14 +8997,13 @@ void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XEnumeration -sal_Bool SAL_CALL ScCellsEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellsEnumeration::hasMoreElements() { SolarMutexGuard aGuard; return !bAtEnd; } -uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScCellsEnumeration::nextElement() { SolarMutexGuard aGuard; if (pDocShell && !bAtEnd) @@ -9270,7 +9082,7 @@ ScCellRangeObj* ScCellFormatsObj::GetObjectByIndex_Impl(long nIndex) const // XIndexAccess -sal_Int32 SAL_CALL ScCellFormatsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScCellFormatsObj::getCount() { SolarMutexGuard aGuard; @@ -9292,8 +9104,6 @@ sal_Int32 SAL_CALL ScCellFormatsObj::getCount() throw(uno::RuntimeException, std } uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -9304,13 +9114,13 @@ uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScCellFormatsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScCellFormatsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XCellRange>::get(); } -sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellFormatsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); //! immer groesser 0 ?? @@ -9319,7 +9129,6 @@ sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException, s // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScCellFormatsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -9416,14 +9225,13 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XEnumeration -sal_Bool SAL_CALL ScCellFormatsEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellFormatsEnumeration::hasMoreElements() { SolarMutexGuard aGuard; return !bAtEnd; } -uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() { SolarMutexGuard aGuard; @@ -9646,7 +9454,7 @@ ScUniqueCellFormatsObj::ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange // XIndexAccess -sal_Int32 SAL_CALL ScUniqueCellFormatsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScUniqueCellFormatsObj::getCount() { SolarMutexGuard aGuard; @@ -9654,8 +9462,6 @@ sal_Int32 SAL_CALL ScUniqueCellFormatsObj::getCount() throw(uno::RuntimeExceptio } uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -9665,13 +9471,13 @@ uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScUniqueCellFormatsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScUniqueCellFormatsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XSheetCellRangeContainer>::get(); } -sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() { SolarMutexGuard aGuard; return ( aRangeLists.size() != 0 ); @@ -9680,7 +9486,6 @@ sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() throw(uno::RuntimeExcept // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScUniqueCellFormatsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -9719,14 +9524,13 @@ void ScUniqueCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHi // XEnumeration -sal_Bool SAL_CALL ScUniqueCellFormatsEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScUniqueCellFormatsEnumeration::hasMoreElements() { SolarMutexGuard aGuard; return static_cast<sal_uInt32>(nCurrentPosition) < aRangeLists.size(); } -uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement() throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement() { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 3b301d043372..eed7f3ecbdb2 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -95,7 +95,7 @@ namespace calc // for the cell) } - Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo( ) { return createPropertySetInfo( getInfoHelper() ) ; } @@ -124,7 +124,7 @@ namespace calc _rValue <<= xCellAddress->getCellAddress( ); } - Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes( ) throw (RuntimeException, std::exception) + Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes( ) { checkDisposed( ); checkInitialized( ); @@ -154,7 +154,7 @@ namespace calc return aTypes; } - sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) { checkDisposed( ); checkInitialized( ); @@ -170,7 +170,7 @@ namespace calc return false; } - Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) throw (IncompatibleTypesException, RuntimeException, std::exception) + Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) { checkDisposed( ); checkInitialized( ); @@ -255,7 +255,7 @@ namespace calc return aReturn; } - void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) throw (IncompatibleTypesException, NoSupportException, RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) { checkDisposed( ); checkInitialized( ); @@ -413,17 +413,17 @@ namespace calc } } - OUString SAL_CALL OCellValueBinding::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OCellValueBinding::getImplementationName( ) { return OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); } - sal_Bool SAL_CALL OCellValueBinding::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OCellValueBinding::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) { Sequence< OUString > aServices( m_bListPos ? 3 : 2 ); aServices[ 0 ] = "com.sun.star.table.CellValueBinding"; @@ -433,13 +433,13 @@ namespace calc return aServices; } - void SAL_CALL OCellValueBinding::addModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::addModifyListener( const Reference< XModifyListener >& _rxListener ) { if ( _rxListener.is() ) m_aModifyListeners.addInterface( _rxListener ); } - void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) { if ( _rxListener.is() ) m_aModifyListeners.removeInterface( _rxListener ); @@ -468,12 +468,12 @@ namespace calc } } - void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ ) { notifyModified(); } - void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent ) { Reference<XInterface> xCellInt( m_xCell, UNO_QUERY ); if ( xCellInt == aEvent.Source ) @@ -484,7 +484,7 @@ namespace calc } } - void SAL_CALL OCellValueBinding::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::initialize( const Sequence< Any >& _rArguments ) { if ( m_bInitialized ) throw Exception(); diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 22ca062f50fb..4527177dbb49 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -91,21 +91,21 @@ namespace calc DECLARE_XTYPEPROVIDER() // XValueBinding - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getSupportedValueTypes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) throw (css::form::binding::IncompatibleTypesException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& aValue ) throw (css::form::binding::IncompatibleTypesException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getSupportedValueTypes( ) override; + virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) override; + virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) override; + virtual void SAL_CALL setValue( const css::uno::Any& aValue ) override; // OComponentHelper/XComponent virtual void SAL_CALL disposing() 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 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; @@ -115,15 +115,15 @@ namespace calc virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const 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; // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) 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; private: void checkDisposed( ) const; diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 76b594b8d0b4..4e751b3f6672 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1020,7 +1020,6 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint } sal_Bool SAL_CALL ScChart2DataProvider::createDataSourcePossible( const uno::Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( ! m_pDocument ) @@ -1420,7 +1419,6 @@ void shrinkToDataRange(ScDocument* pDoc, vector<ScTokenRef>& rRefTokens) uno::Reference< chart2::data::XDataSource> SAL_CALL ScChart2DataProvider::createDataSource( const uno::Sequence< beans::PropertyValue >& aArguments ) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( ! m_pDocument ) @@ -1780,7 +1778,6 @@ std::pair<OUString, OUString> constructKey(const uno::Reference< chart2::data::X uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArguments( const uno::Reference< chart2::data::XDataSource >& xDataSource ) - throw (uno::RuntimeException, std::exception) { ::std::vector< beans::PropertyValue > aResult; bool bRowSourceDetected = false; @@ -2044,7 +2041,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum } sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( ! m_pDocument ) @@ -2060,8 +2056,6 @@ sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationP uno::Reference< chart2::data::XDataSequence > SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< chart2::data::XDataSequence > xResult; @@ -2087,13 +2081,11 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL uno::Reference<chart2::data::XDataSequence> SAL_CALL ScChart2DataProvider::createDataSequenceByValueArray( const OUString& /*aRole*/, const OUString& /*aRangeRepresentation*/ ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { return uno::Reference<chart2::data::XDataSequence>(); } uno::Reference< sheet::XRangeSelection > SAL_CALL ScChart2DataProvider::getRangeSelection() - throw (uno::RuntimeException, std::exception) { uno::Reference< sheet::XRangeSelection > xResult; @@ -2106,7 +2098,6 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL ScChart2DataProvider::getRange sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByFormulaTokensPossible( const Sequence<sheet::FormulaToken>& aTokens ) - throw (uno::RuntimeException, std::exception) { if (aTokens.getLength() <= 0) return false; @@ -2163,7 +2154,6 @@ sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByFormulaTokensPossibl Reference<chart2::data::XDataSequence> SAL_CALL ScChart2DataProvider::createDataSequenceByFormulaTokens( const Sequence<sheet::FormulaToken>& aTokens ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { Reference<chart2::data::XDataSequence> xResult; if (aTokens.getLength() <= 0) @@ -2233,7 +2223,6 @@ ScChart2DataProvider::createDataSequenceByFormulaTokens( // XRangeXMLConversion --------------------------------------------------- OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const OUString& sRangeRepresentation ) - throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { OUString aRet; if (!m_pDocument) @@ -2258,7 +2247,6 @@ OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const OUString& sRang } OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXMLRange ) - throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { if (!m_pDocument) { @@ -2302,7 +2290,7 @@ OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXM // DataProvider XPropertySet ------------------------------------------------- uno::Reference< beans::XPropertySetInfo> SAL_CALL -ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException, std::exception) +ScChart2DataProvider::getPropertySetInfo() { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = @@ -2312,10 +2300,6 @@ ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException, std::ex void SAL_CALL ScChart2DataProvider::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS ) { @@ -2328,8 +2312,6 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue( uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( const OUString& rPropertyName) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRet; if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS ) @@ -2347,8 +2329,6 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "Not yet implemented" ); } @@ -2356,8 +2336,6 @@ void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "Not yet implemented" ); } @@ -2365,8 +2343,6 @@ void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "Not yet implemented" ); } @@ -2374,8 +2350,6 @@ void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( void SAL_CALL ScChart2DataProvider::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/ ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "Not yet implemented" ); } @@ -2406,7 +2380,7 @@ void ScChart2DataSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint) } uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence> > SAL_CALL -ScChart2DataSource::getDataSequences() throw ( uno::RuntimeException, std::exception) +ScChart2DataSource::getDataSequences() { SolarMutexGuard aGuard; return comphelper::containerToSequence(m_aLabeledSequences); @@ -2964,7 +2938,6 @@ void ScChart2DataSequence::ExternalRefListener::addFileId(sal_uInt16 nFileId) } uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pDocument) @@ -2994,7 +2967,6 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() // XNumericalDataSequence -------------------------------------------------- uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pDocument) @@ -3020,7 +2992,6 @@ uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData() // XTextualDataSequence -------------------------------------------------- uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<OUString> aSeq; @@ -3053,7 +3024,6 @@ uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData() } OUString SAL_CALL ScChart2DataSequence::getSourceRangeRepresentation() - throw ( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aStr; @@ -3168,7 +3138,6 @@ private: } uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::data::LabelOrigin eOrigin) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pDocument) @@ -3223,7 +3192,6 @@ sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const ScAddress& rPos) } ::sal_Int32 SAL_CALL ScChart2DataSequence::getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; BuildDataCache(); @@ -3257,7 +3225,6 @@ sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const ScAddress& rPos) // XCloneable ================================================================ uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3281,7 +3248,6 @@ uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone() // XModifyBroadcaster ======================================================== void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { // like ScCellRangesBase::addModifyListener SolarMutexGuard aGuard; @@ -3321,7 +3287,6 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti } void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { // like ScCellRangesBase::removeModifyListener @@ -3364,7 +3329,7 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< // DataSequence XPropertySet ------------------------------------------------- uno::Reference< beans::XPropertySetInfo> SAL_CALL -ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException, std::exception) +ScChart2DataSequence::getPropertySetInfo() { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = @@ -3374,10 +3339,6 @@ ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException, std::ex void SAL_CALL ScChart2DataSequence::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( rPropertyName == SC_UNONAME_ROLE ) { @@ -3404,10 +3365,6 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue( } uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rPropertyName) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { uno::Any aRet; if ( rPropertyName == SC_UNONAME_ROLE ) @@ -3446,8 +3403,6 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rProper void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { // FIXME: real implementation OSL_FAIL( "Not yet implemented" ); @@ -3456,8 +3411,6 @@ void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { // FIXME: real implementation OSL_FAIL( "Not yet implemented" ); @@ -3466,8 +3419,6 @@ void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { // FIXME: real implementation OSL_FAIL( "Not yet implemented" ); @@ -3476,8 +3427,6 @@ void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { // FIXME: real implementation OSL_FAIL( "Not yet implemented" ); @@ -3489,7 +3438,6 @@ void ScChart2DataSequence::setDataChangedHint(bool b) } sal_Bool ScChart2DataSequence::switchToNext(sal_Bool bWrap) - throw (uno::RuntimeException, std::exception) { if(!mbTimeBased) return true; @@ -3523,7 +3471,6 @@ sal_Bool ScChart2DataSequence::switchToNext(sal_Bool bWrap) } void ScChart2DataSequence::setRange(sal_Int32 nStart, sal_Int32 nEnd) - throw (uno::RuntimeException, std::exception) { mnTimeBasedStart = nStart; mnTimeBasedEnd = nEnd; @@ -3531,7 +3478,6 @@ void ScChart2DataSequence::setRange(sal_Int32 nStart, sal_Int32 nEnd) } sal_Bool ScChart2DataSequence::setToPointInTime(sal_Int32 nPoint) - throw (uno::RuntimeException, std::exception) { if(nPoint > mnTimeBasedEnd - mnTimeBasedStart) return false; diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 124245fddd08..b2c5bec2b25c 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -166,8 +166,6 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, const awt::Rectangle& aRect, const uno::Sequence<table::CellRangeAddress>& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) - throw(css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -296,7 +294,6 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, } void SAL_CALL ScChartsObj::removeByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SdrOle2Obj* pObj = lcl_FindChartObj( pDocShell, nTab, aName ); @@ -317,7 +314,6 @@ void SAL_CALL ScChartsObj::removeByName( const OUString& aName ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableChartsEnumeration")); @@ -325,7 +321,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration( // XIndexAccess -sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScChartsObj::getCount() { SolarMutexGuard aGuard; sal_Int32 nCount = 0; @@ -354,8 +350,6 @@ sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException, std::exc } uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XTableChart> xChart(GetObjectByIndex_Impl(nIndex)); @@ -365,21 +359,19 @@ uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScChartsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScChartsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XTableChart>::get(); } -sal_Bool SAL_CALL ScChartsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScChartsObj::hasElements() { SolarMutexGuard aGuard; return getCount() != 0; } uno::Any SAL_CALL ScChartsObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XTableChart> xChart(GetObjectByName_Impl(aName)); @@ -389,7 +381,7 @@ uno::Any SAL_CALL ScChartsObj::getByName( const OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() { SolarMutexGuard aGuard; if (pDocShell) @@ -434,7 +426,6 @@ uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::Runti } sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ( lcl_FindChartObj( pDocShell, nTab, aName ) != nullptr ); @@ -557,7 +548,6 @@ void ScChartObj::Update_Impl( const ScRangeListRef& rRanges, bool bColHeaders, b } void ScChartObj::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception, std::exception) { switch ( nHandle ) { @@ -651,7 +641,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScChartObj, ScChartObj_Base, ScChartObj_PBase // XTableChart -sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() { SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; @@ -661,8 +651,6 @@ sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() throw(uno::RuntimeException, } void SAL_CALL ScChartObj::setHasColumnHeaders( sal_Bool bHasColumnHeaders ) - throw(uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; @@ -672,7 +660,7 @@ void SAL_CALL ScChartObj::setHasColumnHeaders( sal_Bool bHasColumnHeaders ) Update_Impl( xRanges, bHasColumnHeaders, bOldRowHeaders ); } -sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() { SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; @@ -682,7 +670,6 @@ sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() throw(uno::RuntimeException, st } void SAL_CALL ScChartObj::setHasRowHeaders( sal_Bool bHasRowHeaders ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; @@ -692,7 +679,7 @@ void SAL_CALL ScChartObj::setHasRowHeaders( sal_Bool bHasRowHeaders ) Update_Impl( xRanges, bOldColHeaders, bHasRowHeaders ); } -uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(uno::RuntimeException, std::exception) +uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() { SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; @@ -725,7 +712,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(un } void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress>& aRanges ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRangeListRef xOldRanges = new ScRangeList; @@ -752,7 +738,7 @@ void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress // XEmbeddedObjectSupplier -uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw(uno::RuntimeException, std::exception) +uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() { SolarMutexGuard aGuard; SdrOle2Obj* pObject = lcl_FindChartObj( pDocShell, nTab, aChartName ); @@ -767,13 +753,13 @@ uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw( // XNamed -OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScChartObj::getName() { SolarMutexGuard aGuard; return aChartName; } -void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) { SolarMutexGuard aGuard; throw uno::RuntimeException(); // name cannot be changed @@ -781,7 +767,7 @@ void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) throw(uno::Runt // XPropertySet -uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ) ; } diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index 58f6371bddcc..2e541a5912dd 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -331,7 +331,6 @@ void ScCondFormatsObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) } sal_Int32 ScCondFormatsObj::createByRange(const uno::Reference< sheet::XSheetCellRanges >& xRanges) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mpDocShell) @@ -362,7 +361,6 @@ sal_Int32 ScCondFormatsObj::createByRange(const uno::Reference< sheet::XSheetCel } void ScCondFormatsObj::removeByID(const sal_Int32 nID) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormatList* pFormatList = getCoreObject(); @@ -370,7 +368,6 @@ void ScCondFormatsObj::removeByID(const sal_Int32 nID) } uno::Sequence<uno::Reference<sheet::XConditionalFormat> > ScCondFormatsObj::getConditionalFormats() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormatList* pFormatList = getCoreObject(); @@ -386,7 +383,6 @@ uno::Sequence<uno::Reference<sheet::XConditionalFormat> > ScCondFormatsObj::getC } sal_Int32 ScCondFormatsObj::getLength() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormatList* pFormatList = getCoreObject(); @@ -469,7 +465,6 @@ ScDocShell* ScCondFormatObj::getDocShell() } void ScCondFormatObj::createEntry(const sal_Int32 nType, const sal_Int32 nPos) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormat* pFormat = getCoreObject(); @@ -508,7 +503,6 @@ void ScCondFormatObj::createEntry(const sal_Int32 nType, const sal_Int32 nPos) } void ScCondFormatObj::removeByIndex(const sal_Int32 nIndex) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (getCoreObject()->size() >= size_t(nIndex)) @@ -518,13 +512,11 @@ void ScCondFormatObj::removeByIndex(const sal_Int32 nIndex) } uno::Type ScCondFormatObj::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<beans::XPropertySet>::get(); } sal_Bool ScCondFormatObj::hasElements() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormat* pFormat = getCoreObject(); @@ -532,7 +524,6 @@ sal_Bool ScCondFormatObj::hasElements() } sal_Int32 ScCondFormatObj::getCount() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormat* pFormat = getCoreObject(); @@ -541,7 +532,6 @@ sal_Int32 ScCondFormatObj::getCount() } uno::Any ScCondFormatObj::getByIndex(sal_Int32 nIndex) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (getCoreObject()->size() <= size_t(nIndex)) @@ -554,7 +544,6 @@ uno::Any ScCondFormatObj::getByIndex(sal_Int32 nIndex) } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -564,9 +553,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondFormatObj::getPropertySet void SAL_CALL ScCondFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -605,8 +591,6 @@ void SAL_CALL ScCondFormatObj::setPropertyValue( } uno::Any SAL_CALL ScCondFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -637,32 +621,24 @@ uno::Any SAL_CALL ScCondFormatObj::getPropertyValue( const OUString& aPropertyNa void SAL_CALL ScCondFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } @@ -704,13 +680,11 @@ ScCondFormatEntry* ScConditionEntryObj::getCoreObject() } sal_Int32 ScConditionEntryObj::getType() - throw(uno::RuntimeException, std::exception) { return sheet::ConditionEntryType::CONDITION; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScConditionEntryObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( maPropSet.getPropertyMap() )); @@ -719,9 +693,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScConditionEntryObj::getPropert void SAL_CALL ScConditionEntryObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -783,8 +754,6 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue( } uno::Any SAL_CALL ScConditionEntryObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -834,32 +803,24 @@ uno::Any SAL_CALL ScConditionEntryObj::getPropertyValue( const OUString& aProper void SAL_CALL ScConditionEntryObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScConditionEntryObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScConditionEntryObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScConditionEntryObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } @@ -886,13 +847,11 @@ ScColorScaleFormat* ScColorScaleFormatObj::getCoreObject() } sal_Int32 ScColorScaleFormatObj::getType() - throw(uno::RuntimeException, std::exception) { return sheet::ConditionEntryType::COLORSCALE; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScColorScaleFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( maPropSet.getPropertyMap() )); @@ -939,9 +898,6 @@ void setColorScaleEntry(ScColorScaleEntry* pEntry, uno::Reference<sheet::XColorS void SAL_CALL ScColorScaleFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -977,8 +933,6 @@ void SAL_CALL ScColorScaleFormatObj::setPropertyValue( } uno::Any SAL_CALL ScColorScaleFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1010,32 +964,24 @@ uno::Any SAL_CALL ScColorScaleFormatObj::getPropertyValue( const OUString& aProp void SAL_CALL ScColorScaleFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScColorScaleFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScColorScaleFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScColorScaleFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } @@ -1061,20 +1007,17 @@ ScColorScaleEntry* ScColorScaleEntryObj::getCoreObject() } util::Color ScColorScaleEntryObj::getColor() - throw(uno::RuntimeException, std::exception) { Color aColor = getCoreObject()->GetColor(); return aColor.GetColor(); } void ScColorScaleEntryObj::setColor(util::Color aColor) - throw(uno::RuntimeException, std::exception) { getCoreObject()->SetColor(Color(aColor)); } sal_Int32 ScColorScaleEntryObj::getType() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); for (ColorScaleEntryTypeApiMap & rEntry : aColorScaleEntryTypeMap) @@ -1089,7 +1032,6 @@ sal_Int32 ScColorScaleEntryObj::getType() } void ScColorScaleEntryObj::setType(sal_Int32 nType) - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); for (ColorScaleEntryTypeApiMap & rEntry : aColorScaleEntryTypeMap) @@ -1104,7 +1046,6 @@ void ScColorScaleEntryObj::setType(sal_Int32 nType) } OUString ScColorScaleEntryObj::getFormula() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1120,7 +1061,6 @@ OUString ScColorScaleEntryObj::getFormula() } void ScColorScaleEntryObj::setFormula(const OUString& rFormula) - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1158,13 +1098,11 @@ ScDataBarFormat* ScDataBarFormatObj::getCoreObject() } sal_Int32 ScDataBarFormatObj::getType() - throw(uno::RuntimeException, std::exception) { return sheet::ConditionEntryType::DATABAR; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDataBarFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1211,9 +1149,6 @@ void setDataBarEntry(ScColorScaleEntry* pEntry, uno::Reference<sheet::XDataBarEn void SAL_CALL ScDataBarFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1342,8 +1277,6 @@ void SAL_CALL ScDataBarFormatObj::setPropertyValue( } uno::Any SAL_CALL ScDataBarFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1420,32 +1353,24 @@ uno::Any SAL_CALL ScDataBarFormatObj::getPropertyValue( const OUString& aPropert void SAL_CALL ScDataBarFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScDataBarFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScDataBarFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScDataBarFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } @@ -1474,7 +1399,6 @@ ScColorScaleEntry* ScDataBarEntryObj::getCoreObject() } sal_Int32 ScDataBarEntryObj::getType() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); for (DataBarEntryTypeApiMap & rEntry : aDataBarEntryTypeMap) @@ -1489,7 +1413,6 @@ sal_Int32 ScDataBarEntryObj::getType() } void ScDataBarEntryObj::setType(sal_Int32 nType) - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); for (DataBarEntryTypeApiMap & rEntry : aDataBarEntryTypeMap) @@ -1504,7 +1427,6 @@ void ScDataBarEntryObj::setType(sal_Int32 nType) } OUString ScDataBarEntryObj::getFormula() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1520,7 +1442,6 @@ OUString ScDataBarEntryObj::getFormula() } void ScDataBarEntryObj::setFormula(const OUString& rFormula) - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1558,13 +1479,11 @@ ScIconSetFormat* ScIconSetFormatObj::getCoreObject() } sal_Int32 ScIconSetFormatObj::getType() - throw(uno::RuntimeException, std::exception) { return sheet::ConditionEntryType::ICONSET; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScIconSetFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1612,9 +1531,6 @@ void setIconSetEntry(ScIconSetFormat* pFormat, uno::Reference<sheet::XIconSetEnt void SAL_CALL ScIconSetFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1687,8 +1603,6 @@ void SAL_CALL ScIconSetFormatObj::setPropertyValue( } uno::Any SAL_CALL ScIconSetFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1739,32 +1653,24 @@ uno::Any SAL_CALL ScIconSetFormatObj::getPropertyValue( const OUString& aPropert void SAL_CALL ScIconSetFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScIconSetFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScIconSetFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScIconSetFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } @@ -1790,7 +1696,6 @@ ScColorScaleEntry* ScIconSetEntryObj::getCoreObject() } sal_Int32 ScIconSetEntryObj::getType() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); // the first entry always is minimum @@ -1809,7 +1714,6 @@ sal_Int32 ScIconSetEntryObj::getType() } void ScIconSetEntryObj::setType(sal_Int32 nType) - throw(uno::RuntimeException, std::exception) { // first entry is always MIN if (mnPos == 0) @@ -1828,7 +1732,6 @@ void ScIconSetEntryObj::setType(sal_Int32 nType) } OUString ScIconSetEntryObj::getFormula() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1844,7 +1747,6 @@ OUString ScIconSetEntryObj::getFormula() } void ScIconSetEntryObj::setFormula(const OUString& rFormula) - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1881,13 +1783,11 @@ ScCondDateFormatEntry* ScCondDateFormatObj::getCoreObject() } sal_Int32 ScCondDateFormatObj::getType() - throw(uno::RuntimeException, std::exception) { return sheet::ConditionEntryType::DATE; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondDateFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1897,9 +1797,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondDateFormatObj::getPropert void SAL_CALL ScCondDateFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1943,8 +1840,6 @@ void SAL_CALL ScCondDateFormatObj::setPropertyValue( } uno::Any SAL_CALL ScCondDateFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1984,32 +1879,24 @@ uno::Any SAL_CALL ScCondDateFormatObj::getPropertyValue( const OUString& aProper void SAL_CALL ScCondDateFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondDateFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondDateFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondDateFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index b4a43981531c..0285c94ea007 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -110,7 +110,6 @@ void ScDocumentConfiguration::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocumentConfiguration::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -120,9 +119,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocumentConfiguration::getPro void SAL_CALL ScDocumentConfiguration::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -360,8 +356,6 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( } uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -527,19 +521,17 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration ) // XServiceInfo -OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDocumentConfiguration::getImplementationName() { return OUString( "ScDocumentConfiguration" ); } sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {"com.sun.star.comp.SpreadsheetSettings", "com.sun.star.document.Settings"}; diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index fd30a8a048c1..43a2a76e7a16 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -46,7 +46,7 @@ ScCellCursorObj::~ScCellCursorObj() { } -uno::Any SAL_CALL ScCellCursorObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScCellCursorObj::queryInterface( const uno::Type& rType ) { SC_QUERYINTERFACE( sheet::XSheetCellCursor ) SC_QUERYINTERFACE( sheet::XUsedAreaCursor ) @@ -65,7 +65,7 @@ void SAL_CALL ScCellCursorObj::release() throw() ScCellRangeObj::release(); } -uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -86,14 +86,14 @@ uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() throw(uno::Runtime return aTypes; } -uno::Sequence<sal_Int8> SAL_CALL ScCellCursorObj::getImplementationId() throw(uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> SAL_CALL ScCellCursorObj::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XSheetCellCursor -void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -119,7 +119,6 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeExcep } void SAL_CALL ScCellCursorObj::collapseToCurrentArray() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -151,7 +150,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray() }*/ } -void SAL_CALL ScCellCursorObj::collapseToMergedArea() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::collapseToMergedArea() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -169,7 +168,7 @@ void SAL_CALL ScCellCursorObj::collapseToMergedArea() throw(uno::RuntimeExceptio } } -void SAL_CALL ScCellCursorObj::expandToEntireColumns() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::expandToEntireColumns() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -182,7 +181,7 @@ void SAL_CALL ScCellCursorObj::expandToEntireColumns() throw(uno::RuntimeExcepti SetNewRange( aNewRange ); } -void SAL_CALL ScCellCursorObj::expandToEntireRows() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::expandToEntireRows() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -196,7 +195,6 @@ void SAL_CALL ScCellCursorObj::expandToEntireRows() throw(uno::RuntimeException, } void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( nColumns <= 0 || nRows <= 0 ) @@ -232,7 +230,6 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo // XUsedAreaCursor void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea(sal_Bool bExpand) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -260,7 +257,6 @@ void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea(sal_Bool bExpand) } void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -289,7 +285,7 @@ void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand ) // XCellCursor -void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::gotoStart() { // this is similar to collapseToCurrentRegion //! something like gotoEdge with 4 possible directions is needed @@ -317,7 +313,7 @@ void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException, std::exc } } -void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::gotoEnd() { // this is similar to collapseToCurrentRegion //! something like gotoEdge with 4 possible directions is needed @@ -345,7 +341,7 @@ void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException, std::excep } } -void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::gotoNext() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -367,7 +363,7 @@ void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException, std::exce SetNewRange( ScRange( nNewX, nNewY, nTab ) ); } -void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::gotoPrevious() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -390,7 +386,6 @@ void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException, std:: } void SAL_CALL ScCellCursorObj::gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -416,7 +411,6 @@ void SAL_CALL ScCellCursorObj::gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nR // XSheetCellRange uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellCursorObj::getSpreadsheet() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ScCellRangeObj::getSpreadsheet(); @@ -426,7 +420,6 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellCursorObj::getSpreadsheet() uno::Reference<table::XCell> SAL_CALL ScCellCursorObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellByPosition(nColumn,nRow); @@ -434,14 +427,13 @@ uno::Reference<table::XCell> SAL_CALL ScCellCursorObj::getCellByPosition( uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByPosition(nLeft,nTop,nRight,nBottom); } uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( - const OUString& rRange ) throw(uno::RuntimeException, std::exception) + const OUString& rRange ) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName(rRange); @@ -449,19 +441,17 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( // XServiceInfo -OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellCursorObj::getImplementationName() { return OUString( "ScCellCursorObj" ); } sal_Bool SAL_CALL ScCellCursorObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { // get all service names from cell range uno::Sequence<OUString> aParentSeq(ScCellRangeObj::getSupportedServiceNames()); diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index ecff34578f60..b5d0bccf66eb 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -350,7 +350,6 @@ ScDataPilotTableObj* ScDataPilotTablesObj::GetObjectByName_Impl(const OUString& } Reference<XDataPilotDescriptor> SAL_CALL ScDataPilotTablesObj::createDataPilotDescriptor() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -398,7 +397,6 @@ static OUString lcl_GetOriginalName(const Reference< XNamed >& rDim) void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName, const CellAddress& aOutputAddress, const Reference<XDataPilotDescriptor>& xDescriptor ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!xDescriptor.is()) return; @@ -437,7 +435,6 @@ void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName, } void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject( pDocShell, nTab, aName ); @@ -452,7 +449,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) // XEnumerationAccess -Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() throw(RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotTablesEnumeration")); @@ -460,7 +457,7 @@ Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() thr // XIndexAccess -sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() { SolarMutexGuard aGuard; if ( pDocShell ) @@ -487,7 +484,6 @@ sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException, std: } Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XDataPilotTable2> xTable(GetObjectByIndex_Impl(nIndex)); @@ -496,13 +492,13 @@ Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex ) return Any( xTable ); } -uno::Type SAL_CALL ScDataPilotTablesObj::getElementType() throw(RuntimeException, std::exception) +uno::Type SAL_CALL ScDataPilotTablesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<XDataPilotTable2>::get(); } -sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -511,7 +507,6 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException, st // XNameAccess Any SAL_CALL ScDataPilotTablesObj::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XDataPilotTable2> xTable(GetObjectByName_Impl(aName)); @@ -521,7 +516,6 @@ Any SAL_CALL ScDataPilotTablesObj::getByName( const OUString& aName ) } Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -559,7 +553,6 @@ Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames() } sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -597,7 +590,6 @@ ScDataPilotDescriptorBase::~ScDataPilotDescriptorBase() } Any SAL_CALL ScDataPilotDescriptorBase::queryInterface( const uno::Type& rType ) - throw(RuntimeException, std::exception) { SC_QUERYINTERFACE( XDataPilotDescriptor ) SC_QUERYINTERFACE( XPropertySet ) @@ -621,7 +613,6 @@ void SAL_CALL ScDataPilotDescriptorBase::release() throw() } Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes() - throw(RuntimeException, std::exception) { static Sequence< uno::Type > aTypes; if ( aTypes.getLength() == 0 ) @@ -639,7 +630,6 @@ Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes() } Sequence<sal_Int8> SAL_CALL ScDataPilotDescriptorBase::getImplementationId() - throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -657,7 +647,6 @@ void ScDataPilotDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XDataPilotDescriptor CellRangeAddress SAL_CALL ScDataPilotDescriptorBase::getSourceRange() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -671,7 +660,7 @@ CellRangeAddress SAL_CALL ScDataPilotDescriptorBase::getSourceRange() return aRet; } -void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress& aSourceRange ) throw(RuntimeException, std::exception) +void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress& aSourceRange ) { SolarMutexGuard aGuard; @@ -691,49 +680,42 @@ void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress& } Reference<XSheetFilterDescriptor> SAL_CALL ScDataPilotDescriptorBase::getFilterDescriptor() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFilterDescriptor( pDocShell, this ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getDataPilotFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getColumnFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_COLUMN ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getRowFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_ROW ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getPageFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_PAGE ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getDataFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_DATA ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getHiddenFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_HIDDEN ); @@ -741,7 +723,6 @@ Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getHiddenFields() // XPropertySet Reference< XPropertySetInfo > SAL_CALL ScDataPilotDescriptorBase::getPropertySetInfo( ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; static Reference<XPropertySetInfo> aRef = @@ -750,8 +731,6 @@ Reference< XPropertySetInfo > SAL_CALL ScDataPilotDescriptorBase::getPropertySet } void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, - WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObject = GetDPObject(); @@ -895,8 +874,6 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp } Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPropertyName ) - throw (UnknownPropertyException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; Any aRet; @@ -1007,32 +984,27 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope void SAL_CALL ScDataPilotDescriptorBase::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference<XPropertyChangeListener >& /* xListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotDescriptorBase::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference<XPropertyChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotDescriptorBase::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference<XVetoableChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotDescriptorBase::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference<XVetoableChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } // XDataPilotDataLayoutFieldSupplier Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutField() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if( ScDPObject* pDPObject = GetDPObject() ) @@ -1052,7 +1024,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutFi // XUnoTunnel sal_Int64 SAL_CALL ScDataPilotDescriptorBase::getSomething( - const Sequence<sal_Int8 >& rId ) throw(RuntimeException, std::exception) + const Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -1095,7 +1067,6 @@ ScDataPilotTableObj::~ScDataPilotTableObj() } Any SAL_CALL ScDataPilotTableObj::queryInterface( const uno::Type& rType ) - throw(RuntimeException, std::exception) { // since we manually do resolve the query for XDataPilotTable2 // we also need to do the same for XDataPilotTable @@ -1116,7 +1087,7 @@ void SAL_CALL ScDataPilotTableObj::release() throw() ScDataPilotDescriptorBase::release(); } -Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() throw(RuntimeException, std::exception) +Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() { static Sequence< uno::Type > aTypes; if ( aTypes.getLength() == 0 ) @@ -1137,7 +1108,6 @@ Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() throw(RuntimeExce } Sequence<sal_Int8> SAL_CALL ScDataPilotTableObj::getImplementationId() - throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1160,7 +1130,7 @@ void ScDataPilotTableObj::SetDPObject( ScDPObject* pDPObject ) // "rest of XDataPilotDescriptor" -OUString SAL_CALL ScDataPilotTableObj::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotTableObj::getName() { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1170,7 +1140,6 @@ OUString SAL_CALL ScDataPilotTableObj::getName() throw(RuntimeException, std::ex } void SAL_CALL ScDataPilotTableObj::setName( const OUString& aNewName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1186,7 +1155,7 @@ void SAL_CALL ScDataPilotTableObj::setName( const OUString& aNewName ) } } -OUString SAL_CALL ScDataPilotTableObj::getTag() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotTableObj::getTag() { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1196,7 +1165,6 @@ OUString SAL_CALL ScDataPilotTableObj::getTag() throw(RuntimeException, std::exc } void SAL_CALL ScDataPilotTableObj::setTag( const OUString& aNewTag ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1211,7 +1179,7 @@ void SAL_CALL ScDataPilotTableObj::setTag( const OUString& aNewTag ) // XDataPilotTable -CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() throw(RuntimeException, std::exception) +CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() { SolarMutexGuard aGuard; CellRangeAddress aRet; @@ -1228,7 +1196,7 @@ CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() throw(RuntimeExc return aRet; } -void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException, std::exception) +void SAL_CALL ScDataPilotTableObj::refresh() { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1240,7 +1208,6 @@ void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException, std::except } Sequence< Sequence<Any> > SAL_CALL ScDataPilotTableObj::getDrillDownData(const CellAddress& aAddr) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; Sequence< Sequence<Any> > aTabData; @@ -1254,7 +1221,6 @@ Sequence< Sequence<Any> > SAL_CALL ScDataPilotTableObj::getDrillDownData(const C } DataPilotTablePositionData SAL_CALL ScDataPilotTableObj::getPositionData(const CellAddress& aAddr) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; DataPilotTablePositionData aPosData; @@ -1268,7 +1234,6 @@ DataPilotTablePositionData SAL_CALL ScDataPilotTableObj::getPositionData(const C } void SAL_CALL ScDataPilotTableObj::insertDrillDownSheet(const CellAddress& aAddr) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = GetDPObject(); @@ -1285,7 +1250,6 @@ void SAL_CALL ScDataPilotTableObj::insertDrillDownSheet(const CellAddress& aAddr } CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRangeByType( sal_Int32 nType ) - throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nType < 0 || nType > DataPilotOutputRangeType::RESULT) @@ -1298,7 +1262,6 @@ CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRangeByType( sal_Int32 n } void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util::XModifyListener>& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1311,7 +1274,6 @@ void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util: } void SAL_CALL ScDataPilotTableObj::removeModifyListener( const uno::Reference<util::XModifyListener>& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1412,27 +1374,25 @@ void ScDataPilotDescriptor::SetDPObject( ScDPObject* pDPObject ) // "rest of XDataPilotDescriptor" -OUString SAL_CALL ScDataPilotDescriptor::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotDescriptor::getName() { SolarMutexGuard aGuard; return mpDPObject->GetName(); } void SAL_CALL ScDataPilotDescriptor::setName( const OUString& aNewName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; mpDPObject->SetName( aNewName ); } -OUString SAL_CALL ScDataPilotDescriptor::getTag() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotDescriptor::getTag() { SolarMutexGuard aGuard; return mpDPObject->GetTag(); } void SAL_CALL ScDataPilotDescriptor::setTag( const OUString& aNewTag ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; mpDPObject->SetTag( aNewTag ); @@ -1707,7 +1667,6 @@ ScDataPilotFieldObj* ScDataPilotFieldsObj::GetObjectByName_Impl(const OUString& // XEnumerationAccess Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotFieldsEnumeration")); @@ -1715,7 +1674,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration() // XIndexAccess -sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount() { SolarMutexGuard aGuard; // TODO @@ -1724,7 +1683,6 @@ sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount() throw(RuntimeException, std: } Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference< XPropertySet > xField( GetObjectByIndex_Impl( nIndex ) ); @@ -1733,20 +1691,19 @@ Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex ) return Any( xField ); } -uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType() throw(RuntimeException, std::exception) +uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<XPropertySet>::get(); } -sal_Bool SAL_CALL ScDataPilotFieldsObj::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotFieldsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } Any SAL_CALL ScDataPilotFieldsObj::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XPropertySet> xField(GetObjectByName_Impl(aName)); @@ -1756,7 +1713,6 @@ Any SAL_CALL ScDataPilotFieldsObj::getByName( const OUString& aName ) } Sequence<OUString> SAL_CALL ScDataPilotFieldsObj::getElementNames() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; // TODO @@ -1780,7 +1736,6 @@ Sequence<OUString> SAL_CALL ScDataPilotFieldsObj::getElementNames() } sal_Bool SAL_CALL ScDataPilotFieldsObj::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1809,7 +1764,6 @@ ScDataPilotFieldObj::~ScDataPilotFieldObj() // XNamed OUString SAL_CALL ScDataPilotFieldObj::getName() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aName; @@ -1829,7 +1783,6 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() } void SAL_CALL ScDataPilotFieldObj::setName(const OUString& rName) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = nullptr; @@ -1844,7 +1797,6 @@ void SAL_CALL ScDataPilotFieldObj::setName(const OUString& rName) // XPropertySet Reference<XPropertySetInfo> SAL_CALL ScDataPilotFieldObj::getPropertySetInfo() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; static Reference<XPropertySetInfo> aRef( @@ -1853,9 +1805,6 @@ Reference<XPropertySetInfo> SAL_CALL ScDataPilotFieldObj::getPropertySetInfo() } void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aPropertyName == SC_UNONAME_FUNCTION ) @@ -1973,8 +1922,6 @@ void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyNa } Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyName ) - throw (UnknownPropertyException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; Any aRet; @@ -2068,7 +2015,6 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam // XDatePilotField Reference<XIndexAccess> SAL_CALL ScDataPilotFieldObj::getItems() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxItems.is()) @@ -2563,8 +2509,6 @@ bool ScDataPilotFieldObj::HasString(const Sequence< OUString >& rItems, const OU // XDataPilotFieldGrouping Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( const Sequence< OUString >& rItems ) - throw (RuntimeException, IllegalArgumentException, - std::exception) { SolarMutexGuard aGuard; @@ -2733,8 +2677,6 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons } Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( const DataPilotFieldGroupInfo& rInfo ) - throw (RuntimeException, IllegalArgumentException, - std::exception) { SolarMutexGuard aGuard; using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy; @@ -2900,7 +2842,6 @@ ScDataPilotFieldGroupsObj::~ScDataPilotFieldGroupsObj() // XNameAccess Any SAL_CALL ScDataPilotFieldGroupsObj::getByName( const OUString& rName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if( implFindByName( rName ) == maGroups.end() ) @@ -2908,7 +2849,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByName( const OUString& rName ) return Any( Reference< XNameAccess >( new ScDataPilotFieldGroupObj( *this, rName ) ) ); } -Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames() throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames() { SolarMutexGuard aGuard; Sequence< OUString > aSeq; @@ -2922,7 +2863,7 @@ Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames() throw return aSeq; } -sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName ) { SolarMutexGuard aGuard; return implFindByName( rName ) != maGroups.end(); @@ -2931,7 +2872,6 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName ) // XNameReplace void SAL_CALL ScDataPilotFieldGroupsObj::replaceByName( const OUString& rName, const Any& rElement ) - throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2954,7 +2894,6 @@ void SAL_CALL ScDataPilotFieldGroupsObj::replaceByName( const OUString& rName, c // XNameContainer void SAL_CALL ScDataPilotFieldGroupsObj::insertByName( const OUString& rName, const Any& rElement ) - throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2978,7 +2917,6 @@ void SAL_CALL ScDataPilotFieldGroupsObj::insertByName( const OUString& rName, co } void SAL_CALL ScDataPilotFieldGroupsObj::removeByName( const OUString& rName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2994,14 +2932,13 @@ void SAL_CALL ScDataPilotFieldGroupsObj::removeByName( const OUString& rName ) // XIndexAccess -sal_Int32 SAL_CALL ScDataPilotFieldGroupsObj::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDataPilotFieldGroupsObj::getCount() { SolarMutexGuard aGuard; return static_cast< sal_Int32 >( maGroups.size() ); } Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if ((nIndex < 0) || (nIndex >= static_cast< sal_Int32 >( maGroups.size() ))) @@ -3011,7 +2948,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex ) // XEnumerationAccess -Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() throw(RuntimeException, std::exception) +Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() { SolarMutexGuard aGuard; return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) ); @@ -3019,13 +2956,13 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() // XElementAccess -uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType() throw(RuntimeException, std::exception) +uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<XNameAccess>::get(); } -sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() { SolarMutexGuard aGuard; return !maGroups.empty(); @@ -3033,7 +2970,7 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeExceptio // implementation -ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName ) throw(RuntimeException) +ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName ) { SolarMutexGuard aGuard; ScFieldGroups::iterator aIt = implFindByName( rName ); @@ -3042,7 +2979,7 @@ ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName ) return *aIt; } -void ScDataPilotFieldGroupsObj::renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) throw(RuntimeException) +void ScDataPilotFieldGroupsObj::renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) { SolarMutexGuard aGuard; ScFieldGroups::iterator aOldIt = implFindByName( rOldName ); @@ -3092,7 +3029,6 @@ ScDataPilotFieldGroupObj::~ScDataPilotFieldGroupObj() // XNameAccess Any SAL_CALL ScDataPilotFieldGroupObj::getByName( const OUString& rName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers; @@ -3102,13 +3038,13 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByName( const OUString& rName ) return Any( Reference< XNamed >( new ScDataPilotFieldGroupItemObj( *this, *aIt ) ) ); } -Sequence< OUString > SAL_CALL ScDataPilotFieldGroupObj::getElementNames() throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ScDataPilotFieldGroupObj::getElementNames() { SolarMutexGuard aGuard; return ::comphelper::containerToSequence( mrParent.getFieldGroup( maGroupName ).maMembers ); } -sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName ) { SolarMutexGuard aGuard; ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers; @@ -3118,7 +3054,6 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName ) t // XNameReplace void SAL_CALL ScDataPilotFieldGroupObj::replaceByName( const OUString& rName, const Any& rElement ) - throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3144,7 +3079,6 @@ void SAL_CALL ScDataPilotFieldGroupObj::replaceByName( const OUString& rName, co // XNameContainer void SAL_CALL ScDataPilotFieldGroupObj::insertByName( const OUString& rName, const Any& /*rElement*/ ) - throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3161,7 +3095,6 @@ void SAL_CALL ScDataPilotFieldGroupObj::insertByName( const OUString& rName, con } void SAL_CALL ScDataPilotFieldGroupObj::removeByName( const OUString& rName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3177,14 +3110,13 @@ void SAL_CALL ScDataPilotFieldGroupObj::removeByName( const OUString& rName ) // XIndexAccess -sal_Int32 SAL_CALL ScDataPilotFieldGroupObj::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDataPilotFieldGroupObj::getCount() { SolarMutexGuard aGuard; return static_cast< sal_Int32 >( mrParent.getFieldGroup( maGroupName ).maMembers.size() ); } Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers; @@ -3195,7 +3127,7 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex ) // XEnumerationAccess -Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() throw(RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() { SolarMutexGuard aGuard; return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) ); @@ -3203,13 +3135,13 @@ Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() // XElementAccess -uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType() throw(RuntimeException, std::exception) +uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<XNamed>::get(); } -sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() { SolarMutexGuard aGuard; return !mrParent.getFieldGroup( maGroupName ).maMembers.empty(); @@ -3217,13 +3149,13 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException // XNamed -OUString SAL_CALL ScDataPilotFieldGroupObj::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotFieldGroupObj::getName() { SolarMutexGuard aGuard; return maGroupName; } -void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName ) throw(RuntimeException, std::exception) +void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName ) { SolarMutexGuard aGuard; mrParent.renameFieldGroup( maGroupName, rName ); @@ -3245,13 +3177,13 @@ ScDataPilotFieldGroupItemObj::~ScDataPilotFieldGroupItemObj() // XNamed -OUString SAL_CALL ScDataPilotFieldGroupItemObj::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotFieldGroupItemObj::getName() { SolarMutexGuard aGuard; return maName; } -void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName ) throw(RuntimeException, std::exception) +void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName ) { SolarMutexGuard aGuard; mrParent.replaceByName( maName, Any( rName ) ); @@ -3279,7 +3211,6 @@ ScDataPilotItemObj* ScDataPilotItemsObj::GetObjectByIndex_Impl( sal_Int32 nIndex // XNameAccess Any SAL_CALL ScDataPilotItemsObj::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XNameAccess> xMembers = GetMembers(); @@ -3303,7 +3234,6 @@ Any SAL_CALL ScDataPilotItemsObj::getByName( const OUString& aName ) } Sequence<OUString> SAL_CALL ScDataPilotItemsObj::getElementNames() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; Sequence< OUString > aSeq; @@ -3313,7 +3243,6 @@ Sequence<OUString> SAL_CALL ScDataPilotItemsObj::getElementNames() } sal_Bool SAL_CALL ScDataPilotItemsObj::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bFound = false; @@ -3338,7 +3267,6 @@ sal_Bool SAL_CALL ScDataPilotItemsObj::hasByName( const OUString& aName ) // XEnumerationAccess Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotItemsEnumeration")); @@ -3346,14 +3274,13 @@ Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration() // XIndexAccess -sal_Int32 SAL_CALL ScDataPilotItemsObj::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDataPilotItemsObj::getCount() { SolarMutexGuard aGuard; return GetMemberCount(); } Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference< XPropertySet > xItem( GetObjectByIndex_Impl( nIndex ) ); @@ -3362,13 +3289,13 @@ Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex ) return Any( xItem ); } -uno::Type SAL_CALL ScDataPilotItemsObj::getElementType() throw(RuntimeException, std::exception) +uno::Type SAL_CALL ScDataPilotItemsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<XPropertySet>::get(); } -sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -3386,7 +3313,7 @@ ScDataPilotItemObj::~ScDataPilotItemObj() } // XNamed -OUString SAL_CALL ScDataPilotItemObj::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotItemObj::getName() { SolarMutexGuard aGuard; OUString sRet; @@ -3405,14 +3332,12 @@ OUString SAL_CALL ScDataPilotItemObj::getName() throw(RuntimeException, std::exc } void SAL_CALL ScDataPilotItemObj::setName( const OUString& /* aName */ ) - throw(RuntimeException, std::exception) { } // XPropertySet Reference< XPropertySetInfo > SAL_CALL ScDataPilotItemObj::getPropertySetInfo( ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; static Reference<XPropertySetInfo> aRef = @@ -3421,9 +3346,6 @@ Reference< XPropertySetInfo > } void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = nullptr; @@ -3475,8 +3397,6 @@ void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyNam } Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName ) - throw (UnknownPropertyException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; Any aRet; @@ -3534,25 +3454,21 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName void SAL_CALL ScDataPilotItemObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* xListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotItemObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotItemObj::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotItemObj::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index a955e551cb1d..a2a282e56c59 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -458,7 +458,7 @@ ScSubTotalFieldObj::~ScSubTotalFieldObj() // XSubTotalField -sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn() { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -467,7 +467,7 @@ sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn() throw(uno::RuntimeExcept return aParam.nField[nPos]; } -void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn ) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -479,7 +479,6 @@ void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn ) throw } uno::Sequence<sheet::SubTotalColumn> SAL_CALL ScSubTotalFieldObj::getSubTotalColumns() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -499,7 +498,6 @@ uno::Sequence<sheet::SubTotalColumn> SAL_CALL ScSubTotalFieldObj::getSubTotalCol void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns( const uno::Sequence<sheet::SubTotalColumn>& aSubTotalColumns ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -551,7 +549,7 @@ ScSubTotalFieldObj* ScSubTotalDescriptorBase::GetObjectByIndex_Impl(sal_uInt16 n return nullptr; } -void SAL_CALL ScSubTotalDescriptorBase::clear() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScSubTotalDescriptorBase::clear() { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -567,7 +565,7 @@ void SAL_CALL ScSubTotalDescriptorBase::clear() throw(uno::RuntimeException, std void SAL_CALL ScSubTotalDescriptorBase::addNew( const uno::Sequence<sheet::SubTotalColumn>& aSubTotalColumns, - sal_Int32 nGroupColumn ) throw(uno::RuntimeException, std::exception) + sal_Int32 nGroupColumn ) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -618,7 +616,6 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew( // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); @@ -626,7 +623,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::creat // XIndexAccess -sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount() { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -639,8 +636,6 @@ sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount() throw(uno::RuntimeExcept } uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XSubTotalField> xField(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -650,13 +645,13 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XSubTotalField>::get(); } -sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -665,7 +660,6 @@ sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() throw(uno::RuntimeExce // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSubTotalDescriptorBase::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -675,9 +669,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSubTotalDescriptorBase::getPr void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -716,8 +707,6 @@ void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( } uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -752,7 +741,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSubTotalDescriptorBase ) // XUnoTunnel sal_Int64 SAL_CALL ScSubTotalDescriptorBase::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -841,21 +830,19 @@ void ScConsolidationDescriptor::SetParam( const ScConsolidateParam& rNew ) // XConsolidationDescriptor -sheet::GeneralFunction SAL_CALL ScConsolidationDescriptor::getFunction() throw(uno::RuntimeException, std::exception) +sheet::GeneralFunction SAL_CALL ScConsolidationDescriptor::getFunction() { SolarMutexGuard aGuard; return ScDataUnoConversion::SubTotalToGeneral(aParam.eFunction); } void SAL_CALL ScConsolidationDescriptor::setFunction( sheet::GeneralFunction nFunction ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aParam.eFunction = ScDPUtil::toSubTotalFunc(nFunction); } uno::Sequence<table::CellRangeAddress> SAL_CALL ScConsolidationDescriptor::getSources() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = aParam.nDataAreaCount; @@ -882,7 +869,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScConsolidationDescriptor::getSo void SAL_CALL ScConsolidationDescriptor::setSources( const uno::Sequence<table::CellRangeAddress>& aSources ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = (sal_uInt16)aSources.getLength(); @@ -906,7 +892,6 @@ void SAL_CALL ScConsolidationDescriptor::setSources( } table::CellAddress SAL_CALL ScConsolidationDescriptor::getStartOutputPosition() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; table::CellAddress aPos; @@ -918,7 +903,6 @@ table::CellAddress SAL_CALL ScConsolidationDescriptor::getStartOutputPosition() void SAL_CALL ScConsolidationDescriptor::setStartOutputPosition( const table::CellAddress& aStartOutputPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aParam.nCol = (SCCOL)aStartOutputPosition.Column; @@ -926,40 +910,37 @@ void SAL_CALL ScConsolidationDescriptor::setStartOutputPosition( aParam.nTab = aStartOutputPosition.Sheet; } -sal_Bool SAL_CALL ScConsolidationDescriptor::getUseColumnHeaders() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScConsolidationDescriptor::getUseColumnHeaders() { SolarMutexGuard aGuard; return aParam.bByCol; } void SAL_CALL ScConsolidationDescriptor::setUseColumnHeaders( sal_Bool bUseColumnHeaders ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aParam.bByCol = bUseColumnHeaders; } -sal_Bool SAL_CALL ScConsolidationDescriptor::getUseRowHeaders() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScConsolidationDescriptor::getUseRowHeaders() { SolarMutexGuard aGuard; return aParam.bByRow; } void SAL_CALL ScConsolidationDescriptor::setUseRowHeaders( sal_Bool bUseRowHeaders ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aParam.bByRow = bUseRowHeaders; } -sal_Bool SAL_CALL ScConsolidationDescriptor::getInsertLinks() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScConsolidationDescriptor::getInsertLinks() { SolarMutexGuard aGuard; return aParam.bReferenceData; } void SAL_CALL ScConsolidationDescriptor::setInsertLinks( sal_Bool bInsertLinks ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aParam.bReferenceData = bInsertLinks; @@ -992,7 +973,6 @@ void ScFilterDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XSheetFilterDescriptor and XSheetFilterDescriptor2 uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilterFields() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1209,7 +1189,6 @@ void fillQueryParam( } uno::Sequence<sheet::TableFilterField2> SAL_CALL ScFilterDescriptorBase::getFilterFields2() -throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1260,7 +1239,6 @@ throw(uno::RuntimeException, std::exception) } uno::Sequence<sheet::TableFilterField3> SAL_CALL ScFilterDescriptorBase::getFilterFields3() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1321,7 +1299,6 @@ uno::Sequence<sheet::TableFilterField3> SAL_CALL ScFilterDescriptorBase::getFilt void SAL_CALL ScFilterDescriptorBase::setFilterFields( const uno::Sequence<sheet::TableFilterField>& aFilterFields ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1387,7 +1364,6 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields( void SAL_CALL ScFilterDescriptorBase::setFilterFields2( const uno::Sequence<sheet::TableFilterField2>& aFilterFields ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1398,7 +1374,6 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2( void SAL_CALL ScFilterDescriptorBase::setFilterFields3( const uno::Sequence<sheet::TableFilterField3>& aFilterFields ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1412,7 +1387,6 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields3( // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFilterDescriptorBase::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1422,9 +1396,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFilterDescriptorBase::getProp void SAL_CALL ScFilterDescriptorBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1469,8 +1440,6 @@ void SAL_CALL ScFilterDescriptorBase::setPropertyValue( } uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1667,14 +1636,13 @@ ScDBData* ScDatabaseRangeObj::GetDBData_Impl() const // XNamed -OUString SAL_CALL ScDatabaseRangeObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDatabaseRangeObj::getName() { SolarMutexGuard aGuard; return aName; } void SAL_CALL ScDatabaseRangeObj::setName( const OUString& aNewName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -1688,7 +1656,7 @@ void SAL_CALL ScDatabaseRangeObj::setName( const OUString& aNewName ) // XDatabaseRange -table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() throw(uno::RuntimeException, std::exception) +table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() { SolarMutexGuard aGuard; table::CellRangeAddress aAddress; @@ -1707,7 +1675,6 @@ table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() throw(uno::Ru } void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aDataArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDBData* pData = GetDBData_Impl(); @@ -1723,7 +1690,6 @@ void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aD } uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getSortDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSortParam aParam; @@ -1795,7 +1761,6 @@ void ScDatabaseRangeObj::SetQueryParam(const ScQueryParam& rQueryParam) } uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScDatabaseRangeObj::getFilterDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScRangeFilterDescriptor(pDocShell, this); @@ -1855,14 +1820,12 @@ void ScDatabaseRangeObj::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam) } uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScDatabaseRangeObj::getSubTotalDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScRangeSubTotalDescriptor(this); } uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getImportDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScImportParam aParam; @@ -1877,7 +1840,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getImportDescri // XRefreshable -void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDatabaseRangeObj::refresh() { SolarMutexGuard aGuard; ScDBData* pData = GetDBData_Impl(); @@ -1906,7 +1869,6 @@ void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException, std::ex void SAL_CALL ScDatabaseRangeObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRefreshListeners.push_back( uno::Reference<util::XRefreshListener>( xListener )); @@ -1918,7 +1880,6 @@ void SAL_CALL ScDatabaseRangeObj::addRefreshListener( void SAL_CALL ScDatabaseRangeObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = aRefreshListeners.size(); @@ -1946,7 +1907,6 @@ void ScDatabaseRangeObj::Refreshed_Impl() // XCellRangeSource uno::Reference<table::XCellRange> SAL_CALL ScDatabaseRangeObj::getReferredCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aRange; @@ -1967,7 +1927,6 @@ uno::Reference<table::XCellRange> SAL_CALL ScDatabaseRangeObj::getReferredCells( // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDatabaseRangeObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1977,9 +1936,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDatabaseRangeObj::getProperty void SAL_CALL ScDatabaseRangeObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDBData* pData = GetDBData_Impl(); @@ -2073,8 +2029,6 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue( } uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -2157,19 +2111,17 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropert SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj ) // XServiceInfo -OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() { return OUString( "ScDatabaseRangeObj" ); } sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {"com.sun.star.sheet.DatabaseRange", SCLINKTARGET_SERVICE}; @@ -2230,7 +2182,6 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const OUString& aN void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, const table::CellRangeAddress& aRange ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -2247,7 +2198,6 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, } void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -2263,7 +2213,6 @@ void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); @@ -2271,7 +2220,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnum // XIndexAccess -sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() { SolarMutexGuard aGuard; @@ -2287,8 +2236,6 @@ sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() throw(uno::RuntimeException, } uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nIndex < 0) @@ -2301,13 +2248,13 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScDatabaseRangesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScDatabaseRangesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XDatabaseRange>::get(); } -sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -2316,8 +2263,6 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException // XNameAccess uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XDatabaseRange> xRange(GetObjectByName_Impl(aName)); @@ -2329,7 +2274,6 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2353,7 +2297,6 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() } sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2395,8 +2338,6 @@ void ScUnnamedDatabaseRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XUnnamedDatabaseRanges void ScUnnamedDatabaseRangesObj::setByTable( const table::CellRangeAddress& aRange ) - throw( uno::RuntimeException, - lang::IndexOutOfBoundsException, std::exception ) { SolarMutexGuard aGuard; bool bDone = false; @@ -2416,9 +2357,6 @@ void ScUnnamedDatabaseRangesObj::setByTable( const table::CellRangeAddress& aRan } uno::Any ScUnnamedDatabaseRangesObj::getByTable( sal_Int32 nTab ) - throw(uno::RuntimeException, - lang::IndexOutOfBoundsException, - container::NoSuchElementException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -2437,8 +2375,6 @@ uno::Any ScUnnamedDatabaseRangesObj::getByTable( sal_Int32 nTab ) } sal_Bool ScUnnamedDatabaseRangesObj::hasByTable( sal_Int32 nTab ) - throw (uno::RuntimeException, - lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index f7a6ba2888e3..e245b9dd5c27 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -108,7 +108,6 @@ void ScDocDefaultsObj::ItemsChanged() // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocDefaultsObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo( @@ -118,9 +117,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocDefaultsObj::getPropertySe void SAL_CALL ScDocDefaultsObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -201,8 +197,6 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue( } uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { // use pool default if set @@ -251,7 +245,6 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocDefaultsObj ) // XPropertyState beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -286,7 +279,6 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates( const uno::Sequence<OUString>& aPropertyNames ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { // the simple way: call getPropertyState @@ -300,7 +292,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates } void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -321,8 +312,6 @@ void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyN } uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { // always use static default diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index 24957eecc4a8..885cf33de385 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -91,7 +91,6 @@ void ScDispatchProviderInterceptor::Notify( SfxBroadcaster&, const SfxHint& rHin uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDispatch( const util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -116,7 +115,6 @@ uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDi uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL ScDispatchProviderInterceptor::queryDispatches( const uno::Sequence<frame::DispatchDescriptor>& aDescripts ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -135,7 +133,6 @@ uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL uno::Reference<frame::XDispatchProvider> SAL_CALL ScDispatchProviderInterceptor::getSlaveDispatchProvider() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return m_xSlaveDispatcher; @@ -143,7 +140,6 @@ uno::Reference<frame::XDispatchProvider> SAL_CALL void SAL_CALL ScDispatchProviderInterceptor::setSlaveDispatchProvider( const uno::Reference<frame::XDispatchProvider>& xNewDispatchProvider ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; m_xSlaveDispatcher.set(xNewDispatchProvider); @@ -151,7 +147,6 @@ void SAL_CALL ScDispatchProviderInterceptor::setSlaveDispatchProvider( uno::Reference<frame::XDispatchProvider> SAL_CALL ScDispatchProviderInterceptor::getMasterDispatchProvider() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return m_xMasterDispatcher; @@ -159,7 +154,6 @@ uno::Reference<frame::XDispatchProvider> SAL_CALL void SAL_CALL ScDispatchProviderInterceptor::setMasterDispatchProvider( const uno::Reference<frame::XDispatchProvider>& xNewSupplier ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; m_xMasterDispatcher.set(xNewSupplier); @@ -168,7 +162,6 @@ void SAL_CALL ScDispatchProviderInterceptor::setMasterDispatchProvider( // XEventListener void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject& /* Source */ ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -216,7 +209,6 @@ void ScDispatch::Notify( SfxBroadcaster&, const SfxHint& rHint ) void SAL_CALL ScDispatch::dispatch( const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& aArgs ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -264,7 +256,6 @@ static void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImport void SAL_CALL ScDispatch::addStatusListener( const uno::Reference<frame::XStatusListener>& xListener, const util::URL& aURL) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -302,7 +293,6 @@ void SAL_CALL ScDispatch::addStatusListener( void SAL_CALL ScDispatch::removeStatusListener( const uno::Reference<frame::XStatusListener>& xListener, const util::URL& aURL ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -332,7 +322,6 @@ void SAL_CALL ScDispatch::removeStatusListener( // XSelectionChangeListener void SAL_CALL ScDispatch::selectionChanged( const css::lang::EventObject& /* aEvent */ ) - throw (css::uno::RuntimeException, std::exception) { // currently only called for URL cURLDocDataSource @@ -367,7 +356,6 @@ void SAL_CALL ScDispatch::selectionChanged( const css::lang::EventObject& /* aEv // XEventListener void SAL_CALL ScDispatch::disposing( const css::lang::EventObject& rSource ) - throw (css::uno::RuntimeException, std::exception) { uno::Reference<view::XSelectionSupplier> xSupplier(rSource.Source, uno::UNO_QUERY); xSupplier->removeSelectionChangeListener(this); diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 9db139b88478..757cd8e71a07 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1001,7 +1001,6 @@ void ScModelObj::initializeForTiledRendering(const css::uno::Sequence<css::beans } uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( sheet::XSpreadsheetDocument ) SC_QUERYINTERFACE( document::XActionLockable ) @@ -1047,7 +1046,7 @@ void SAL_CALL ScModelObj::release() throw() SfxBaseModel::release(); } -uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -1101,7 +1100,6 @@ uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeExcep } uno::Sequence<sal_Int8> SAL_CALL ScModelObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1156,7 +1154,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) // XSpreadsheetDocument -uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets() throw(uno::RuntimeException, std::exception) +uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets() { SolarMutexGuard aGuard; if (pDocShell) @@ -1167,7 +1165,6 @@ uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets() throw(uno: // XStyleFamiliesSupplier uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getStyleFamilies() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -1458,7 +1455,6 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, sal_Int32 SAL_CALL ScModelObj::getRendererCount(const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -1509,9 +1505,6 @@ static sal_Int32 lcl_GetRendererNum( sal_Int32 nSelRenderer, const OUString& rPa uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 nSelRenderer, const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -1619,9 +1612,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions ) - throw(lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -1817,7 +1807,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec // XLinkTargetSupplier -uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() throw(uno::RuntimeException, std::exception) +uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() { SolarMutexGuard aGuard; if (pDocShell) @@ -1827,7 +1817,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() throw(uno // XActionLockable -sal_Bool SAL_CALL ScModelObj::isActionLocked() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScModelObj::isActionLocked() { SolarMutexGuard aGuard; bool bLocked = false; @@ -1836,28 +1826,28 @@ sal_Bool SAL_CALL ScModelObj::isActionLocked() throw(uno::RuntimeException, std: return bLocked; } -void SAL_CALL ScModelObj::addActionLock() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::addActionLock() { SolarMutexGuard aGuard; if (pDocShell) pDocShell->LockDocument(); } -void SAL_CALL ScModelObj::removeActionLock() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::removeActionLock() { SolarMutexGuard aGuard; if (pDocShell) pDocShell->UnlockDocument(); } -void SAL_CALL ScModelObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::setActionLocks( sal_Int16 nLock ) { SolarMutexGuard aGuard; if (pDocShell) pDocShell->SetLockCount(nLock); } -sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL ScModelObj::resetActionLocks() { SolarMutexGuard aGuard; sal_uInt16 nRet = 0; @@ -1869,7 +1859,7 @@ sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException, s return nRet; } -void SAL_CALL ScModelObj::lockControllers() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::lockControllers() { SolarMutexGuard aGuard; SfxBaseModel::lockControllers(); @@ -1877,7 +1867,7 @@ void SAL_CALL ScModelObj::lockControllers() throw (css::uno::RuntimeException, s pDocShell->LockPaint(); } -void SAL_CALL ScModelObj::unlockControllers() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::unlockControllers() { SolarMutexGuard aGuard; if (hasControllersLocked()) @@ -1890,7 +1880,7 @@ void SAL_CALL ScModelObj::unlockControllers() throw (css::uno::RuntimeException, // XCalculate -void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::calculate() { SolarMutexGuard aGuard; if (pDocShell) @@ -1901,7 +1891,7 @@ void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException, std::exceptio } } -void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::calculateAll() { SolarMutexGuard aGuard; if (pDocShell) @@ -1912,7 +1902,7 @@ void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException, std::excep } } -sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() { SolarMutexGuard aGuard; if (pDocShell) @@ -1923,7 +1913,6 @@ sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::Runtime } void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabledIn ) - throw(uno::RuntimeException, std::exception) { bool bEnabled(bEnabledIn); SolarMutexGuard aGuard; @@ -1944,7 +1933,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabledIn ) // XProtectable -void SAL_CALL ScModelObj::protect( const OUString& aPassword ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::protect( const OUString& aPassword ) { SolarMutexGuard aGuard; // #i108245# if already protected, don't change anything @@ -1955,7 +1944,6 @@ void SAL_CALL ScModelObj::protect( const OUString& aPassword ) throw(uno::Runtim } void SAL_CALL ScModelObj::unprotect( const OUString& aPassword ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -1966,7 +1954,7 @@ void SAL_CALL ScModelObj::unprotect( const OUString& aPassword ) } } -sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScModelObj::isProtected() { SolarMutexGuard aGuard; if (pDocShell) @@ -1978,7 +1966,7 @@ sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException, std::ex // XDrawPagesSupplier -uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() throw(uno::RuntimeException, std::exception) +uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() { SolarMutexGuard aGuard; if (pDocShell) @@ -1994,8 +1982,6 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal( const table::CellAddress& aFormulaPosition, const table::CellAddress& aVariablePosition, const OUString& aGoalValue ) - throw (uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; sheet::GoalResult aResult; @@ -2019,7 +2005,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal( // XConsolidatable uno::Reference<sheet::XConsolidationDescriptor> SAL_CALL ScModelObj::createConsolidationDescriptor( - sal_Bool bEmpty ) throw(uno::RuntimeException, std::exception) + sal_Bool bEmpty ) { SolarMutexGuard aGuard; ScConsolidationDescriptor* pNew = new ScConsolidationDescriptor; @@ -2035,7 +2021,6 @@ uno::Reference<sheet::XConsolidationDescriptor> SAL_CALL ScModelObj::createConso void SAL_CALL ScModelObj::consolidate( const uno::Reference<sheet::XConsolidationDescriptor>& xDescriptor ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // das koennte theoretisch ein fremdes Objekt sein, also nur das @@ -2061,7 +2046,7 @@ void SAL_CALL ScModelObj::consolidate( // XDocumentAuditing -void SAL_CALL ScModelObj::refreshArrows() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::refreshArrows() { SolarMutexGuard aGuard; if (pDocShell) @@ -2070,7 +2055,6 @@ void SAL_CALL ScModelObj::refreshArrows() throw(uno::RuntimeException, std::exce // XViewDataSupplier uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) - throw (uno::RuntimeException, std::exception) { uno::Reference < container::XIndexAccess > xRet( SfxBaseModel::getViewData() ); @@ -2100,7 +2084,6 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) //! auch an der Applikation anbieten? uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -2110,9 +2093,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo( void SAL_CALL ScModelObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2260,8 +2240,6 @@ void SAL_CALL ScModelObj::setPropertyValue( } uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -2532,7 +2510,6 @@ css::uno::Reference<css::uno::XInterface> ScModelObj::create( uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( const OUString& aServiceSpecifier ) - throw(uno::Exception, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return create(aServiceSpecifier, nullptr); @@ -2541,7 +2518,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence<uno::Any>& aArgs ) - throw(uno::Exception, uno::RuntimeException, std::exception) { //! unterscheiden zwischen eigenen Services und denen vom Drawing-Layer? @@ -2561,7 +2537,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments } uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2576,7 +2551,7 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames() } // XServiceInfo -OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScModelObj::getImplementationName() { return OUString( "ScModelObj" ); /* // Matching the .component information: @@ -2585,13 +2560,11 @@ OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeExceptio } sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCMODELOBJ_SERVICE, SCDOCSETTINGS_SERVICE, SCDOC_SERVICE}; } @@ -2599,7 +2572,7 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames() // XUnoTunnel sal_Int64 SAL_CALL ScModelObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -2658,14 +2631,12 @@ ScModelObj* ScModelObj::getImplementation(const uno::Reference<uno::XInterface>& // XChangesNotifier void ScModelObj::addChangesListener( const uno::Reference< util::XChangesListener >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maChangesListeners.addInterface( aListener ); } void ScModelObj::removeChangesListener( const uno::Reference< util::XChangesListener >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maChangesListeners.removeInterface( aListener ); @@ -2826,13 +2797,11 @@ void ScModelObj::HandleCalculateEvents() // XOpenCLSelection sal_Bool ScModelObj::isOpenCLEnabled() - throw (uno::RuntimeException, std::exception) { return officecfg::Office::Common::Misc::UseOpenCL::get(); } void ScModelObj::enableOpenCL(sal_Bool bEnable) - throw (uno::RuntimeException, std::exception) { if (ScCalcConfig::isOpenCLEnabled() == static_cast<bool>(bEnable)) return; @@ -2856,7 +2825,6 @@ void ScModelObj::enableOpenCL(sal_Bool bEnable) } void ScModelObj::enableAutomaticDeviceSelection(sal_Bool bForce) - throw (uno::RuntimeException, std::exception) { ScCalcConfig aConfig = ScInterpreter::GetGlobalConfig(); aConfig.mbOpenCLAutoSelect = true; @@ -2872,7 +2840,6 @@ void ScModelObj::enableAutomaticDeviceSelection(sal_Bool bForce) } void ScModelObj::disableAutomaticDeviceSelection() - throw (uno::RuntimeException, std::exception) { ScCalcConfig aConfig = ScInterpreter::GetGlobalConfig(); aConfig.mbOpenCLAutoSelect = false; @@ -2883,7 +2850,6 @@ void ScModelObj::disableAutomaticDeviceSelection() } void ScModelObj::selectOpenCLDevice( sal_Int32 nPlatform, sal_Int32 nDevice ) - throw (uno::RuntimeException, std::exception) { if(nPlatform < 0 || nDevice < 0) throw uno::RuntimeException(); @@ -2905,7 +2871,6 @@ void ScModelObj::selectOpenCLDevice( sal_Int32 nPlatform, sal_Int32 nDevice ) } sal_Int32 ScModelObj::getPlatformID() - throw (uno::RuntimeException, std::exception) { #if !HAVE_FEATURE_OPENCL return -1; @@ -2918,7 +2883,6 @@ sal_Int32 ScModelObj::getPlatformID() } sal_Int32 ScModelObj::getDeviceID() - throw (uno::RuntimeException, std::exception) { #if !HAVE_FEATURE_OPENCL return -1; @@ -2931,7 +2895,6 @@ sal_Int32 ScModelObj::getDeviceID() } uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms() - throw (uno::RuntimeException, std::exception) { #if !HAVE_FEATURE_OPENCL return uno::Sequence<sheet::opencl::OpenCLPlatform>(); @@ -2963,7 +2926,6 @@ namespace { /// @throws css::uno::RuntimeException void setOpcodeSubsetTest(bool bFlag) - throw (uno::RuntimeException, std::exception) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); officecfg::Office::Calc::Formula::Calculation::OpenCLSubsetOnly::set(bFlag, batch); @@ -2973,25 +2935,21 @@ void setOpcodeSubsetTest(bool bFlag) } void ScModelObj::enableOpcodeSubsetTest() - throw (uno::RuntimeException, std::exception) { setOpcodeSubsetTest(true); } void ScModelObj::disableOpcodeSubsetTest() - throw (uno::RuntimeException, std::exception) { setOpcodeSubsetTest(false); } sal_Bool ScModelObj::isOpcodeSubsetTested() - throw (uno::RuntimeException, std::exception) { return officecfg::Office::Calc::Formula::Calculation::OpenCLSubsetOnly::get(); } void ScModelObj::setFormulaCellNumberLimit( sal_Int32 number ) - throw (uno::RuntimeException, std::exception) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::set(number, batch); @@ -2999,7 +2957,6 @@ void ScModelObj::setFormulaCellNumberLimit( sal_Int32 number ) } sal_Int32 ScModelObj::getFormulaCellNumberLimit() - throw (uno::RuntimeException, std::exception) { return officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get().get(); } @@ -3050,7 +3007,6 @@ uno::Reference<drawing::XDrawPage> ScDrawPagesObj::GetObjectByIndex_Impl(sal_Int // XDrawPages uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sal_Int32 nPos ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<drawing::XDrawPage> xRet; @@ -3066,7 +3022,6 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sa } void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>& xPage ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SvxDrawPage* pImp = SvxDrawPage::getImplementation( xPage ); @@ -3083,7 +3038,7 @@ void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>& // XIndexAccess -sal_Int32 SAL_CALL ScDrawPagesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDrawPagesObj::getCount() { SolarMutexGuard aGuard; if (pDocShell) @@ -3092,8 +3047,6 @@ sal_Int32 SAL_CALL ScDrawPagesObj::getCount() throw(uno::RuntimeException, std:: } uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<drawing::XDrawPage> xPage(GetObjectByIndex_Impl(nIndex)); @@ -3103,13 +3056,13 @@ uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScDrawPagesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScDrawPagesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<drawing::XDrawPage>::get(); } -sal_Bool SAL_CALL ScDrawPagesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDrawPagesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -3161,7 +3114,6 @@ ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const OUString& aName) c } void SAL_CALL ScTableSheetsObj::insertNewByName( const OUString& aName, sal_Int16 nPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3174,7 +3126,6 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const OUString& aName, sal_Int1 } void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDestination ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3190,7 +3141,6 @@ void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDe void SAL_CALL ScTableSheetsObj::copyByName( const OUString& aName, const OUString& aCopy, sal_Int16 nDestination ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3218,8 +3168,6 @@ void SAL_CALL ScTableSheetsObj::copyByName( const OUString& aName, } void SAL_CALL ScTableSheetsObj::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3269,8 +3217,6 @@ void SAL_CALL ScTableSheetsObj::insertByName( const OUString& aName, const uno:: } void SAL_CALL ScTableSheetsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3320,8 +3266,6 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const OUString& aName, const uno: } void SAL_CALL ScTableSheetsObj::removeByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3341,7 +3285,6 @@ void SAL_CALL ScTableSheetsObj::removeByName( const OUString& aName ) sal_Int32 ScTableSheetsObj::importSheet( const uno::Reference < sheet::XSpreadsheetDocument > & xDocSrc, const OUString& srcName, const sal_Int32 nDestPosition ) - throw( lang::IllegalArgumentException, lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { //pDocShell is the destination ScDocument& rDocDest = pDocShell->GetDocument(); @@ -3375,7 +3318,6 @@ sal_Int32 ScTableSheetsObj::importSheet( // XCellRangesAccess uno::Reference< table::XCell > SAL_CALL ScTableSheetsObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow, sal_Int32 nSheet ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((sal_uInt16)nSheet))); @@ -3386,7 +3328,6 @@ uno::Reference< table::XCell > SAL_CALL ScTableSheetsObj::getCellByPosition( sal } uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom, sal_Int32 nSheet ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((sal_uInt16)nSheet))); @@ -3397,7 +3338,6 @@ uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPos } uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj::getCellRangesByName( const OUString& aRange ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence < uno::Reference < table::XCellRange > > xRet; @@ -3428,7 +3368,6 @@ uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj: // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); @@ -3436,7 +3375,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumera // XIndexAccess -sal_Int32 SAL_CALL ScTableSheetsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTableSheetsObj::getCount() { SolarMutexGuard aGuard; if (pDocShell) @@ -3445,8 +3384,6 @@ sal_Int32 SAL_CALL ScTableSheetsObj::getCount() throw(uno::RuntimeException, std } uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XSpreadsheet> xSheet(GetObjectByIndex_Impl(nIndex)); @@ -3457,13 +3394,13 @@ uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32 nIndex ) // return uno::Any(); } -uno::Type SAL_CALL ScTableSheetsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScTableSheetsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XSpreadsheet>::get(); } -sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -3472,8 +3409,6 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException, s // XNameAccess uno::Any SAL_CALL ScTableSheetsObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XSpreadsheet> xSheet(GetObjectByName_Impl(aName)); @@ -3484,7 +3419,6 @@ uno::Any SAL_CALL ScTableSheetsObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScTableSheetsObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3505,7 +3439,6 @@ uno::Sequence<OUString> SAL_CALL ScTableSheetsObj::getElementNames() } sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3568,7 +3501,6 @@ ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const OUString& aName) } void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCount ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3584,7 +3516,6 @@ void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 n } void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3602,7 +3533,6 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableColumnsEnumeration")); @@ -3610,15 +3540,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumer // XIndexAccess -sal_Int32 SAL_CALL ScTableColumnsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTableColumnsObj::getCount() { SolarMutexGuard aGuard; return nEndCol - nStartCol + 1; } uno::Any SAL_CALL ScTableColumnsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xColumn(GetObjectByIndex_Impl(nIndex)); @@ -3628,21 +3556,19 @@ uno::Any SAL_CALL ScTableColumnsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScTableColumnsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScTableColumnsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XCellRange>::get(); } -sal_Bool SAL_CALL ScTableColumnsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableColumnsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Any SAL_CALL ScTableColumnsObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xColumn(GetObjectByName_Impl(aName)); @@ -3653,7 +3579,6 @@ uno::Any SAL_CALL ScTableColumnsObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScTableColumnsObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SCCOL nCount = nEndCol - nStartCol + 1; @@ -3666,7 +3591,6 @@ uno::Sequence<OUString> SAL_CALL ScTableColumnsObj::getElementNames() } sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SCCOL nCol = 0; @@ -3680,7 +3604,6 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const OUString& aName ) // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnsObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -3690,9 +3613,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnsObj::getPropertyS void SAL_CALL ScTableColumnsObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -3736,8 +3656,6 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue( } uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -3821,7 +3739,6 @@ ScTableRowObj* ScTableRowsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const } void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCount ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3837,7 +3754,6 @@ void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCou } void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3855,7 +3771,6 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableRowsEnumeration")); @@ -3863,15 +3778,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumerati // XIndexAccess -sal_Int32 SAL_CALL ScTableRowsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTableRowsObj::getCount() { SolarMutexGuard aGuard; return nEndRow - nStartRow + 1; } uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xRow(GetObjectByIndex_Impl(nIndex)); @@ -3881,13 +3794,13 @@ uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScTableRowsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScTableRowsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XCellRange>::get(); } -sal_Bool SAL_CALL ScTableRowsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableRowsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -3896,7 +3809,6 @@ sal_Bool SAL_CALL ScTableRowsObj::hasElements() throw(uno::RuntimeException, std // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowsObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -3906,9 +3818,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowsObj::getPropertySetI void SAL_CALL ScTableRowsObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -4004,8 +3913,6 @@ void SAL_CALL ScTableRowsObj::setPropertyValue( } uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -4070,7 +3977,6 @@ ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj() // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettingsObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { //! muss noch return nullptr; @@ -4078,16 +3984,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettingsObj::getPr void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue( const OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { //! muss noch } uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const OUString& /* aPropertyName */ ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { //! muss noch return uno::Any(); @@ -4145,7 +4046,6 @@ ScAnnotationObj* ScAnnotationsObj::GetObjectByIndex_Impl( sal_Int32 nIndex ) con void SAL_CALL ScAnnotationsObj::insertNew( const table::CellAddress& aPosition, const OUString& rText ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -4156,7 +4056,7 @@ void SAL_CALL ScAnnotationsObj::insertNew( } } -void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) { SolarMutexGuard aGuard; if (pDocShell) @@ -4176,7 +4076,6 @@ void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Run // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { //! iterate directly (more efficiently)? @@ -4187,7 +4086,6 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera // XIndexAccess sal_Int32 SAL_CALL ScAnnotationsObj::getCount() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Int32 nCount = 0; @@ -4203,8 +4101,6 @@ sal_Int32 SAL_CALL ScAnnotationsObj::getCount() } uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XSheetAnnotation> xAnnotation(GetObjectByIndex_Impl(nIndex)); @@ -4214,13 +4110,13 @@ uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScAnnotationsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScAnnotationsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XSheetAnnotation>::get(); } -sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScAnnotationsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -4297,7 +4193,6 @@ ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const OUString& aName) void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName, const uno::Sequence<table::CellRangeAddress>& aRanges, const OUString& aComment ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -4328,7 +4223,6 @@ void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName, } void SAL_CALL ScScenariosObj::removeByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SCTAB nIndex; @@ -4339,7 +4233,6 @@ void SAL_CALL ScScenariosObj::removeByName( const OUString& aName ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.ScenariosEnumeration")); @@ -4347,7 +4240,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumerati // XIndexAccess -sal_Int32 SAL_CALL ScScenariosObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScScenariosObj::getCount() { SolarMutexGuard aGuard; SCTAB nCount = 0; @@ -4369,8 +4262,6 @@ sal_Int32 SAL_CALL ScScenariosObj::getCount() throw(uno::RuntimeException, std:: } uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XScenario> xScen(GetObjectByIndex_Impl(nIndex)); @@ -4380,21 +4271,19 @@ uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScScenariosObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScScenariosObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XScenario>::get(); } -sal_Bool SAL_CALL ScScenariosObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScScenariosObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Any SAL_CALL ScScenariosObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XScenario> xScen(GetObjectByName_Impl(aName)); @@ -4405,7 +4294,6 @@ uno::Any SAL_CALL ScScenariosObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScScenariosObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SCTAB nCount = (SCTAB)getCount(); @@ -4425,7 +4313,6 @@ uno::Sequence<OUString> SAL_CALL ScScenariosObj::getElementNames() } sal_Bool SAL_CALL ScScenariosObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SCTAB nIndex; diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 2eb4d60cca78..c3e24180a8cd 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -64,8 +64,6 @@ static ScSheetEventId lcl_GetEventFromName( const OUString& aName ) // XNameReplace void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mpDocShell) @@ -117,7 +115,6 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno: // XNameAccess uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSheetEventId nEvent = lcl_GetEventFromName(aName); @@ -148,7 +145,7 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName ) return aRet; } -uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames() { SolarMutexGuard aGuard; uno::Sequence<OUString> aNames((int)ScSheetEventId::COUNT); @@ -157,7 +154,7 @@ uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno:: return aNames; } -sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName ) { SolarMutexGuard aGuard; ScSheetEventId nEvent = lcl_GetEventFromName(aName); @@ -166,13 +163,13 @@ sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName ) throw(uno // XElementAccess -uno::Type SAL_CALL ScSheetEventsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScSheetEventsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } -sal_Bool SAL_CALL ScSheetEventsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScSheetEventsObj::hasElements() { SolarMutexGuard aGuard; if (mpDocShell) diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index 027febb19876..d0c72c57600b 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -27,17 +27,17 @@ using utl::MediaDescriptor; ScExcelBiffDetect::ScExcelBiffDetect( const uno::Reference<uno::XComponentContext>& /*xContext*/ ) {} ScExcelBiffDetect::~ScExcelBiffDetect() {} -OUString ScExcelBiffDetect::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString ScExcelBiffDetect::getImplementationName() { return OUString("com.sun.star.comp.calc.ExcelBiffFormatDetector"); } -sal_Bool ScExcelBiffDetect::supportsService( const OUString& aName ) throw (uno::RuntimeException, std::exception) +sal_Bool ScExcelBiffDetect::supportsService( const OUString& aName ) { return cppu::supportsService(this, aName); } -uno::Sequence<OUString> ScExcelBiffDetect::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +uno::Sequence<OUString> ScExcelBiffDetect::getSupportedServiceNames() { uno::Sequence<OUString> aNames { "com.sun.star.frame.ExtendedTypeDetection" }; return aNames; @@ -133,7 +133,6 @@ bool isTemplate(const OUString& rType) } OUString ScExcelBiffDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor ) - throw (uno::RuntimeException, std::exception) { MediaDescriptor aMediaDesc(lDescriptor); OUString aType; diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx index 9830ccd6deef..acb182533bbf 100644 --- a/sc/source/ui/unoobj/exceldetect.hxx +++ b/sc/source/ui/unoobj/exceldetect.hxx @@ -26,13 +26,12 @@ public: virtual ~ScExcelBiffDetect() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) 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& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XExtendedFilterDetection - 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/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index d397e05c0a10..178ef7a17996 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -341,7 +341,7 @@ uno::Reference<text::XTextField> ScCellFieldsObj::GetObjectByIndex_Impl(sal_Int3 return xRet; } -sal_Int32 SAL_CALL ScCellFieldsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScCellFieldsObj::getCount() { SolarMutexGuard aGuard; @@ -353,8 +353,6 @@ sal_Int32 SAL_CALL ScCellFieldsObj::getCount() throw(uno::RuntimeException, std: } uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XTextField> xField(GetObjectByIndex_Impl(nIndex)); @@ -364,20 +362,19 @@ uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScCellFieldsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScCellFieldsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<text::XTextField>::get(); } -sal_Bool SAL_CALL ScCellFieldsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellFieldsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); @@ -385,21 +382,18 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumerat void SAL_CALL ScCellFieldsObj::addContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ScCellFieldsObj::removeContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } // XRefreshable void SAL_CALL ScCellFieldsObj::refresh( ) - throw (uno::RuntimeException, std::exception) { if (mpRefreshListeners) { @@ -411,7 +405,6 @@ void SAL_CALL ScCellFieldsObj::refresh( ) } void SAL_CALL ScCellFieldsObj::addRefreshListener( const uno::Reference< util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -423,7 +416,6 @@ void SAL_CALL ScCellFieldsObj::addRefreshListener( const uno::Reference< util::X } void SAL_CALL ScCellFieldsObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -506,7 +498,7 @@ uno::Reference<text::XTextField> ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_In return xRet; } -sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() { SolarMutexGuard aGuard; @@ -517,8 +509,6 @@ sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() throw(uno::RuntimeException, st } uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XTextField> xField(GetObjectByIndex_Impl(nIndex)); @@ -528,20 +518,19 @@ uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScHeaderFieldsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScHeaderFieldsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<text::XTextField>::get(); } -sal_Bool SAL_CALL ScHeaderFieldsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScHeaderFieldsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); @@ -549,21 +538,18 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumer void SAL_CALL ScHeaderFieldsObj::addContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ScHeaderFieldsObj::removeContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } // XRefreshable void SAL_CALL ScHeaderFieldsObj::refresh( ) - throw (uno::RuntimeException, std::exception) { if (mpRefreshListeners) { @@ -575,7 +561,6 @@ void SAL_CALL ScHeaderFieldsObj::refresh( ) } void SAL_CALL ScHeaderFieldsObj::addRefreshListener( const uno::Reference< util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -587,7 +572,6 @@ void SAL_CALL ScHeaderFieldsObj::addRefreshListener( const uno::Reference< util: } void SAL_CALL ScHeaderFieldsObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -1162,7 +1146,6 @@ bool ScEditFieldObj::IsInserted() const // XTextField OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1201,7 +1184,6 @@ OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) // XTextContent void SAL_CALL ScEditFieldObj::attach( const uno::Reference<text::XTextRange>& xTextRange ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (xTextRange.is()) @@ -1214,7 +1196,7 @@ void SAL_CALL ScEditFieldObj::attach( const uno::Reference<text::XTextRange>& xT } } -uno::Reference<text::XTextRange> SAL_CALL ScEditFieldObj::getAnchor() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScEditFieldObj::getAnchor() { SolarMutexGuard aGuard; return mpContent; @@ -1222,21 +1204,19 @@ uno::Reference<text::XTextRange> SAL_CALL ScEditFieldObj::getAnchor() throw(uno: // XComponent -void SAL_CALL ScEditFieldObj::dispose() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScEditFieldObj::dispose() { OComponentHelper::dispose(); } void SAL_CALL ScEditFieldObj::addEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException, std::exception) { OComponentHelper::addEventListener( xListener ); } void SAL_CALL ScEditFieldObj::removeEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException, std::exception) { OComponentHelper::removeEventListener( xListener ); } @@ -1244,7 +1224,6 @@ void SAL_CALL ScEditFieldObj::removeEventListener( // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScEditFieldObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<beans::XPropertySetInfo> aRef = pPropSet->getPropertySetInfo(); @@ -1253,9 +1232,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScEditFieldObj::getPropertySetI void SAL_CALL ScEditFieldObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (aPropertyName == SC_UNONAME_ANCHOR) @@ -1287,8 +1263,6 @@ void SAL_CALL ScEditFieldObj::setPropertyValue( } uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (aPropertyName == SC_UNONAME_TEXTFIELD_TYPE) @@ -1339,7 +1313,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScEditFieldObj ) // XUnoTunnel sal_Int64 SAL_CALL ScEditFieldObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -1371,25 +1345,23 @@ ScEditFieldObj* ScEditFieldObj::getImplementation(const uno::Reference<text::XTe // XServiceInfo -OUString SAL_CALL ScEditFieldObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScEditFieldObj::getImplementationName() { return OUString("ScEditFieldObj"); } sal_Bool SAL_CALL ScEditFieldObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScEditFieldObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {"com.sun.star.text.TextField", "com.sun.star.text.TextContent"}; } -uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -1412,7 +1384,6 @@ uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() throw(uno::RuntimeE } uno::Sequence<sal_Int8> SAL_CALL ScEditFieldObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index f11fc1ee18d5..be27823aaa70 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -117,7 +117,7 @@ Calc_FilterOptionsDialog_get_implementation(css::uno::XComponentContext*, css::u // XPropertyAccess -uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValues() throw(uno::RuntimeException, std::exception) +uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValues() { uno::Sequence<beans::PropertyValue> aRet(1); beans::PropertyValue* pArray = aRet.getArray(); @@ -129,8 +129,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValu } void SAL_CALL ScFilterOptionsObj::setPropertyValues( const uno::Sequence<beans::PropertyValue>& aProps ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const beans::PropertyValue* pPropArray = aProps.getConstArray(); long nPropCount = aProps.getLength(); @@ -152,12 +150,12 @@ void SAL_CALL ScFilterOptionsObj::setPropertyValues( const uno::Sequence<beans:: // XExecutableDialog -void SAL_CALL ScFilterOptionsObj::setTitle( const OUString& /* aTitle */ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScFilterOptionsObj::setTitle( const OUString& /* aTitle */ ) { // not used } -sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL ScFilterOptionsObj::execute() { sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL; @@ -301,7 +299,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, st // XImporter void SAL_CALL ScFilterOptionsObj::setTargetDocument( const uno::Reference<lang::XComponent>& /* xDoc */ ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { bExport = false; } @@ -309,7 +306,6 @@ void SAL_CALL ScFilterOptionsObj::setTargetDocument( const uno::Reference<lang:: // XExporter void SAL_CALL ScFilterOptionsObj::setSourceDocument( const uno::Reference<lang::XComponent>& /* xDoc */ ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { bExport = true; } diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index edc5e48a3aa7..0a74f29beecf 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -245,7 +245,6 @@ ScTableConditionalEntry* ScTableConditionalFormat::GetObjectByIndex_Impl(sal_uIn void SAL_CALL ScTableConditionalFormat::addNew( const uno::Sequence<beans::PropertyValue >& aConditionalEntry ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScCondFormatEntryItem aEntry; @@ -340,7 +339,6 @@ void SAL_CALL ScTableConditionalFormat::addNew( } void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -350,7 +348,7 @@ void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex ) } } -void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScTableConditionalFormat::clear() { SolarMutexGuard aGuard; maEntries.clear(); @@ -359,7 +357,6 @@ void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException, std // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); @@ -367,15 +364,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::creat // XIndexAccess -sal_Int32 SAL_CALL ScTableConditionalFormat::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTableConditionalFormat::getCount() { SolarMutexGuard aGuard; return maEntries.size(); } uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XSheetConditionalEntry> xEntry(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -385,13 +380,13 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScTableConditionalFormat::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScTableConditionalFormat::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XSheetConditionalEntry>::get(); } -sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -408,8 +403,6 @@ static OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) } uno::Any SAL_CALL ScTableConditionalFormat::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -429,7 +422,6 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScTableConditionalFormat::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -443,7 +435,6 @@ uno::Sequence<OUString> SAL_CALL ScTableConditionalFormat::getElementNames() } sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -458,7 +449,7 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const OUString& aName ) // XUnoTunnel sal_Int64 SAL_CALL ScTableConditionalFormat::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -506,60 +497,54 @@ void ScTableConditionalEntry::GetData(ScCondFormatEntryItem& rData) const // XSheetCondition sheet::ConditionOperator SAL_CALL ScTableConditionalEntry::getOperator() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return lcl_ConditionModeToOperator( aData.meMode ); } void SAL_CALL ScTableConditionalEntry::setOperator( sheet::ConditionOperator nOperator ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.meMode = lcl_ConditionOperatorToMode( nOperator ); } sal_Int32 SAL_CALL ScTableConditionalEntry::getConditionOperator() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return lcl_ConditionModeToOperatorNew( aData.meMode ); } void SAL_CALL ScTableConditionalEntry::setConditionOperator( sal_Int32 nOperator ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.meMode = ScConditionEntry::GetModeFromApi( nOperator ); } -OUString SAL_CALL ScTableConditionalEntry::getFormula1() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableConditionalEntry::getFormula1() { SolarMutexGuard aGuard; return aData.maExpr1; } void SAL_CALL ScTableConditionalEntry::setFormula1( const OUString& aFormula1 ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.maExpr1 = aFormula1; } -OUString SAL_CALL ScTableConditionalEntry::getFormula2() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableConditionalEntry::getFormula2() { SolarMutexGuard aGuard; return aData.maExpr2; } void SAL_CALL ScTableConditionalEntry::setFormula2( const OUString& aFormula2 ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.maExpr2 = aFormula2; } -table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition() throw(uno::RuntimeException, std::exception) +table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition() { SolarMutexGuard aGuard; table::CellAddress aRet; @@ -570,7 +555,6 @@ table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition() throw(u } void SAL_CALL ScTableConditionalEntry::setSourcePosition( const table::CellAddress& aSourcePosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.maPos.Set( (SCCOL)aSourcePosition.Column, (SCROW)aSourcePosition.Row, aSourcePosition.Sheet ); @@ -578,14 +562,13 @@ void SAL_CALL ScTableConditionalEntry::setSourcePosition( const table::CellAddre // XSheetConditionalEntry -OUString SAL_CALL ScTableConditionalEntry::getStyleName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableConditionalEntry::getStyleName() { SolarMutexGuard aGuard; return ScStyleNameConversion::DisplayToProgrammaticName( aData.maStyle, SfxStyleFamily::Para ); } void SAL_CALL ScTableConditionalEntry::setStyleName( const OUString& aStyleName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStyleName, SfxStyleFamily::Para ); @@ -702,60 +685,54 @@ ScTableValidationObj::~ScTableValidationObj() // XSheetCondition sheet::ConditionOperator SAL_CALL ScTableValidationObj::getOperator() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return lcl_ConditionModeToOperator( (ScConditionMode)nMode ); } void SAL_CALL ScTableValidationObj::setOperator( sheet::ConditionOperator nOperator ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToMode( nOperator ) ); } sal_Int32 SAL_CALL ScTableValidationObj::getConditionOperator() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return lcl_ConditionModeToOperatorNew( (ScConditionMode)nMode ); } void SAL_CALL ScTableValidationObj::setConditionOperator( sal_Int32 nOperator ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; nMode = sal::static_int_cast<sal_uInt16>( ScConditionEntry::GetModeFromApi( nOperator ) ); } -OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableValidationObj::getFormula1() { SolarMutexGuard aGuard; return aExpr1; } void SAL_CALL ScTableValidationObj::setFormula1( const OUString& aFormula1 ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aExpr1 = aFormula1; } -OUString SAL_CALL ScTableValidationObj::getFormula2() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableValidationObj::getFormula2() { SolarMutexGuard aGuard; return aExpr2; } void SAL_CALL ScTableValidationObj::setFormula2( const OUString& aFormula2 ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aExpr2 = aFormula2; } -table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition() throw(uno::RuntimeException, std::exception) +table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition() { SolarMutexGuard aGuard; table::CellAddress aRet; @@ -766,14 +743,12 @@ table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition() throw(uno: } void SAL_CALL ScTableValidationObj::setSourcePosition( const table::CellAddress& aSourcePosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aSrcPos.Set( (SCCOL)aSourcePosition.Column, (SCROW)aSourcePosition.Row, aSourcePosition.Sheet ); } uno::Sequence<sheet::FormulaToken> SAL_CALL ScTableValidationObj::getTokens( sal_Int32 nIndex ) - throw(uno::RuntimeException,lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; if (nIndex >= 2 || nIndex < 0) @@ -783,7 +758,6 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScTableValidationObj::getTokens( sal } void SAL_CALL ScTableValidationObj::setTokens( sal_Int32 nIndex, const uno::Sequence<sheet::FormulaToken>& aTokens ) - throw(uno::RuntimeException,lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; if (nIndex >= 2 || nIndex < 0) @@ -801,13 +775,12 @@ void SAL_CALL ScTableValidationObj::setTokens( sal_Int32 nIndex, const uno::Sequ } } -sal_Int32 SAL_CALL ScTableValidationObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTableValidationObj::getCount() { return 2; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableValidationObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -817,9 +790,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableValidationObj::getProper void SAL_CALL ScTableValidationObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -930,8 +900,6 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( } uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -981,7 +949,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableValidationObj ) // XUnoTunnel sal_Int64 SAL_CALL ScTableValidationObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 5fae65828bf0..1f90c52d0525 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -211,19 +211,17 @@ ScFunctionAcceess_get_implementation(css::uno::XComponentContext*, css::uno::Seq } // XServiceInfo -OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScFunctionAccess::getImplementationName() { return OUString("stardiv.StarCalc.ScFunctionAccess"); } sal_Bool SAL_CALL ScFunctionAccess::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCFUNCTIONACCESS_SERVICE, SCDOCSETTINGS_SERVICE}; } @@ -231,7 +229,6 @@ uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames() // XPropertySet (document settings) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -241,9 +238,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySe void SAL_CALL ScFunctionAccess::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -266,8 +260,6 @@ void SAL_CALL ScFunctionAccess::setPropertyValue( } uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -459,8 +451,6 @@ static void processSequences( ScDocument* pDoc, const uno::Any& rArg, ScTokenArr uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, const uno::Sequence<uno::Any>& aArguments ) - throw (container::NoSuchElementException, lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index d001bd989c93..64528ab62133 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -126,13 +126,13 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const // XNamed -OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScSheetLinkObj::getName() { SolarMutexGuard aGuard; return getFileName(); // Name ist der Dateiname (URL) } -void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) { SolarMutexGuard aGuard; setFileName(aName); // Name ist der Dateiname (URL) @@ -141,7 +141,6 @@ void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) throw(uno::Runtim // XRefreshable void SAL_CALL ScSheetLinkObj::refresh() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -151,7 +150,6 @@ void SAL_CALL ScSheetLinkObj::refresh() void SAL_CALL ScSheetLinkObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRefreshListeners.push_back( xListener ); @@ -163,7 +161,6 @@ void SAL_CALL ScSheetLinkObj::addRefreshListener( void SAL_CALL ScSheetLinkObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; size_t nCount = aRefreshListeners.size(); @@ -198,7 +195,6 @@ void ScSheetLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh ) // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSheetLinkObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -208,9 +204,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSheetLinkObj::getPropertySetI void SAL_CALL ScSheetLinkObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aValStr; @@ -244,8 +237,6 @@ void SAL_CALL ScSheetLinkObj::setPropertyValue( } uno::Any SAL_CALL ScSheetLinkObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -442,14 +433,13 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const OUString& aName) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetLinksEnumeration")); } // XIndexAccess -sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScSheetLinksObj::getCount() { typedef std::unordered_set<OUString, OUStringHash> StrSetType; @@ -475,8 +465,6 @@ sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException, std: } uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<beans::XPropertySet> xLink(GetObjectByIndex_Impl(nIndex)); @@ -486,21 +474,19 @@ uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScSheetLinksObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScSheetLinksObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SAL_CALL ScSheetLinksObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScSheetLinksObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Any SAL_CALL ScSheetLinksObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<beans::XPropertySet> xLink(GetObjectByName_Impl(aName)); @@ -512,7 +498,6 @@ uno::Any SAL_CALL ScSheetLinksObj::getByName( const OUString& aName ) } sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // Name ist der Dateiname @@ -533,7 +518,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName ) return false; } -uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() { typedef std::unordered_set<OUString, OUStringHash> StrSetType; @@ -679,7 +664,6 @@ void ScAreaLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh ) // XRefreshable void SAL_CALL ScAreaLinkObj::refresh() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); @@ -689,7 +673,6 @@ void SAL_CALL ScAreaLinkObj::refresh() void SAL_CALL ScAreaLinkObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRefreshListeners.push_back( xListener ); @@ -701,7 +684,6 @@ void SAL_CALL ScAreaLinkObj::addRefreshListener( void SAL_CALL ScAreaLinkObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; size_t nCount = aRefreshListeners.size(); @@ -732,7 +714,6 @@ void ScAreaLinkObj::Refreshed_Impl() // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAreaLinkObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -742,9 +723,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAreaLinkObj::getPropertySetIn void SAL_CALL ScAreaLinkObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aValStr; @@ -778,8 +756,6 @@ void SAL_CALL ScAreaLinkObj::setPropertyValue( } uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -866,7 +842,7 @@ void ScAreaLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) // XAreaLink -OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAreaLinkObj::getSourceArea() { SolarMutexGuard aGuard; OUString aRet; @@ -877,13 +853,12 @@ OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException, st } void SAL_CALL ScAreaLinkObj::setSourceArea( const OUString& aSourceArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Modify_Impl( nullptr, nullptr, nullptr, &aSourceArea, nullptr ); } -table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea() throw(uno::RuntimeException, std::exception) +table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea() { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -894,7 +869,6 @@ table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea() throw(uno::Runtime } void SAL_CALL ScAreaLinkObj::setDestArea( const table::CellRangeAddress& aDestArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Modify_Impl( nullptr, nullptr, nullptr, nullptr, &aDestArea ); @@ -939,7 +913,6 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP const OUString& aSourceArea, const OUString& aFilter, const OUString& aFilterOptions ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -954,7 +927,7 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP } } -void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) { SolarMutexGuard aGuard; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, (size_t)nIndex); @@ -970,7 +943,6 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Runti // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); @@ -978,7 +950,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati // XIndexAccess -sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAreaLinksObj::getCount() { SolarMutexGuard aGuard; sal_Int32 nAreaCount = 0; @@ -997,8 +969,6 @@ sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException, std:: } uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XAreaLink> xLink(GetObjectByIndex_Impl(nIndex)); @@ -1008,13 +978,13 @@ uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScAreaLinksObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScAreaLinksObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XAreaLink>::get(); } -sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScAreaLinksObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -1068,13 +1038,13 @@ static OUString lcl_BuildDDEName( const OUString& rAppl, const OUString& rTopic, return aRet; } -OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDDELinkObj::getName() { SolarMutexGuard aGuard; return lcl_BuildDDEName( aAppl, aTopic, aItem ); } -void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) { // name can't be changed (formulas wouldn't find the link) throw uno::RuntimeException(); @@ -1082,7 +1052,7 @@ void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) throw(uno::Ru // XDDELink -OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDDELinkObj::getApplication() { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1090,7 +1060,7 @@ OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException, st return aAppl; } -OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDDELinkObj::getTopic() { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1098,7 +1068,7 @@ OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException, std::exc return aTopic; } -OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDDELinkObj::getItem() { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1108,7 +1078,7 @@ OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException, std::exce // XRefreshable -void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDDELinkObj::refresh() { SolarMutexGuard aGuard; if (pDocShell) @@ -1120,7 +1090,6 @@ void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException, std::exceptio void SAL_CALL ScDDELinkObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRefreshListeners.push_back( xListener ); @@ -1132,7 +1101,6 @@ void SAL_CALL ScDDELinkObj::addRefreshListener( void SAL_CALL ScDDELinkObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; size_t nCount = aRefreshListeners.size(); @@ -1152,7 +1120,6 @@ void SAL_CALL ScDDELinkObj::removeRefreshListener( // XDDELinkResults uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence< uno::Sequence< uno::Any > > aReturn; @@ -1187,7 +1154,6 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) } void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >& aResults ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bSuccess = false; @@ -1276,7 +1242,6 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const OUString& aName) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DDELinksEnumeration")); @@ -1284,7 +1249,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio // XIndexAccess -sal_Int32 SAL_CALL ScDDELinksObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDDELinksObj::getCount() { SolarMutexGuard aGuard; sal_Int32 nAreaCount = 0; @@ -1294,8 +1259,6 @@ sal_Int32 SAL_CALL ScDDELinksObj::getCount() throw(uno::RuntimeException, std::e } uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XDDELink> xLink(GetObjectByIndex_Impl(nIndex)); @@ -1305,21 +1268,19 @@ uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScDDELinksObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScDDELinksObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XDDELink>::get(); } -sal_Bool SAL_CALL ScDDELinksObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDDELinksObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Any SAL_CALL ScDDELinksObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XDDELink> xLink(GetObjectByName_Impl(aName)); @@ -1329,7 +1290,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByName( const OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames() { SolarMutexGuard aGuard; if (pDocShell) @@ -1352,7 +1313,6 @@ uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::Run } sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -1376,7 +1336,6 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName ) uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( const OUString& aApplication, const OUString& aTopic, const OUString& aItem, css::sheet::DDELinkMode nMode ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< sheet::XDDELink > xLink; @@ -1436,7 +1395,6 @@ ScExternalSheetCacheObj::~ScExternalSheetCacheObj() } void SAL_CALL ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nRow, const Any& rValue) - throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nRow < 0 || nCol < 0) @@ -1461,7 +1419,6 @@ void SAL_CALL ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nR } Any SAL_CALL ScExternalSheetCacheObj::getCellValue(sal_Int32 nCol, sal_Int32 nRow) - throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nRow < 0 || nCol < 0) @@ -1493,7 +1450,6 @@ Any SAL_CALL ScExternalSheetCacheObj::getCellValue(sal_Int32 nCol, sal_Int32 nRo } Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllRows() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; vector<SCROW> aRows; @@ -1507,7 +1463,6 @@ Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllRows() } Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllColumns(sal_Int32 nRow) - throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nRow < 0) @@ -1524,7 +1479,6 @@ Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllColumns(sal_Int32 } sal_Int32 SAL_CALL ScExternalSheetCacheObj::getTokenIndex() - throw (RuntimeException, std::exception) { return static_cast< sal_Int32 >( mnIndex ); } @@ -1540,7 +1494,6 @@ ScExternalDocLinkObj::~ScExternalDocLinkObj() Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetCache( const OUString& aSheetName, sal_Bool bDynamicCache ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; size_t nIndex = 0; @@ -1554,7 +1507,6 @@ Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetC } Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName) - throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; size_t nIndex = 0; @@ -1568,7 +1520,6 @@ Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName) } Sequence< OUString > SAL_CALL ScExternalDocLinkObj::getElementNames() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; vector<OUString> aTabNames; @@ -1588,7 +1539,6 @@ Sequence< OUString > SAL_CALL ScExternalDocLinkObj::getElementNames() } sal_Bool SAL_CALL ScExternalDocLinkObj::hasByName(const OUString &aName) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1598,7 +1548,6 @@ sal_Bool SAL_CALL ScExternalDocLinkObj::hasByName(const OUString &aName) } sal_Int32 SAL_CALL ScExternalDocLinkObj::getCount() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1607,7 +1556,6 @@ sal_Int32 SAL_CALL ScExternalDocLinkObj::getCount() } Any SAL_CALL ScExternalDocLinkObj::getByIndex(sal_Int32 nApiIndex) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1628,7 +1576,6 @@ Any SAL_CALL ScExternalDocLinkObj::getByIndex(sal_Int32 nApiIndex) } Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumeration() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( @@ -1638,14 +1585,12 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer } uno::Type SAL_CALL ScExternalDocLinkObj::getElementType() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XExternalDocLink>::get(); } sal_Bool SAL_CALL ScExternalDocLinkObj::hasElements() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1654,7 +1599,6 @@ sal_Bool SAL_CALL ScExternalDocLinkObj::hasElements() } sal_Int32 SAL_CALL ScExternalDocLinkObj::getTokenIndex() - throw (RuntimeException, std::exception) { return static_cast<sal_Int32>(mnFileId); } @@ -1671,7 +1615,6 @@ ScExternalDocLinksObj::~ScExternalDocLinksObj() Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink( const OUString& aDocName ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aDocUrl( ScGlobal::GetAbsDocName( aDocName, mpDocShell)); @@ -1681,7 +1624,6 @@ Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink( } Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName) - throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aDocUrl( ScGlobal::GetAbsDocName( aName, mpDocShell)); @@ -1695,7 +1637,6 @@ Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName) } Sequence< OUString > SAL_CALL ScExternalDocLinksObj::getElementNames() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 n = mpRefMgr->getExternalFileCount(); @@ -1710,21 +1651,18 @@ Sequence< OUString > SAL_CALL ScExternalDocLinksObj::getElementNames() } sal_Bool SAL_CALL ScExternalDocLinksObj::hasByName(const OUString &aName) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpRefMgr->hasExternalFile(aName); } sal_Int32 SAL_CALL ScExternalDocLinksObj::getCount() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpRefMgr->getExternalFileCount(); } Any SAL_CALL ScExternalDocLinksObj::getByIndex(sal_Int32 nIndex) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nIndex > ::std::numeric_limits<sal_uInt16>::max() || nIndex < ::std::numeric_limits<sal_uInt16>::min()) @@ -1740,7 +1678,6 @@ Any SAL_CALL ScExternalDocLinksObj::getByIndex(sal_Int32 nIndex) } Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnumeration() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( @@ -1750,14 +1687,12 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume } uno::Type SAL_CALL ScExternalDocLinksObj::getElementType() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XExternalDocLinks>::get(); } sal_Bool SAL_CALL ScExternalDocLinksObj::hasElements() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpRefMgr->getExternalFileCount() > 0; diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index bb9a8ac68203..d3920166ad40 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -200,14 +200,13 @@ ScIndexEnumeration::~ScIndexEnumeration() // XEnumeration -sal_Bool SAL_CALL ScIndexEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScIndexEnumeration::hasMoreElements() { SolarMutexGuard aGuard; return ( nPos < xIndex->getCount() ); } -uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScIndexEnumeration::nextElement() { SolarMutexGuard aGuard; uno::Any aReturn; @@ -223,20 +222,17 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme } OUString SAL_CALL ScIndexEnumeration::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return OUString("ScIndexEnumeration"); } sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< OUString > SAL_CALL ScIndexEnumeration::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence<OUString> aRet { sServiceName }; return aRet; @@ -258,15 +254,12 @@ ScNameToIndexAccess::~ScNameToIndexAccess() // XIndexAccess -sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) { return aNames.getLength(); } css::uno::Any SAL_CALL ScNameToIndexAccess::getByIndex( sal_Int32 nIndex ) - throw(css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { if ( xNameAccess.is() && nIndex >= 0 && nIndex < aNames.getLength() ) return xNameAccess->getByName( aNames.getConstArray()[nIndex] ); @@ -277,7 +270,6 @@ css::uno::Any SAL_CALL ScNameToIndexAccess::getByIndex( sal_Int32 nIndex ) // XElementAccess css::uno::Type SAL_CALL ScNameToIndexAccess::getElementType( ) - throw(css::uno::RuntimeException, std::exception) { if ( xNameAccess.is() ) return xNameAccess->getElementType(); @@ -285,7 +277,7 @@ css::uno::Type SAL_CALL ScNameToIndexAccess::getElementType( ) return uno::Type(); } -sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) { return getCount() > 0; } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index b71f9f56925f..5fc43a4c174a 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -210,14 +210,13 @@ void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray* } } -OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScNamedRangeObj::getName() { SolarMutexGuard aGuard; return aName; } void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; //! adapt formulas ????? @@ -230,7 +229,7 @@ void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName ) throw uno::RuntimeException(); // no other exceptions specified } -OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScNamedRangeObj::getContent() { SolarMutexGuard aGuard; OUString aContent; @@ -242,7 +241,6 @@ OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException, std } void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aContStr(aContent); @@ -251,7 +249,6 @@ void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent ) } table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAddress aPos; @@ -277,7 +274,6 @@ table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition() } void SAL_CALL ScNamedRangeObj::setReferencePosition( const table::CellAddress& aReferencePosition ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAddress aPos( (SCCOL)aReferencePosition.Column, (SCROW)aReferencePosition.Row, aReferencePosition.Sheet ); @@ -285,7 +281,7 @@ void SAL_CALL ScNamedRangeObj::setReferencePosition( const table::CellAddress& a Modify_Impl( nullptr, nullptr, nullptr, &aPos, nullptr,formula::FormulaGrammar::GRAM_API ); } -sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScNamedRangeObj::getType() { SolarMutexGuard aGuard; sal_Int32 nType=0; @@ -302,7 +298,6 @@ sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException, std:: } void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRangeData::Type nNewType = ScRangeData::Type::Name; @@ -318,7 +313,6 @@ void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) // XFormulaTokens uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<sheet::FormulaToken> aSequence; @@ -333,7 +327,6 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens() } void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( pDocShell ) @@ -348,7 +341,6 @@ void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToke // XCellRangeSource uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aRange; @@ -368,7 +360,6 @@ uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells() // beans::XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangeObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetNamedRangeMap() )); @@ -377,9 +368,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangeObj::getPropertySet void SAL_CALL ScNamedRangeObj::setPropertyValue( const OUString& rPropertyName, const uno::Any& /*aValue*/ ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( rPropertyName == SC_UNONAME_ISSHAREDFMLA ) @@ -389,8 +377,6 @@ void SAL_CALL ScNamedRangeObj::setPropertyValue( } uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -420,19 +406,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangeObj ) // lang::XServiceInfo -OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScNamedRangeObj::getImplementationName() { return OUString( "ScNamedRangeObj" ); } sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCNAMEDRANGEOBJ_SERVICE, SCLINKTARGET_SERVICE}; } @@ -440,7 +424,7 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() // XUnoTunnel sal_Int64 SAL_CALL ScNamedRangeObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -491,7 +475,6 @@ void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, const OUString& aContent, const table::CellAddress& aPosition, sal_Int32 nUnoType ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAddress aPos( (SCCOL)aPosition.Column, (SCROW)aPosition.Row, aPosition.Sheet ); @@ -531,7 +514,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, } void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& aSource, - sheet::Border aBorder ) throw(uno::RuntimeException, std::exception) + sheet::Border aBorder ) { SolarMutexGuard aGuard; //! this cannot be an enum, because multiple bits can be set !!! @@ -555,7 +538,6 @@ void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& } void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -580,7 +562,6 @@ void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName ) } void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAddress aPos( (SCCOL)aOutputPosition.Column, (SCROW)aOutputPosition.Row, aOutputPosition.Sheet ); @@ -591,7 +572,6 @@ void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPos // container::XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.NamedRangesEnumeration")); @@ -599,7 +579,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumera // container::XIndexAccess -sal_Int32 SAL_CALL ScNamedRangesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScNamedRangesObj::getCount() { SolarMutexGuard aGuard; long nRet = 0; @@ -618,8 +598,6 @@ sal_Int32 SAL_CALL ScNamedRangesObj::getCount() throw(uno::RuntimeException, std } uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< sheet::XNamedRange > xRange(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -629,20 +607,19 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScNamedRangesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScNamedRangesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XNamedRange>::get(); // must be suitable for getByIndex } -sal_Bool SAL_CALL ScNamedRangesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScNamedRangesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangesObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { static Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo(lcl_GetNamedRangesMap())); @@ -651,9 +628,6 @@ Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangesObj::getPropertySetInfo void SAL_CALL ScNamedRangesObj::setPropertyValue( const OUString& rPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if ( rPropertyName == SC_UNO_MODIFY_BROADCAST ) { @@ -662,8 +636,6 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue( } Any SAL_CALL ScNamedRangesObj::getPropertyValue( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { Any aRet; if ( rPropertyName == SC_UNO_MODIFY_BROADCAST ) @@ -677,8 +649,6 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const OUString& rPropertyName ) SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangesObj ) uno::Any SAL_CALL ScNamedRangesObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< sheet::XNamedRange > xRange(GetObjectByName_Impl(aName)); @@ -689,7 +659,6 @@ uno::Any SAL_CALL ScNamedRangesObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScNamedRangesObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -714,7 +683,6 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangesObj::getElementNames() } sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -744,13 +712,13 @@ void ScNamedRangesObj::unlock() // document::XActionLockable -sal_Bool ScNamedRangesObj::isActionLocked() throw(uno::RuntimeException, std::exception) +sal_Bool ScNamedRangesObj::isActionLocked() { SolarMutexGuard aGuard; return pDocShell->GetDocument().GetNamedRangesLockCount() != 0; } -void ScNamedRangesObj::addActionLock() throw(uno::RuntimeException, std::exception) +void ScNamedRangesObj::addActionLock() { SolarMutexGuard aGuard; ScDocument& rDoc = pDocShell->GetDocument(); @@ -763,7 +731,7 @@ void ScNamedRangesObj::addActionLock() throw(uno::RuntimeException, std::excepti rDoc.SetNamedRangesLockCount( nLockCount ); } -void ScNamedRangesObj::removeActionLock() throw(uno::RuntimeException, std::exception) +void ScNamedRangesObj::removeActionLock() { SolarMutexGuard aGuard; ScDocument& rDoc = pDocShell->GetDocument(); @@ -779,7 +747,7 @@ void ScNamedRangesObj::removeActionLock() throw(uno::RuntimeException, std::exce } } -void ScNamedRangesObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException, std::exception) +void ScNamedRangesObj::setActionLocks( sal_Int16 nLock ) { SolarMutexGuard aGuard; if ( nLock >= 0 ) @@ -798,7 +766,7 @@ void ScNamedRangesObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeExcep } } -sal_Int16 ScNamedRangesObj::resetActionLocks() throw(uno::RuntimeException, std::exception) +sal_Int16 ScNamedRangesObj::resetActionLocks() { SolarMutexGuard aGuard; ScDocument& rDoc = pDocShell->GetDocument(); @@ -1003,7 +971,6 @@ void ScLabelRangeObj::Modify_Impl( const ScRange* pLabel, const ScRange* pData ) // sheet::XLabelRange table::CellRangeAddress SAL_CALL ScLabelRangeObj::getLabelArea() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -1014,7 +981,6 @@ table::CellRangeAddress SAL_CALL ScLabelRangeObj::getLabelArea() } void SAL_CALL ScLabelRangeObj::setLabelArea( const table::CellRangeAddress& aLabelArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aLabelRange; @@ -1023,7 +989,6 @@ void SAL_CALL ScLabelRangeObj::setLabelArea( const table::CellRangeAddress& aLab } table::CellRangeAddress SAL_CALL ScLabelRangeObj::getDataArea() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -1034,7 +999,6 @@ table::CellRangeAddress SAL_CALL ScLabelRangeObj::getDataArea() } void SAL_CALL ScLabelRangeObj::setDataArea( const table::CellRangeAddress& aDataArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aDataRange; @@ -1087,7 +1051,6 @@ ScLabelRangeObj* ScLabelRangesObj::GetObjectByIndex_Impl(size_t nIndex) void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelArea, const table::CellRangeAddress& aDataArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -1119,7 +1082,6 @@ void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelAre } void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -1158,7 +1120,6 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex ) // container::XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.LabelRangesEnumeration")); @@ -1166,7 +1127,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumera // container::XIndexAccess -sal_Int32 SAL_CALL ScLabelRangesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScLabelRangesObj::getCount() { SolarMutexGuard aGuard; if (pDocShell) @@ -1180,8 +1141,6 @@ sal_Int32 SAL_CALL ScLabelRangesObj::getCount() throw(uno::RuntimeException, std } uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< sheet::XLabelRange > xRange(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -1191,14 +1150,14 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScLabelRangesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScLabelRangesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XLabelRange>::get(); // must be suitable for getByIndex } -sal_Bool SAL_CALL ScLabelRangesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScLabelRangesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index ec1d5956043f..c21b1a62cff7 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -89,7 +89,7 @@ void ScAnnotationObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XChild -uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno::RuntimeException, std::exception) +uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() { SolarMutexGuard aGuard; @@ -103,7 +103,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno: } void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>& /* Parent */ ) - throw(lang::NoSupportException, uno::RuntimeException, std::exception) { // hamma nich //! Exception oder so ??! @@ -112,7 +111,6 @@ void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>& // XSimpleText uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // Notizen brauchen keine Extrawurst @@ -121,20 +119,19 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor() uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // Notizen brauchen keine Extrawurst return GetUnoText().createTextCursorByRange(aTextPosition); } -OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAnnotationObj::getString() { SolarMutexGuard aGuard; return GetUnoText().getString(); } -void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) { SolarMutexGuard aGuard; GetUnoText().setString(aText); @@ -142,7 +139,6 @@ void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::Run void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRange>& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetUnoText().insertString( xRange, aString, bAbsorb ); @@ -150,25 +146,24 @@ void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRan void SAL_CALL ScAnnotationObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetUnoText().insertControlCharacter( xRange, nControlCharacter, bAbsorb ); } -uno::Reference<text::XText> SAL_CALL ScAnnotationObj::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScAnnotationObj::getText() { SolarMutexGuard aGuard; return GetUnoText().getText(); } -uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getStart() { SolarMutexGuard aGuard; return GetUnoText().getStart(); } -uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() { SolarMutexGuard aGuard; return GetUnoText().getEnd(); @@ -176,7 +171,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() throw(uno::R // XSheetAnnotation -table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeException, std::exception) +table::CellAddress SAL_CALL ScAnnotationObj::getPosition() { SolarMutexGuard aGuard; table::CellAddress aAdr; @@ -187,7 +182,6 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc } OUString SAL_CALL ScAnnotationObj::getAuthor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); @@ -195,21 +189,20 @@ OUString SAL_CALL ScAnnotationObj::getAuthor() } OUString SAL_CALL ScAnnotationObj::getDate() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); return pNote ? pNote->GetDate() : OUString(); } -sal_Bool SAL_CALL ScAnnotationObj::getIsVisible() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScAnnotationObj::getIsVisible() { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); return pNote && pNote->IsCaptionShown(); } -void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) { SolarMutexGuard aGuard; // show/hide note with undo action @@ -219,8 +212,6 @@ void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::Ru // XSheetAnnotationShapeSupplier uno::Reference < drawing::XShape > SAL_CALL ScAnnotationObj::getAnnotationShape() - throw(css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; uno::Reference < drawing::XShape > xShape; diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index ff479fe92677..0731ef75cb06 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -198,9 +198,6 @@ ScDocOptionsObj::~ScDocOptionsObj() void SAL_CALL ScDocOptionsObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -211,8 +208,6 @@ void SAL_CALL ScDocOptionsObj::setPropertyValue( } uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index a1566c7d397c..c2b49d86ed19 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -34,7 +34,6 @@ ScPageObj::~ScPageObj() throw() } uno::Reference<drawing::XShape > ScPageObj::CreateShape( SdrObject *pObj ) const - throw (css::uno::RuntimeException, std::exception) { uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::CreateShape( pObj )); @@ -44,19 +43,16 @@ uno::Reference<drawing::XShape > ScPageObj::CreateShape( SdrObject *pObj ) const } OUString SAL_CALL ScPageObj::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("ScPageObj"); } sal_Bool SAL_CALL ScPageObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScPageObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence<OUString> aRet { "com.sun.star.sheet.SpreadsheetDrawPage" }; return aRet; diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 6e3318bdddc8..f0372bae38c7 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -261,7 +261,6 @@ static bool lcl_MayBeDBase( SvStream& rStream ) } OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor ) - throw( uno::RuntimeException, std::exception ) { MediaDescriptor aMediaDesc( lDescriptor ); OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME(), OUString() ); @@ -328,19 +327,17 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l return aTypeName; } -OUString SAL_CALL ScFilterDetect::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScFilterDetect::getImplementationName() { return OUString("com.sun.star.comp.calc.FormatDetector"); } sal_Bool ScFilterDetect::supportsService( const OUString& sServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence<OUString> seqServiceNames { "com.sun.star.frame.ExtendedTypeDetection" }; return seqServiceNames; diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index f5e00db299d6..e97bfbf416d2 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -43,14 +43,13 @@ public: virtual ~ScFilterDetect() 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/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 6511c5abb31f..0f15c36fdf64 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -92,7 +92,7 @@ public: maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs ); } - 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 { SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object @@ -135,14 +135,14 @@ public: return maCachedObject.hasValue(); } - 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 { SolarMutexGuard aGuard; if ( !hasByName( aName ) ) throw css::container::NoSuchElementException(); return maCachedObject; } - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override { SolarMutexGuard aGuard; ScDocument& rDoc = mpDocShell->GetDocument(); @@ -159,8 +159,8 @@ public: 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; } }; @@ -170,7 +170,7 @@ class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper< document::XCodeName public: explicit ScVbaCodeNameProvider( ScDocShell& rDocShell ) : mrDocShell(rDocShell) {} // XCodeNameQuery - 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 { SolarMutexGuard aGuard; OUString sCodeName; @@ -209,8 +209,7 @@ public: return sCodeName; } - OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) - throw( uno::RuntimeException, std::exception ) override + OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) override { SolarMutexGuard aGuard; uno::Reference<drawing::XDrawPagesSupplier> xSupplier(mrDocShell.GetModel(), uno::UNO_QUERY_THROW); diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index eb850fae4082..ec65204dab54 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -136,7 +136,6 @@ ScShapeObj::~ScShapeObj() // XInterface uno::Any SAL_CALL ScShapeObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { uno::Any aRet = ScShapeObj_Base::queryInterface( rType ); @@ -225,7 +224,6 @@ static uno::Reference<text::XTextRange> lcl_GetTextRange( const uno::Reference<u // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -321,9 +319,6 @@ static awt::Point lcl_GetRelativePos( uno::Reference< drawing::XShape >& xShape, } void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const uno::Any& aValue) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -652,8 +647,6 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const } uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -838,8 +831,6 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XPropertyChangeListener>& aListener) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -862,8 +853,6 @@ void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyNa void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XPropertyChangeListener>& aListener) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -874,8 +863,6 @@ void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropert void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XVetoableChangeListener>& aListener) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -886,8 +873,6 @@ void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyNa void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XVetoableChangeListener>& aListener) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -899,7 +884,6 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropert // XPropertyState beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -932,7 +916,6 @@ beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPro uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( const uno::Sequence<OUString>& aPropertyNames ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -947,8 +930,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( } void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -978,8 +959,6 @@ void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName ) } uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1003,7 +982,6 @@ uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName // XTextContent void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTextRange */ ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1011,7 +989,6 @@ void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTe } uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1052,7 +1029,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() // XComponent -void SAL_CALL ScShapeObj::dispose() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScShapeObj::dispose() { SolarMutexGuard aGuard; @@ -1063,7 +1040,6 @@ void SAL_CALL ScShapeObj::dispose() throw(uno::RuntimeException, std::exception) void SAL_CALL ScShapeObj::addEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1074,7 +1050,6 @@ void SAL_CALL ScShapeObj::addEventListener( void SAL_CALL ScShapeObj::removeEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1102,7 +1077,6 @@ static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet void SAL_CALL ScShapeObj::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; @@ -1130,7 +1104,6 @@ void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRan } void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1145,7 +1118,6 @@ void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextCon // Use own SvxUnoTextCursor subclass - everything is just passed to aggregated object uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1163,7 +1135,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor() uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1187,7 +1158,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange( void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1200,7 +1170,6 @@ void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>& void SAL_CALL ScShapeObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1214,13 +1183,13 @@ void SAL_CALL ScShapeObj::insertControlCharacter( const uno::Reference<text::XTe // XTextRange // (parent of XSimpleText) -uno::Reference<text::XText> SAL_CALL ScShapeObj::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScShapeObj::getText() { SolarMutexGuard aGuard; return this; } -uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() { SolarMutexGuard aGuard; @@ -1233,7 +1202,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() throw(uno::Runt // return uno::Reference<text::XTextRange>(); } -uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() { SolarMutexGuard aGuard; @@ -1246,7 +1215,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::Runtim // return uno::Reference<text::XTextRange>(); } -OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScShapeObj::getString() { SolarMutexGuard aGuard; @@ -1259,7 +1228,7 @@ OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException, std::exce // return OUString(); } -void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScShapeObj::setString( const OUString& aText ) { SolarMutexGuard aGuard; @@ -1272,7 +1241,7 @@ void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeE // XChild -uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() throw (uno::RuntimeException, std::exception) +uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() { SolarMutexGuard aGuard; @@ -1307,14 +1276,14 @@ uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() throw (uno::R return nullptr; } -void SAL_CALL ScShapeObj::setParent( const uno::Reference< uno::XInterface >& ) throw (lang::NoSupportException, uno::RuntimeException, std::exception) +void SAL_CALL ScShapeObj::setParent( const uno::Reference< uno::XInterface >& ) { throw lang::NoSupportException(); } // XTypeProvider -uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() { uno::Sequence< uno::Type > aBaseTypes( ScShapeObj_Base::getTypes() ); @@ -1335,7 +1304,6 @@ uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeExcep } uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1372,10 +1340,7 @@ public: } // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw (lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, - std::exception) override + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -1411,9 +1376,7 @@ public: } // 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 { uno::Sequence< beans::PropertyValue > aProperties; ScMacroInfo* pInfo = getInfo(false); @@ -1437,24 +1400,24 @@ public: return uno::Any( aProperties ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames() override { uno::Sequence<OUString> aSeq { SC_EVENTACC_ONCLICK }; return aSeq; } - 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 { return aName == SC_EVENTACC_ONCLICK; } // 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 { // elements are always present (but contained property sequences may be empty) return true; @@ -1462,22 +1425,22 @@ public: }; ::uno::Reference< container::XNameReplace > SAL_CALL -ScShapeObj::getEvents( ) throw(uno::RuntimeException, std::exception) +ScShapeObj::getEvents( ) { return new ShapeUnoEventAccessImpl( this ); } -OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScShapeObj::getImplementationName( ) { return OUString( "com.sun.star.comp.sc.ScShapeObj" ); } -sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) { uno::Reference<lang::XServiceInfo> xSI; if ( mxShapeAgg.is() ) diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 7fe453fe8c57..e572f669b758 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -95,14 +95,13 @@ ScCellSearchObj::~ScCellSearchObj() // XSearchDescriptor -OUString SAL_CALL ScCellSearchObj::getSearchString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellSearchObj::getSearchString() { SolarMutexGuard aGuard; return pSearchItem->GetSearchString(); } void SAL_CALL ScCellSearchObj::setSearchString( const OUString& aString ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; pSearchItem->SetSearchString( aString ); @@ -110,14 +109,13 @@ void SAL_CALL ScCellSearchObj::setSearchString( const OUString& aString ) // XReplaceDescriptor -OUString SAL_CALL ScCellSearchObj::getReplaceString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellSearchObj::getReplaceString() { SolarMutexGuard aGuard; return pSearchItem->GetReplaceString(); } void SAL_CALL ScCellSearchObj::setReplaceString( const OUString& aReplaceString ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; pSearchItem->SetReplaceString( aReplaceString ); @@ -126,7 +124,6 @@ void SAL_CALL ScCellSearchObj::setReplaceString( const OUString& aReplaceString // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellSearchObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -136,9 +133,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellSearchObj::getPropertySet void SAL_CALL ScCellSearchObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -160,8 +154,6 @@ void SAL_CALL ScCellSearchObj::setPropertyValue( } uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -189,19 +181,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj ) // XServiceInfo -OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellSearchObj::getImplementationName() { return OUString( "ScCellSearchObj" ); } sal_Bool SAL_CALL ScCellSearchObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCSEARCHDESCRIPTOR_SERVICE, SCREPLACEDESCRIPTOR_SERVICE}; } @@ -209,7 +199,7 @@ uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames() // XUnoTunnel sal_Int64 SAL_CALL ScCellSearchObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index e646e70e5dfd..1b27d6f6e2fb 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -457,14 +457,12 @@ ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const OUString& aName // container::XIndexAccess -sal_Int32 SAL_CALL ScStyleFamiliesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScStyleFamiliesObj::getCount() { return SC_STYLE_FAMILY_COUNT; } uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< container::XNameContainer > xFamily(GetObjectByIndex_Impl(nIndex)); @@ -475,13 +473,13 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex ) // return uno::Any(); } -uno::Type SAL_CALL ScStyleFamiliesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScStyleFamiliesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<container::XNameContainer>::get(); // muss zu getByIndex passen } -sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -490,8 +488,6 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException, // container::XNameAccess uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< container::XNameContainer > xFamily(GetObjectByName_Impl(aName)); @@ -503,13 +499,11 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScStyleFamiliesObj::getElementNames() - throw(uno::RuntimeException, std::exception) { return {SC_FAMILYNAME_CELL, SC_FAMILYNAME_PAGE}; } sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { return aName == SC_FAMILYNAME_CELL || aName == SC_FAMILYNAME_PAGE; } @@ -518,7 +512,6 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const OUString& aName ) void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const OUString& aURL, const uno::Sequence<beans::PropertyValue>& aOptions ) - throw(io::IOException, uno::RuntimeException, std::exception) { //! use aOptions (like Writer) //! set flag to disable filter option dialogs when importing @@ -533,7 +526,6 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const OUString& aURL, } uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderOptions() - throw(uno::RuntimeException, std::exception) { // return defaults for options (?) @@ -556,7 +548,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO void SAL_CALL ScStyleFamiliesObj::loadStylesFromDocument( const uno::Reference < lang::XComponent > & aSourceComponent, const uno::Sequence<beans::PropertyValue>& aOptions ) - throw(io::IOException, uno::RuntimeException, std::exception) { // Source document docShell if ( !aSourceComponent.is() ) @@ -571,7 +562,6 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromDocument( const uno::Reference < void ScStyleFamiliesObj::loadStylesFromDocShell( ScDocShell* pSource, const uno::Sequence<beans::PropertyValue>& aOptions ) - throw(io::IOException, uno::RuntimeException, std::exception) { if ( pSource && pDocShell ) @@ -662,8 +652,6 @@ ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const OUString& aName) } void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -709,8 +697,6 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno:: } void SAL_CALL ScStyleFamilyObj::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; //! zusammenfassen? @@ -719,10 +705,6 @@ void SAL_CALL ScStyleFamilyObj::replaceByName( const OUString& aName, const uno: } void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; bool bFound = false; @@ -777,7 +759,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName ) // container::XIndexAccess -sal_Int32 SAL_CALL ScStyleFamilyObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScStyleFamilyObj::getCount() { SolarMutexGuard aGuard; if ( pDocShell ) @@ -792,8 +774,6 @@ sal_Int32 SAL_CALL ScStyleFamilyObj::getCount() throw(uno::RuntimeException, std } uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< style::XStyle > xObj(GetObjectByIndex_Impl(nIndex)); @@ -804,13 +784,13 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex ) // return uno::Any(); } -uno::Type SAL_CALL ScStyleFamilyObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScStyleFamilyObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<style::XStyle>::get(); // muss zu getByIndex passen } -sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -819,8 +799,6 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException, s // container::XNameAccess uno::Any SAL_CALL ScStyleFamilyObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< style::XStyle > xObj( @@ -833,7 +811,6 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScStyleFamilyObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -862,7 +839,6 @@ uno::Sequence<OUString> SAL_CALL ScStyleFamilyObj::getElementNames() } sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -879,18 +855,18 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const OUString& aName ) // XPropertySet -uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getPropertySetInfo( ) throw (uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getPropertySetInfo( ) { OSL_FAIL( "###unexpected!" ); return uno::Reference< beans::XPropertySetInfo >(); } -void SAL_CALL ScStyleFamilyObj::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ScStyleFamilyObj::setPropertyValue( const OUString&, const uno::Any& ) { OSL_FAIL( "###unexpected!" ); } -uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyName ) { uno::Any aRet; @@ -921,22 +897,22 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyN return aRet; } -void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) { OSL_FAIL( "###unexpected!" ); } @@ -977,7 +953,7 @@ ScStyleObj::~ScStyleObj() // XUnoTunnel sal_Int64 SAL_CALL ScStyleObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -1034,7 +1010,7 @@ SfxStyleSheetBase* ScStyleObj::GetStyle_Impl( bool bUseCachedValue ) // style::XStyle -sal_Bool SAL_CALL ScStyleObj::isUserDefined() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScStyleObj::isUserDefined() { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1043,7 +1019,7 @@ sal_Bool SAL_CALL ScStyleObj::isUserDefined() throw(uno::RuntimeException, std:: return false; } -sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScStyleObj::isInUse() { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1052,7 +1028,7 @@ sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException, std::except return false; } -OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScStyleObj::getParentStyle() { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1062,9 +1038,6 @@ OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException, std: } void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle ) - throw(container::NoSuchElementException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1113,7 +1086,7 @@ void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle ) // container::XNamed -OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScStyleObj::getName() { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1123,7 +1096,6 @@ OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException, std::except } void SAL_CALL ScStyleObj::setName( const OUString& aNewName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1201,7 +1173,6 @@ const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const OUString& rPropName, } beans::PropertyState ScStyleObj::getPropertyState_Impl( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE; @@ -1240,7 +1211,6 @@ beans::PropertyState ScStyleObj::getPropertyState_Impl( const OUString& aPropert } beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1249,7 +1219,6 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const OUString& aPro } uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( const uno::Sequence<OUString>& aPropertyNames ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1263,8 +1232,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( cons } void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1277,7 +1244,6 @@ void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName ) } uno::Any ScStyleObj::getPropertyDefault_Impl( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aAny; @@ -1364,7 +1330,6 @@ uno::Any ScStyleObj::getPropertyDefault_Impl( const OUString& aPropertyName ) } uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1373,7 +1338,6 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const OUString& aPropertyName } uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( const uno::Sequence<OUString>& aPropertyNames ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1389,9 +1353,6 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( const uno::Seq void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) -throw (beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1410,7 +1371,6 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException, } uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1424,21 +1384,18 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( const uno::Seque void SAL_CALL ScStyleObj::addPropertiesChangeListener( const uno::Sequence<OUString>& /* aPropertyNames */, const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { // no bound properties } void SAL_CALL ScStyleObj::removePropertiesChangeListener( const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { // no bound properties } void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<OUString>& /* aPropertyNames */, const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { // no bound properties } @@ -1447,7 +1404,6 @@ void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<OUStrin // getPropertyStates already defined for XPropertyState void SAL_CALL ScStyleObj::setAllPropertiesToDefault() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1497,7 +1453,6 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault() } void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<OUString>& aPropertyNames ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1514,16 +1469,12 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<OUString>& // beans::XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScStyleObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return pPropSet->getPropertySetInfo(); } void SAL_CALL ScStyleObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1536,7 +1487,6 @@ void SAL_CALL ScStyleObj::setPropertyValue( const OUString& aPropertyName, const } void ScStyleObj::setPropertyValue_Impl( const OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const uno::Any* pValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SfxStyleSheetBase* pStyle = GetStyle_Impl( true ); if ( pStyle && pEntry ) @@ -1844,7 +1794,6 @@ void ScStyleObj::setPropertyValue_Impl( const OUString& rPropertyName, const Sfx } uno::Any ScStyleObj::getPropertyValue_Impl( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aAny; SfxStyleSheetBase* pStyle = GetStyle_Impl( true ); @@ -1976,7 +1925,6 @@ uno::Any ScStyleObj::getPropertyValue_Impl( const OUString& aPropertyName ) } uno::Any SAL_CALL ScStyleObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1988,19 +1936,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScStyleObj ) // lang::XServiceInfo -OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScStyleObj::getImplementationName() { return OUString("ScStyleObj" ); } sal_Bool SAL_CALL ScStyleObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { const bool bPage = ( eFamily == SfxStyleFamily::Page ); diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 8a270a261c34..3da7da4c739a 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -90,7 +90,6 @@ void ScLinkTargetTypesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // container::XNameAccess uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if (pDocShell) { @@ -102,7 +101,7 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames() { uno::Sequence<OUString> aRet(SC_LINKTARGETTYPE_COUNT); OUString* pArray = aRet.getArray(); @@ -111,7 +110,7 @@ uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames() throw( return aRet; } -sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) { for (const auto & i : aNames) if ( i == aName ) @@ -121,12 +120,12 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( // container::XElementAccess -uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType() { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements() { return true; } @@ -155,7 +154,7 @@ void ScLinkTargetTypeObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // document::XLinkTargetSupplier -uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks() throw( uno::RuntimeException, std::exception ) +uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks() { uno::Reference< container::XNameAccess > xCollection; @@ -186,7 +185,7 @@ uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks // beans::XPropertySet -uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getPropertySetInfo() { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetLinkTargetMap() )); @@ -195,11 +194,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getProp void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aPropertyName */, const uno::Any& /* aValue */) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { // everything is read-only //! exception? @@ -228,7 +222,6 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType } uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const OUString& PropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { uno::Any aRet; if ( PropertyName == SC_UNO_LINKDISPBIT ) @@ -254,7 +247,6 @@ ScLinkTargetsObj::~ScLinkTargetsObj() // container::XNameAccess uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { uno::Reference< beans::XPropertySet > xProp( ScUnoHelpFunctions::AnyToInterface( xCollection->getByName(aName) ), uno::UNO_QUERY ); if (xProp.is()) @@ -264,24 +256,24 @@ uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName) // return uno::Any(); } -uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames() { return xCollection->getElementNames(); } -sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) { return xCollection->hasByName(aName); } // container::XElementAccess -uno::Type SAL_CALL ScLinkTargetsObj::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL ScLinkTargetsObj::getElementType() { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SAL_CALL ScLinkTargetsObj::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetsObj::hasElements() { return xCollection->hasElements(); } diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 5d61fd03794b..4af1cc4be2a5 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -116,7 +116,6 @@ const EditTextObject* ScHeaderFooterContentObj::GetRightEditObject() const // XHeaderFooterContent uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getLeftText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XText> xInt(*mxLeftText, uno::UNO_QUERY); @@ -124,7 +123,6 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getLeftText() } uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getCenterText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XText> xInt(*mxCenterText, uno::UNO_QUERY); @@ -132,7 +130,6 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getCenterText() } uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getRightText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XText> xInt(*mxRightText, uno::UNO_QUERY); @@ -142,7 +139,7 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getRightText() // XUnoTunnel sal_Int64 SAL_CALL ScHeaderFooterContentObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -296,7 +293,6 @@ const SvxUnoText& ScHeaderFooterTextObj::GetUnoText() // XText uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScHeaderFooterTextCursor( this ); @@ -304,7 +300,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -324,7 +319,7 @@ void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) rData.nTotalPages = 99; } -OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScHeaderFooterTextObj::getString() { SolarMutexGuard aGuard; OUString aRet; @@ -368,7 +363,7 @@ OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException return aRet; } -void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) { SolarMutexGuard aGuard; @@ -380,7 +375,6 @@ void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(un void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XTextRange>& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -391,7 +385,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XT void SAL_CALL ScHeaderFooterTextObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -403,7 +396,6 @@ void SAL_CALL ScHeaderFooterTextObj::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; if ( xContent.is() && xRange.is() ) @@ -474,7 +466,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent( void SAL_CALL ScHeaderFooterTextObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xContent.is() ) @@ -492,7 +483,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent( mxUnoText->removeTextContent( xContent ); } -uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -500,7 +491,7 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() throw(uno: return mxUnoText->getText(); } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -508,7 +499,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() thro return mxUnoText->getStart(); } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -519,7 +510,6 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() throw( // XTextFieldsSupplier uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::getTextFields() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // all fields @@ -527,7 +517,6 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::ge } uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFieldMasters() - throw(uno::RuntimeException, std::exception) { // sowas gibts nicht im Calc (?) return nullptr; @@ -538,7 +527,6 @@ uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFi void SAL_CALL ScHeaderFooterTextObj::moveTextRange( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nParagraphs ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -549,7 +537,6 @@ void SAL_CALL ScHeaderFooterTextObj::moveTextRange( // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFooterTextObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -559,7 +546,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFooterTextObj::createEn // XElementAccess -uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -567,7 +554,7 @@ uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() throw(uno::RuntimeExc return mxUnoText->getElementType(); } -sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -596,13 +583,13 @@ ScCellTextCursor::~ScCellTextCursor() throw() // SvxUnoTextCursor methods reimplemented here to return the right objects: -uno::Reference<text::XText> SAL_CALL ScCellTextCursor::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScCellTextCursor::getText() { SolarMutexGuard aGuard; return &rTextObj; } -uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() { SolarMutexGuard aGuard; @@ -619,7 +606,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno return xRange; } -uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() { SolarMutexGuard aGuard; @@ -639,7 +626,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno:: // XUnoTunnel sal_Int64 SAL_CALL ScCellTextCursor::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -678,13 +665,13 @@ ScHeaderFooterTextCursor::~ScHeaderFooterTextCursor() throw() {}; // SvxUnoTextCursor methods reimplemented here to return the right objects: -uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextCursor::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextCursor::getText() { SolarMutexGuard aGuard; return rTextObj.get(); } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() { SolarMutexGuard aGuard; @@ -701,7 +688,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() t return xRange; } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() { SolarMutexGuard aGuard; @@ -721,7 +708,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() thr // XUnoTunnel sal_Int64 SAL_CALL ScHeaderFooterTextCursor::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -772,13 +759,13 @@ ScDrawTextCursor::~ScDrawTextCursor() throw() // SvxUnoTextCursor methods reimplemented here to return the right objects: -uno::Reference<text::XText> SAL_CALL ScDrawTextCursor::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScDrawTextCursor::getText() { SolarMutexGuard aGuard; return xParentText; } -uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() { SolarMutexGuard aGuard; @@ -795,7 +782,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno return xRange; } -uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() { SolarMutexGuard aGuard; @@ -815,7 +802,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno:: // XUnoTunnel sal_Int64 SAL_CALL ScDrawTextCursor::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index e080b0488558..5197da10b98e 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -123,7 +123,6 @@ void ScFormulaParserObj::SetCompilerFlags( ScCompiler& rCompiler ) const uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( const OUString& aFormula, const table::CellAddress& rReferencePos ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<sheet::FormulaToken> aRet; @@ -149,7 +148,6 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( OUString SAL_CALL ScFormulaParserObj::printFormula( const uno::Sequence<sheet::FormulaToken>& aTokens, const table::CellAddress& rReferencePos ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aRet; @@ -176,7 +174,6 @@ OUString SAL_CALL ScFormulaParserObj::printFormula( // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFormulaParserObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetFormulaParserMap() )); @@ -185,9 +182,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFormulaParserObj::getProperty void SAL_CALL ScFormulaParserObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aPropertyName == SC_UNO_COMPILEFAP ) @@ -243,8 +237,6 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue( } uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index 641d556feb79..c56f4e5deccb 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -43,7 +43,7 @@ uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() } uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & /* rSMgr */, SfxModelFlags _nCreationFlags ) throw( uno::Exception, std::exception ) + const uno::Reference< lang::XMultiServiceFactory > & /* rSMgr */, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; ScDLL::Init(); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 0a7b17577caf..11a76fcd020e 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -141,7 +141,6 @@ void ScViewPaneBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) } uno::Any SAL_CALL ScViewPaneBase::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( sheet::XViewPane ) SC_QUERYINTERFACE( sheet::XCellRangeReferrer ) @@ -153,7 +152,7 @@ uno::Any SAL_CALL ScViewPaneBase::queryInterface( const uno::Type& rType ) return uno::Any(); // OWeakObject is in derived objects } -uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -170,14 +169,13 @@ uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() throw(uno::RuntimeE } uno::Sequence<sal_Int8> SAL_CALL ScViewPaneBase::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XViewPane -sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() { SolarMutexGuard aGuard; if (pViewShell) @@ -195,7 +193,6 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeExc } void SAL_CALL ScViewPaneBase::setFirstVisibleColumn(sal_Int32 nFirstVisibleColumn) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pViewShell) @@ -211,7 +208,7 @@ void SAL_CALL ScViewPaneBase::setFirstVisibleColumn(sal_Int32 nFirstVisibleColum } } -sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() { SolarMutexGuard aGuard; if (pViewShell) @@ -229,7 +226,6 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeExcept } void SAL_CALL ScViewPaneBase::setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pViewShell) @@ -246,7 +242,6 @@ void SAL_CALL ScViewPaneBase::setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) } table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; table::CellRangeAddress aAdr; @@ -279,7 +274,6 @@ table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange() // XCellRangeSource uno::Reference<table::XCellRange> SAL_CALL ScViewPaneBase::getReferredCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pViewShell) @@ -317,7 +311,7 @@ namespace } // XFormLayerAccess -uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException, std::exception) +uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFormController( const uno::Reference< form::XForm >& Form ) { SolarMutexGuard aGuard; @@ -332,7 +326,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFor return xController; } -sal_Bool SAL_CALL ScViewPaneBase::isFormDesignMode( ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScViewPaneBase::isFormDesignMode( ) { SolarMutexGuard aGuard; @@ -345,7 +339,7 @@ sal_Bool SAL_CALL ScViewPaneBase::isFormDesignMode( ) throw (uno::RuntimeExcept return bIsFormDesignMode; } -void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool DesignMode ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool DesignMode ) { SolarMutexGuard aGuard; @@ -360,7 +354,6 @@ void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool DesignMode ) throw (un uno::Reference<awt::XControl> SAL_CALL ScViewPaneBase::getControl( const uno::Reference<awt::XControlModel>& xModel ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -422,7 +415,6 @@ ScViewPaneObj::~ScViewPaneObj() } uno::Any SAL_CALL ScViewPaneObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { // ScViewPaneBase has everything except OWeakObject @@ -476,7 +468,6 @@ ScTabViewObj::~ScTabViewObj() } uno::Any SAL_CALL ScTabViewObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( sheet::XSpreadsheetView ) SC_QUERYINTERFACE( sheet::XEnhancedMouseClickBroadcaster ) @@ -584,7 +575,7 @@ void ScTabViewObj::SheetChanged( bool bSameTabButMoved ) nPreviousTab = nNewTab; } -uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -624,7 +615,6 @@ uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() throw(uno::RuntimeExc } uno::Sequence<sal_Int8> SAL_CALL ScTabViewObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -676,8 +666,6 @@ static void lcl_ShowObject( ScTabViewShell& rViewSh, ScDrawView& rDrawView, SdrO } sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) - throw(lang::IllegalArgumentException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -860,7 +848,6 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) } uno::Any SAL_CALL ScTabViewObj::getSelection() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -970,7 +957,6 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); @@ -978,7 +964,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration // XIndexAccess -sal_Int32 SAL_CALL ScTabViewObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTabViewObj::getCount() { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -996,8 +982,6 @@ sal_Int32 SAL_CALL ScTabViewObj::getCount() throw(uno::RuntimeException, std::ex } uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XViewPane> xPane(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -1008,13 +992,13 @@ uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex ) // return uno::Any(); } -uno::Type SAL_CALL ScTabViewObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScTabViewObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XViewPane>::get(); } -sal_Bool SAL_CALL ScTabViewObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTabViewObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -1070,7 +1054,6 @@ ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) const } uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1085,7 +1068,6 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet() // support expand (but not replace) the active sheet void SAL_CALL ScTabViewObj::setActiveSheet( const uno::Reference<sheet::XSpreadsheet>& xActiveSheet ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1177,7 +1159,6 @@ bool ScTabViewObj::IsMouseListening() const } bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) - throw (::uno::RuntimeException) { bool bReturn(false); if ( e.Buttons == css::awt::MouseButton::LEFT ) @@ -1271,7 +1252,6 @@ bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) } bool ScTabViewObj::MouseReleased( const awt::MouseEvent& e ) - throw (uno::RuntimeException) { if ( e.Buttons == css::awt::MouseButton::LEFT ) { @@ -1366,7 +1346,6 @@ void ScTabViewObj::EndActivationListening() } void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference< awt::XEnhancedMouseClickHandler >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1377,7 +1356,6 @@ void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference< } void SAL_CALL ScTabViewObj::removeEnhancedMouseClickHandler( const uno::Reference< awt::XEnhancedMouseClickHandler >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = aMouseClickHandlers.size(); @@ -1395,7 +1373,6 @@ void SAL_CALL ScTabViewObj::removeEnhancedMouseClickHandler( const uno::Referenc // XActivationBroadcaster void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sheet::XActivationEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1406,7 +1383,6 @@ void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sh } void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference< sheet::XActivationEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = aActivationListeners.size(); @@ -1541,7 +1517,7 @@ void ScTabViewObj::SetZoomType(sal_Int16 aZoomType) } } -sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() { SolarMutexGuard aGuard; // wie Menue-Slot SID_WINDOW_SPLIT @@ -1557,7 +1533,7 @@ sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException, return false; } -sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() { SolarMutexGuard aGuard; // wie Menue-Slot SID_WINDOW_FIX @@ -1573,7 +1549,7 @@ sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException, st return false; } -sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1586,7 +1562,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() throw(uno::RuntimeExceptio return 0; } -sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical() { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1600,7 +1576,6 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical() throw(uno::RuntimeException, } sal_Int32 SAL_CALL ScTabViewObj::getSplitColumn() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1625,7 +1600,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitColumn() return 0; } -sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1648,7 +1623,6 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException, std: } void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1661,7 +1635,6 @@ void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixel } void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1688,7 +1661,6 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow void SAL_CALL ScTabViewObj::addSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener>& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aSelectionChgListeners.push_back( xListener ); @@ -1696,7 +1668,6 @@ void SAL_CALL ScTabViewObj::addSelectionChangeListener( void SAL_CALL ScTabViewObj::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; for (XSelectionChangeListenerVector::iterator it = aSelectionChgListeners.begin(); @@ -1770,7 +1741,6 @@ void ScTabViewObj::SelectionChanged() //! auch an der Applikation anbieten? uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1780,9 +1750,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInf void SAL_CALL ScTabViewObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1903,8 +1870,6 @@ void SAL_CALL ScTabViewObj::setPropertyValue( } uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -1963,10 +1928,6 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName void SAL_CALL ScTabViewObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; aPropertyChgListeners.push_back( xListener ); @@ -1974,9 +1935,6 @@ void SAL_CALL ScTabViewObj::addPropertyChangeListener( const OUString& /* aPrope void SAL_CALL ScTabViewObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener >& xListener ) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; for (XViewPropertyChangeListenerVector::iterator it = aPropertyChgListeners.begin(); @@ -1992,17 +1950,11 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const OUString& /* aPr void SAL_CALL ScTabViewObj::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference<beans::XVetoableChangeListener >& /* aListener */ ) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } void SAL_CALL ScTabViewObj::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference<beans::XVetoableChangeListener >& /* aListener */ ) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } @@ -2018,7 +1970,6 @@ void ScTabViewObj::VisAreaChanged() void SAL_CALL ScTabViewObj::startRangeSelection( const uno::Sequence<beans::PropertyValue>& aArguments ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -2059,7 +2010,7 @@ void SAL_CALL ScTabViewObj::startRangeSelection( } } -void SAL_CALL ScTabViewObj::abortRangeSelection() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScTabViewObj::abortRangeSelection() { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -2069,7 +2020,6 @@ void SAL_CALL ScTabViewObj::abortRangeSelection() throw(uno::RuntimeException, s void SAL_CALL ScTabViewObj::addRangeSelectionListener( const uno::Reference<sheet::XRangeSelectionListener>& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRangeSelListeners.push_back( xListener ); @@ -2077,7 +2027,6 @@ void SAL_CALL ScTabViewObj::addRangeSelectionListener( void SAL_CALL ScTabViewObj::removeRangeSelectionListener( const uno::Reference<sheet::XRangeSelectionListener>& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; for (XRangeSelectionListenerVector::iterator it = aRangeSelListeners.begin(); @@ -2093,7 +2042,6 @@ void SAL_CALL ScTabViewObj::removeRangeSelectionListener( void SAL_CALL ScTabViewObj::addRangeSelectionChangeListener( const uno::Reference<sheet::XRangeSelectionChangeListener>& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRangeChgListeners.push_back( xListener ); @@ -2101,7 +2049,6 @@ void SAL_CALL ScTabViewObj::addRangeSelectionChangeListener( void SAL_CALL ScTabViewObj::removeRangeSelectionChangeListener( const uno::Reference<sheet::XRangeSelectionChangeListener>& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; for (XRangeSelectionChangeListenerVector::iterator it = aRangeChgListeners.begin(); @@ -2155,19 +2102,17 @@ void ScTabViewObj::RangeSelChanged( const OUString& rText ) } // XServiceInfo -OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTabViewObj::getImplementationName() { return OUString( "ScTabViewObj" ); } sal_Bool SAL_CALL ScTabViewObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCTABVIEWOBJ_SERVICE, SCVIEWSETTINGS_SERVICE}; } @@ -2175,7 +2120,7 @@ uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() // XUnoTunnel sal_Int64 SAL_CALL ScTabViewObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -2206,8 +2151,6 @@ ScTabViewObj* ScTabViewObj::getImplementation(const uno::Reference<uno::XInterfa } css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL ScTabViewObj::getTransferable() - throw (css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScEditShell* pShell = dynamic_cast<ScEditShell*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); @@ -2234,9 +2177,6 @@ css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL ScTabViewObj::g } void SAL_CALL ScTabViewObj::insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) - throw (css::datatransfer::UnsupportedFlavorException, - css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScEditShell* pShell = dynamic_cast<ScEditShell*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); @@ -2276,7 +2216,6 @@ uno::Sequence<sal_Int32> toSequence(const ScMarkData::MarkedTabsType& rSelected) } uno::Sequence<sal_Int32> ScTabViewObj::getSelectedSheets() - throw (uno::RuntimeException, std::exception) { ScTabViewShell* pViewSh = GetViewShell(); if (!pViewSh) @@ -2312,7 +2251,6 @@ ScPreviewObj::~ScPreviewObj() } uno::Any ScPreviewObj::queryInterface(const uno::Type& rType) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE(sheet::XSelectedSheetsSupplier) return SfxBaseController::queryInterface(rType); @@ -2335,7 +2273,6 @@ void ScPreviewObj::Notify(SfxBroadcaster&, const SfxHint& rHint) } uno::Sequence<sal_Int32> ScPreviewObj::getSelectedSheets() - throw (uno::RuntimeException, std::exception) { ScPreview* p = mpViewShell ? mpViewShell->GetPreview() : nullptr; if (!p) diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 7d86430f811c..41f12cec6cfc 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -46,7 +46,7 @@ namespace vba { namespace excel { uno::Reference< sheet::XUnnamedDatabaseRanges > -GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) +GetUnnamedDataBaseRanges( ScDocShell* pShell ) { uno::Reference< frame::XModel > xModel; if ( pShell ) @@ -59,7 +59,7 @@ GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) // returns the XDatabaseRange for the autofilter on sheet (nSheet) // also populates sName with the name of range uno::Reference< sheet::XDatabaseRange > -GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeException ) +GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) { uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( GetUnnamedDataBaseRanges( pShell ), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XDatabaseRange > xDataBaseRange; @@ -77,7 +77,7 @@ GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeExc return xDataBaseRange; } -ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRange ) throw ( uno::RuntimeException ) +ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRange ) { ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange ); if ( !pScCellRangesBase ) @@ -88,7 +88,7 @@ ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRang } uno::Reference< XHelperInterface > -getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException, std::exception ) +getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) { uno::Reference< sheet::XSheetCellRange > xSheetRange( xRange, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheet > xSheet( xSheetRange->getSpreadsheet(), uno::UNO_SET_THROW ); @@ -110,26 +110,26 @@ class PasteCellsWarningReseter private: bool bInitialWarningState; /// @throws uno::RuntimeException - static uno::Reference< sheet::XGlobalSheetSettings > const & getGlobalSheetSettings() throw ( uno::RuntimeException ) + static uno::Reference< sheet::XGlobalSheetSettings > const & getGlobalSheetSettings() { static uno::Reference< sheet::XGlobalSheetSettings > xProps = sheet::GlobalSheetSettings::create( comphelper::getProcessComponentContext() ); return xProps; } /// @throws uno::RuntimeException - static bool getReplaceCellsWarning() throw ( uno::RuntimeException ) + static bool getReplaceCellsWarning() { return getGlobalSheetSettings()->getReplaceCellsWarning(); } /// @throws uno::RuntimeException - static void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException ) + static void setReplaceCellsWarning( bool bState ) { getGlobalSheetSettings()->setReplaceCellsWarning( bState ); } public: /// @throws uno::RuntimeException - PasteCellsWarningReseter() throw ( uno::RuntimeException ) + PasteCellsWarningReseter() { bInitialWarningState = getReplaceCellsWarning(); if ( bInitialWarningState ) @@ -254,7 +254,7 @@ getViewFrame( const uno::Reference< frame::XModel >& xModel ) } uno::Reference< XHelperInterface > -getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) throw ( uno::RuntimeException, std::exception ) +getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) { uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW ); OUString sCodeName; @@ -268,7 +268,7 @@ getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) thro } uno::Reference< XHelperInterface > -getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) throw ( uno::RuntimeException, std::exception ) +getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) { uno::Reference< container::XEnumerationAccess > xEnumAccess( xRanges, uno::UNO_QUERY_THROW ); uno::Reference< container::XEnumeration > xEnum = xEnumAccess->createEnumeration(); @@ -277,7 +277,7 @@ getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& x } uno::Reference< XHelperInterface > -getUnoSheetModuleObj( const uno::Reference< table::XCell >& xCell ) throw ( uno::RuntimeException, std::exception ) +getUnoSheetModuleObj( const uno::Reference< table::XCell >& xCell ) { uno::Reference< sheet::XSheetCellRange > xSheetRange( xCell, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheet > xSheet( xSheetRange->getSpreadsheet(), uno::UNO_SET_THROW ); @@ -285,7 +285,7 @@ getUnoSheetModuleObj( const uno::Reference< table::XCell >& xCell ) throw ( uno: } uno::Reference< XHelperInterface > -getUnoSheetModuleObj( const uno::Reference< frame::XModel >& xModel, SCTAB nTab ) throw ( uno::RuntimeException, std::exception ) +getUnoSheetModuleObj( const uno::Reference< frame::XModel >& xModel, SCTAB nTab ) { uno::Reference< sheet::XSpreadsheetDocument > xDoc( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xSheets( xDoc->getSheets(), uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index cd17fede7ae0..7fc8f4da5f66 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -48,23 +48,23 @@ ScTabViewShell* getCurrentBestViewShell( const css::uno::Reference< css::uno::XC SfxViewFrame* getViewFrame( const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException -css::uno::Reference< css::sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( css::uno::RuntimeException ); +css::uno::Reference< css::sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ); /// @throws css::uno::RuntimeException -css::uno::Reference< css::sheet::XDatabaseRange > GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( css::uno::RuntimeException ); +css::uno::Reference< css::sheet::XDatabaseRange > GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ); /// @throws css::uno::RuntimeException -css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet ) throw ( css::uno::RuntimeException, std::exception ); +css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet ); /// @throws css::uno::RuntimeException -css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges ) throw ( css::uno::RuntimeException, std::exception ); +css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges ); /// @throws css::uno::RuntimeException -css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCellRange >& xRange ) throw ( css::uno::RuntimeException, std::exception ); +css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCellRange >& xRange ); /// @throws css::uno::RuntimeException -css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCell >& xCell ) throw ( css::uno::RuntimeException, std::exception ); +css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCell >& xCell ); /// @throws css::uno::RuntimeException -css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::frame::XModel >& xModel, SCTAB nTab ) throw ( css::uno::RuntimeException, std::exception ); +css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::frame::XModel >& xModel, SCTAB nTab ); /// @throws css::uno::RuntimeException -ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException ); +ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ); void setUpDocumentModules( const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xDoc ); class ScVbaCellRangeAccess @@ -77,7 +77,7 @@ public: // by default will throw if unsuccessful. /// @throws css::uno::RuntimeException template < typename ImplObject > - ImplObject* getImplFromDocModuleWrapper( const css::uno::Reference< css::uno::XInterface >& rxWrapperIf, bool bThrow = true ) throw (css::uno::RuntimeException) + ImplObject* getImplFromDocModuleWrapper( const css::uno::Reference< css::uno::XInterface >& rxWrapperIf, bool bThrow = true ) { ImplObject* pObj = nullptr; css::uno::Reference< css::lang::XUnoTunnel > xTunnel( rxWrapperIf, css::uno::UNO_QUERY ); diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index a55a99c80987..e4b17f1016cd 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -141,21 +141,21 @@ ScVbaApplication::~ScVbaApplication() } OUString SAL_CALL -ScVbaApplication::getExactName( const OUString& aApproximateName ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::getExactName( const OUString& aApproximateName ) { uno::Reference< beans::XExactName > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getExactName( aApproximateName ); } uno::Reference< beans::XIntrospectionAccess > SAL_CALL -ScVbaApplication::getIntrospection() throw(css::uno::RuntimeException, std::exception) +ScVbaApplication::getIntrospection() { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getIntrospection(); } uno::Any SAL_CALL -ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) { /* When calling the functions directly at the Application object, no runtime errors are thrown, but the error is inserted into the return value. */ @@ -173,35 +173,35 @@ ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno } void SAL_CALL -ScVbaApplication::setValue( const OUString& PropertyName, const uno::Any& Value ) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaApplication::setValue( const OUString& PropertyName, const uno::Any& Value ) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); xWSF->setValue( PropertyName, Value ); } uno::Any SAL_CALL -ScVbaApplication::getValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) +ScVbaApplication::getValue( const OUString& PropertyName ) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getValue( PropertyName ); } sal_Bool SAL_CALL -ScVbaApplication::hasMethod( const OUString& Name ) throw(uno::RuntimeException, std::exception) +ScVbaApplication::hasMethod( const OUString& Name ) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->hasMethod( Name ); } sal_Bool SAL_CALL -ScVbaApplication::hasProperty( const OUString& Name ) throw(uno::RuntimeException, std::exception) +ScVbaApplication::hasProperty( const OUString& Name ) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->hasProperty( Name ); } uno::Reference< excel::XWorkbook > -ScVbaApplication::getActiveWorkbook() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getActiveWorkbook() { uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ), uno::UNO_SET_THROW ); uno::Reference< excel::XWorkbook > xWorkbook( getVBADocument( xModel ), uno::UNO_QUERY ); @@ -211,7 +211,7 @@ ScVbaApplication::getActiveWorkbook() throw (uno::RuntimeException, std::excepti } uno::Reference< excel::XWorkbook > SAL_CALL -ScVbaApplication::getThisWorkbook() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getThisWorkbook() { uno::Reference< frame::XModel > xModel( getThisExcelDoc( mxContext ), uno::UNO_SET_THROW ); uno::Reference< excel::XWorkbook > xWorkbook( getVBADocument( xModel ), uno::UNO_QUERY ); @@ -221,13 +221,13 @@ ScVbaApplication::getThisWorkbook() throw (uno::RuntimeException, std::exception } uno::Reference< XAssistant > SAL_CALL -ScVbaApplication::getAssistant() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getAssistant() { return uno::Reference< XAssistant >( new ScVbaAssistant( this, mxContext ) ); } uno::Any SAL_CALL -ScVbaApplication::getSelection() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getSelection() { uno::Reference< frame::XModel > xModel( getCurrentDocument() ); @@ -288,7 +288,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XRange > -ScVbaApplication::getActiveCell() throw (uno::RuntimeException, std::exception ) +ScVbaApplication::getActiveCell() { uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW ); uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW); @@ -305,7 +305,7 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaApplication::International( sal_Int32 /*Index*/ ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::International( sal_Int32 /*Index*/ ) { // complete stub for now // #TODO flesh out some of the Indices we could handle @@ -314,7 +314,7 @@ ScVbaApplication::International( sal_Int32 /*Index*/ ) throw (uno::RuntimeExcept } uno::Any SAL_CALL -ScVbaApplication::Workbooks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Workbooks( const uno::Any& aIndex ) { uno::Reference< XCollection > xWorkBooks( new ScVbaWorkbooks( this, mxContext ) ); if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) @@ -327,20 +327,20 @@ ScVbaApplication::Workbooks( const uno::Any& aIndex ) throw (uno::RuntimeExcepti } uno::Any SAL_CALL -ScVbaApplication::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Worksheets( const uno::Any& aIndex ) { uno::Reference< excel::XWorkbook > xWorkbook( getActiveWorkbook(), uno::UNO_SET_THROW ); return xWorkbook->Worksheets( aIndex ); } uno::Any SAL_CALL -ScVbaApplication::WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::WorksheetFunction( ) { return uno::makeAny( uno::Reference< script::XInvocation >( new ScVbaWSFunction( this, mxContext ) ) ); } uno::Any SAL_CALL -ScVbaApplication::Evaluate( const OUString& Name ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Evaluate( const OUString& Name ) { // #TODO Evaluate allows other things to be evaluated, e.g. functions // I think ( like SIN(3) etc. ) need to investigate that @@ -350,7 +350,7 @@ ScVbaApplication::Evaluate( const OUString& Name ) throw (uno::RuntimeException, } uno::Any -ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Dialogs( const uno::Any &aIndex ) { uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( this ), mxContext, getCurrentDocument() ) ); if( !aIndex.hasValue() ) @@ -359,7 +359,7 @@ ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException } uno::Reference< excel::XWindow > SAL_CALL -ScVbaApplication::getActiveWindow() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getActiveWindow() { uno::Reference< frame::XModel > xModel = getCurrentDocument(); uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW ); @@ -369,7 +369,7 @@ ScVbaApplication::getActiveWindow() throw (uno::RuntimeException, std::exception } uno::Any SAL_CALL -ScVbaApplication::getCutCopyMode() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getCutCopyMode() { //# FIXME TODO, implementation uno::Any result; @@ -378,19 +378,19 @@ ScVbaApplication::getCutCopyMode() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaApplication::setCutCopyMode( const uno::Any& /* _cutcopymode */ ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setCutCopyMode( const uno::Any& /* _cutcopymode */ ) { //# FIXME TODO, implementation } uno::Any SAL_CALL -ScVbaApplication::getStatusBar() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getStatusBar() { return uno::makeAny( !getDisplayStatusBar() ); } void SAL_CALL -ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) { OUString sText; bool bDefault = false; @@ -418,7 +418,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime } ::sal_Int32 SAL_CALL -ScVbaApplication::getCalculation() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getCalculation() { // TODO: in Excel, this is an application-wide setting uno::Reference<sheet::XCalculatable> xCalc(getCurrentDocument(), uno::UNO_QUERY_THROW); @@ -429,7 +429,7 @@ ScVbaApplication::getCalculation() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) { // TODO: in Excel, this is an application-wide setting uno::Reference< sheet::XCalculatable > xCalc(getCurrentDocument(), uno::UNO_QUERY_THROW); @@ -446,7 +446,7 @@ ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) throw (uno::Runtime } uno::Any SAL_CALL -ScVbaApplication::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Windows( const uno::Any& aIndex ) { uno::Reference< excel::XWindows > xWindows( new ScVbaWindows( this, mxContext ) ); if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) @@ -454,7 +454,7 @@ ScVbaApplication::Windows( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return uno::Any( xWindows->Item( aIndex, uno::Any() ) ); } void SAL_CALL -ScVbaApplication::wait( double time ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::wait( double time ) { StarBASIC* pBasic = SfxApplication::GetBasic(); SbxArrayRef aArgs = new SbxArray; @@ -473,14 +473,14 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException, std::excepti } uno::Any SAL_CALL -ScVbaApplication::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) { uno::Reference< excel::XRange > xVbRange = ScVbaRange::ApplicationRange( mxContext, Cell1, Cell2 ); return uno::makeAny( xVbRange ); } uno::Any SAL_CALL -ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException, std::exception ) +ScVbaApplication::Names( const css::uno::Any& aIndex ) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW ); @@ -496,7 +496,7 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep } uno::Reference< excel::XWorksheet > SAL_CALL -ScVbaApplication::getActiveSheet() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getActiveSheet() { uno::Reference< excel::XWorksheet > result; uno::Reference< excel::XWorkbook > xWorkbook( getActiveWorkbook(), uno::UNO_QUERY ); @@ -530,7 +530,7 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException, std::exception) * by test excel, it seems Scroll no effect. ??? *******************************************************************************/ void SAL_CALL -ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) { //test Scroll is a boolean bool bScroll = false; @@ -627,7 +627,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro } sal_Int32 SAL_CALL -ScVbaApplication::getCursor() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getCursor() { PointerStyle nPointerStyle = getPointerStyle(getCurrentDocument()); @@ -647,7 +647,7 @@ ScVbaApplication::getCursor() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setCursor( sal_Int32 _cursor ) { try { @@ -689,7 +689,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException, s // #TODO perhaps we should switch the return type depending of the filter // type, e.g. return Calc for Calc and Excel if it's an imported doc OUString SAL_CALL -ScVbaApplication::getName() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getName() { return OUString("Microsoft Excel" ); } @@ -701,44 +701,44 @@ ScVbaApplication::getName() throw (uno::RuntimeException, std::exception) // error message thrown by OpenOffice void SAL_CALL -ScVbaApplication::setDisplayAlerts(sal_Bool displayAlerts) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setDisplayAlerts(sal_Bool displayAlerts) { mrAppSettings.mbDisplayAlerts = displayAlerts; } sal_Bool SAL_CALL -ScVbaApplication::getDisplayAlerts() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getDisplayAlerts() { return mrAppSettings.mbDisplayAlerts; } void SAL_CALL -ScVbaApplication::setEnableEvents(sal_Bool bEnable) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setEnableEvents(sal_Bool bEnable) { mrAppSettings.mbEnableEvents = bEnable; } sal_Bool SAL_CALL -ScVbaApplication::getEnableEvents() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getEnableEvents() { return mrAppSettings.mbEnableEvents; } void SAL_CALL -ScVbaApplication::setEnableCancelKey(sal_Bool bEnable) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setEnableCancelKey(sal_Bool bEnable) { // Stub, does nothing mrAppSettings.mbEnableCancelKey = bEnable; } sal_Bool SAL_CALL -ScVbaApplication::getEnableCancelKey() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getEnableCancelKey() { return mrAppSettings.mbEnableCancelKey; } sal_Bool SAL_CALL -ScVbaApplication::getDisplayFullScreen() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getDisplayFullScreen() { SfxViewShell* pShell = excel::getCurrentBestViewShell( mxContext ); if ( pShell ) @@ -747,7 +747,7 @@ ScVbaApplication::getDisplayFullScreen() throw (uno::RuntimeException, std::exc } void SAL_CALL -ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) { // #FIXME calling ScViewUtil::SetFullScreen( *pShell, bSet ); // directly results in a strange crash, using dispatch instead @@ -756,7 +756,7 @@ ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) throw (uno::RuntimeExce } sal_Bool SAL_CALL -ScVbaApplication::getDisplayScrollBars() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getDisplayScrollBars() { ScTabViewShell* pShell = excel::getCurrentBestViewShell( mxContext ); if ( pShell ) @@ -767,7 +767,7 @@ ScVbaApplication::getDisplayScrollBars() throw (uno::RuntimeException, std::exc } void SAL_CALL -ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) { // use uno here as it does all he repainting etc. magic uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -777,49 +777,49 @@ ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeExce } sal_Bool SAL_CALL -ScVbaApplication::getDisplayExcel4Menus() throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::getDisplayExcel4Menus() { return mrAppSettings.mbExcel4Menus; } void SAL_CALL -ScVbaApplication::setDisplayExcel4Menus( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::setDisplayExcel4Menus( sal_Bool bSet ) { mrAppSettings.mbExcel4Menus = bSet; } sal_Bool SAL_CALL -ScVbaApplication::getDisplayNoteIndicator() throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::getDisplayNoteIndicator() { return mrAppSettings.mbDisplayNoteIndicator; } void SAL_CALL -ScVbaApplication::setDisplayNoteIndicator( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::setDisplayNoteIndicator( sal_Bool bSet ) { mrAppSettings.mbDisplayNoteIndicator = bSet; } sal_Bool SAL_CALL -ScVbaApplication::getShowWindowsInTaskbar() throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::getShowWindowsInTaskbar() { return mrAppSettings.mbShowWindowsInTaskbar; } void SAL_CALL -ScVbaApplication::setShowWindowsInTaskbar( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::setShowWindowsInTaskbar( sal_Bool bSet ) { mrAppSettings.mbShowWindowsInTaskbar = bSet; } sal_Bool SAL_CALL -ScVbaApplication::getIteration() throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::getIteration() { return SC_MOD()->GetDocOptions().IsIter(); } void SAL_CALL -ScVbaApplication::setIteration( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) +ScVbaApplication::setIteration( sal_Bool bSet ) { uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); @@ -843,7 +843,7 @@ ScVbaApplication::setIteration( sal_Bool bSet ) throw (css::uno::RuntimeExceptio } void SAL_CALL -ScVbaApplication::Calculate() throw( script::BasicErrorException , uno::RuntimeException, std::exception ) +ScVbaApplication::Calculate() { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XCalculatable > xCalculatable( getCurrentDocument(), uno::UNO_QUERY_THROW ); @@ -851,7 +851,7 @@ ScVbaApplication::Calculate() throw( script::BasicErrorException , uno::Runtime } /// @throws uno::RuntimeException -static uno::Reference< util::XPathSettings > const & lcl_getPathSettingsService( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) +static uno::Reference< util::XPathSettings > const & lcl_getPathSettingsService( const uno::Reference< uno::XComponentContext >& xContext ) { static uno::Reference< util::XPathSettings > xPathSettings; if ( !xPathSettings.is() ) @@ -861,7 +861,7 @@ static uno::Reference< util::XPathSettings > const & lcl_getPathSettingsService( return xPathSettings; } -OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw (uno::RuntimeException, std::exception) +OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) { OUString sRetPath; uno::Reference< util::XPathSettings > xProps = lcl_getPathSettingsService( mxContext ); @@ -884,7 +884,7 @@ OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw (un } void SAL_CALL -ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) { uno::Reference< util::XPathSettings > xProps = lcl_getPathSettingsService( mxContext ); OUString aURL; @@ -893,25 +893,25 @@ ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) throw (u } OUString SAL_CALL -ScVbaApplication::getDefaultFilePath() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getDefaultFilePath() { return getOfficePath( "Work"); } OUString SAL_CALL -ScVbaApplication::getLibraryPath() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getLibraryPath() { return getOfficePath( "Basic"); } OUString SAL_CALL -ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getTemplatesPath() { return getOfficePath( "Template"); } OUString SAL_CALL -ScVbaApplication::getPathSeparator() throw (uno::RuntimeException, std::exception) +ScVbaApplication::getPathSeparator() { return OUString( (sal_Unicode) SAL_PATHDELIMITER ); } @@ -928,7 +928,6 @@ typedef ::std::list< ScRange > ListOfScRange; @throws uno::RuntimeException */ void lclAddToListOfScRange( ListOfScRange& rList, const uno::Any& rArg ) - throw (script::BasicErrorException, uno::RuntimeException) { if( rArg.hasValue() ) { @@ -1035,7 +1034,6 @@ void lclJoinRanges( ListOfScRange& rList ) @throws uno::RuntimeException */ void lclIntersectRanges( ListOfScRange& rList, const uno::Any& rArg ) - throw (script::BasicErrorException, uno::RuntimeException) { // extract the ranges from the passed argument, will throw on invalid data ListOfScRange aList2; @@ -1078,7 +1076,7 @@ void lclIntersectRanges( ListOfScRange& rList, const uno::Any& rArg ) uno::Reference< excel::XRange > lclCreateVbaRange( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, - const ListOfScRange& rList ) throw (uno::RuntimeException, std::exception) + const ListOfScRange& rList ) { ScDocShell* pDocShell = excel::getDocShell( rxModel ); if( !pDocShell ) throw uno::RuntimeException(); @@ -1111,7 +1109,6 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect( const uno::Any& rArg19, const uno::Any& rArg20, const uno::Any& rArg21, const uno::Any& rArg22, const uno::Any& rArg23, const uno::Any& rArg24, const uno::Any& rArg25, const uno::Any& rArg26, const uno::Any& rArg27, const uno::Any& rArg28, const uno::Any& rArg29, const uno::Any& rArg30 ) - throw (script::BasicErrorException, uno::RuntimeException, std::exception) { if( !rArg1.is() || !rArg2.is() ) DebugHelper::basicexception( ERRCODE_BASIC_BAD_PARAMETER, OUString() ); @@ -1165,7 +1162,6 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union( const uno::Any& rArg19, const uno::Any& rArg20, const uno::Any& rArg21, const uno::Any& rArg22, const uno::Any& rArg23, const uno::Any& rArg24, const uno::Any& rArg25, const uno::Any& rArg26, const uno::Any& rArg27, const uno::Any& rArg28, const uno::Any& rArg29, const uno::Any& rArg30 ) - throw (script::BasicErrorException, uno::RuntimeException, std::exception) { if( !rArg1.is() || !rArg2.is() ) DebugHelper::basicexception( ERRCODE_BASIC_BAD_PARAMETER, OUString() ); @@ -1210,14 +1206,14 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union( } double -ScVbaApplication::InchesToPoints( double Inches ) throw (uno::RuntimeException, std::exception ) +ScVbaApplication::InchesToPoints( double Inches ) { double result = ( Inches * 72.0 ); return result; } void -ScVbaApplication::Volatile( const uno::Any& aVolatile ) throw ( uno::RuntimeException, std::exception ) +ScVbaApplication::Volatile( const uno::Any& aVolatile ) { bool bVolatile = true; aVolatile >>= bVolatile; @@ -1235,7 +1231,6 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile ) throw ( uno::RuntimeExc sal_Bool SAL_CALL ScVbaApplication::getDisplayFormulaBar() - throw (css::uno::RuntimeException, std::exception) { bool bRes = false; ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext ); @@ -1255,7 +1250,6 @@ ScVbaApplication::getDisplayFormulaBar() void SAL_CALL ScVbaApplication::setDisplayFormulaBar( sal_Bool _displayformulabar ) - throw(css::uno::RuntimeException, std::exception) { ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext ); if ( pViewShell && ( _displayformulabar != getDisplayFormulaBar() ) ) @@ -1267,7 +1261,7 @@ ScVbaApplication::setDisplayFormulaBar( sal_Bool _displayformulabar ) } uno::Any SAL_CALL -ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException, std::exception ) +ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) { StarBASIC* pBasic = SfxApplication::GetBasic(); SbMethod* pMeth = static_cast<SbMethod*>(pBasic->GetRtl()->Find( "FuncCaller", SbxClassType::Method )); @@ -1283,13 +1277,13 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep } uno::Reference< frame::XModel > -ScVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException) +ScVbaApplication::getCurrentDocument() { return getCurrentExcelDoc(mxContext); } uno::Any SAL_CALL -ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaApplication::MenuBars( const uno::Any& aIndex ) { uno::Reference< XCommandBars > xCommandBars( CommandBars( uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xMenuBars( new ScVbaMenuBars( this, mxContext, xCommandBars ) ); @@ -1301,7 +1295,7 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return uno::Any( xMenuBars ); } -void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Procedure ) { try { @@ -1316,7 +1310,7 @@ void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Proc } } -void SAL_CALL ScVbaApplication::Undo() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaApplication::Undo() { uno::Reference< frame::XModel > xModel( getThisExcelDoc( mxContext ), uno::UNO_SET_THROW ); diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 1b74af2d7492..cc995d0b471f 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -38,10 +38,10 @@ private: ScVbaAppSettings& mrAppSettings; /// @throws css::uno::RuntimeException - OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException, std::exception ); + OUString getOfficePath( const OUString& sPath ); protected: - virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() override; public: explicit ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext ); @@ -51,85 +51,83 @@ public: static bool getDocumentEventsEnabled(); // XExactName - virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) 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& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) 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& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) 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& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) override; + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) override; + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) override; + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) override; + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) override; // XApplication - virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayAlerts() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCalculation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCalculation( ::sal_Int32 _calculation ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw ( css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayFormulaBar() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayFormulaBar(sal_Bool _displayformulabar) - throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStatusBar() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException, std::exception) override; - 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 void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnableCancelKey( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) override; - - virtual sal_Bool SAL_CALL getDisplayFullScreen() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayFullScreen( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayScrollBars() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayScrollBars( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayExcel4Menus() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayExcel4Menus( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - - virtual sal_Bool SAL_CALL getDisplayNoteIndicator() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayNoteIndicator( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getShowWindowsInTaskbar() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShowWindowsInTaskbar( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getIteration() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setIteration( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL wait( double time ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL GoTo( const css::uno::Any& Reference, const css::uno::Any& Scroll ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL InchesToPoints( double InchesToPoints ) throw (css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) override; + virtual OUString SAL_CALL getDefaultFilePath() override; + virtual OUString SAL_CALL getPathSeparator() override; + virtual OUString SAL_CALL getLibraryPath() override; + virtual OUString SAL_CALL getTemplatesPath() override; + + virtual OUString SAL_CALL getName() override; + virtual sal_Bool SAL_CALL getDisplayAlerts() override; + virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) override; + virtual ::sal_Int32 SAL_CALL getCalculation() override; + virtual void SAL_CALL setCalculation( ::sal_Int32 _calculation ) override; + virtual css::uno::Any SAL_CALL getSelection() override; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() override; + virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() override; + virtual sal_Bool SAL_CALL getDisplayFormulaBar() override; + virtual void SAL_CALL setDisplayFormulaBar(sal_Bool _displayformulabar) override; + + virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() override; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() override; + virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) override; + virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL WorksheetFunction( ) override; + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) override; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) override; + virtual css::uno::Any SAL_CALL getCutCopyMode() override; + virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) override; + virtual css::uno::Any SAL_CALL getStatusBar() override; + virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) override; + virtual ::sal_Int32 SAL_CALL getCursor() override; + virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) override; + virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) override; + virtual sal_Bool SAL_CALL getEnableEvents() override; + virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) override; + virtual sal_Bool SAL_CALL getEnableCancelKey() override; + virtual void SAL_CALL setEnableCancelKey( sal_Bool bEnable ) override; + + virtual sal_Bool SAL_CALL getDisplayFullScreen() override; + virtual void SAL_CALL setDisplayFullScreen( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL getDisplayScrollBars() override; + virtual void SAL_CALL setDisplayScrollBars( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL getDisplayExcel4Menus() override; + virtual void SAL_CALL setDisplayExcel4Menus( sal_Bool bSet ) override; + + virtual sal_Bool SAL_CALL getDisplayNoteIndicator() override; + virtual void SAL_CALL setDisplayNoteIndicator( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL getShowWindowsInTaskbar() override; + virtual void SAL_CALL setShowWindowsInTaskbar( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL getIteration() override; + virtual void SAL_CALL setIteration( sal_Bool bSet ) override; + + virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL wait( double time ) override; + virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) override; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL GoTo( const css::uno::Any& Reference, const css::uno::Any& Scroll ) override; + virtual void SAL_CALL Calculate() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override; + virtual double SAL_CALL InchesToPoints( double InchesToPoints ) override; + virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) override; + virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL Undo() override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 28a114ec4002..13b586d232b4 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -41,59 +41,59 @@ ScVbaAssistant::~ScVbaAssistant() { } -sal_Bool SAL_CALL ScVbaAssistant::getVisible() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaAssistant::getVisible() { return m_bIsVisible; } -void SAL_CALL ScVbaAssistant::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAssistant::setVisible( sal_Bool bVisible ) { m_bIsVisible = bVisible; } -sal_Bool SAL_CALL ScVbaAssistant::getOn() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaAssistant::getOn() { return false; } -void SAL_CALL ScVbaAssistant::setOn( sal_Bool bOn ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAssistant::setOn( sal_Bool bOn ) { setVisible( bOn ); } ::sal_Int32 SAL_CALL -ScVbaAssistant::getTop() throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::getTop() { return m_nPointsTop; } void SAL_CALL -ScVbaAssistant::setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::setTop( ::sal_Int32 _top ) { m_nPointsTop = _top; } ::sal_Int32 SAL_CALL -ScVbaAssistant::getLeft() throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::getLeft() { return m_nPointsLeft; } void SAL_CALL -ScVbaAssistant::setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::setLeft( ::sal_Int32 _left ) { m_nPointsLeft = _left; } ::sal_Int32 SAL_CALL -ScVbaAssistant::getAnimation() throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::getAnimation() { return m_nAnimation; } void SAL_CALL -ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException, std::exception) +ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) { m_nAnimation = _animation; } OUString SAL_CALL -ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaAssistant::Name( ) { return m_sName; } diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index fea786bd24d5..d6d95a6c01c7 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.hxx @@ -42,18 +42,18 @@ public: ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ); virtual ~ScVbaAssistant() override; // XAssistant - virtual sal_Bool SAL_CALL getOn() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOn( sal_Bool _on ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getAnimation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getOn() override; + virtual void SAL_CALL setOn( sal_Bool _on ) override; + virtual sal_Bool SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( sal_Bool _visible ) override; + virtual ::sal_Int32 SAL_CALL getTop() override; + virtual void SAL_CALL setTop( ::sal_Int32 _top ) override; + virtual ::sal_Int32 SAL_CALL getLeft() override; + virtual void SAL_CALL setLeft( ::sal_Int32 _left ) override; + virtual ::sal_Int32 SAL_CALL getAnimation() override; + virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) override; - virtual OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL Name( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 061f698781a3..517a5d707389 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -46,12 +46,12 @@ class EnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit EnumWrapper( 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++ ); @@ -62,7 +62,7 @@ public: } uno::Reference< excel::XAxis > -ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( uno::RuntimeException, script::BasicErrorException ) +ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) @@ -116,8 +116,8 @@ public: } } - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override { return mCoordinates.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 mCoordinates.size(); } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { try { @@ -133,11 +133,11 @@ public: } } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType() override { return cppu::UnoType<excel::XAxis>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return ( mCoordinates.size() > 0 ); } @@ -156,19 +156,19 @@ ScVbaAxes::ScVbaAxes( const uno::Reference< XHelperInterface >& xParent,const un } uno::Type SAL_CALL -ScVbaAxes::getElementType() throw (css::uno::RuntimeException) +ScVbaAxes::getElementType() { return cppu::UnoType<excel::XAxes>::get(); } uno::Reference< container::XEnumeration > SAL_CALL -ScVbaAxes::createEnumeration() throw (css::uno::RuntimeException) +ScVbaAxes::createEnumeration() { return new EnumWrapper( m_xIndexAccess ); } uno::Any SAL_CALL -ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) throw (css::script::BasicErrorException, css::uno::RuntimeException) +ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) { // #TODO map the possible index combinations to a container::XIndexAccess wrapper impl // using a vector of valid std::pair maybe? diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx index e638eded5db8..b0d8fa85a6f5 100644 --- a/sc/source/ui/vba/vbaaxes.hxx +++ b/sc/source/ui/vba/vbaaxes.hxx @@ -30,17 +30,17 @@ class ScVbaAxes : public ScVbaAxes_BASE public: ScVbaAxes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< ov::excel::XChart >& xChart ); // 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; // XCollection - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) override; virtual css::uno::Any createCollectionObject(const css::uno::Any&) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; /// @throws css::uno::RuntimeException /// @throws css::script::BasicErrorException - static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ); + static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ); }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAAXES_HXX diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 1f1349b05f3b..9d21e52baed0 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -34,7 +34,7 @@ const OUString AUTOORIGIN("AutoOrigin"); const OUString VBA_MIN("Max"); const OUString VBA_MAX("Min"); ScVbaChart* -ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) +ScVbaAxis::getChartPtr() { ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() ); if ( !pChart ) @@ -43,7 +43,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) } bool -ScVbaAxis::isValueAxis() throw( script::BasicErrorException ) +ScVbaAxis::isValueAxis() { if ( getType() == xlCategory ) { @@ -61,14 +61,14 @@ ScVbaAxis::ScVbaAxis( const uno::Reference< XHelperInterface >& xParent,const un } void SAL_CALL -ScVbaAxis::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::Delete( ) { uno::Reference< lang::XComponent > xComponent( mxPropertySet, uno::UNO_QUERY_THROW ); xComponent->dispose(); } uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL -ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getAxisTitle( ) { uno::Reference< excel::XAxisTitle > xAxisTitle; try @@ -101,20 +101,20 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); } ::sal_Int32 SAL_CALL -ScVbaAxis::getDisplayUnit( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getDisplayUnit( ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); return -1; } void SAL_CALL -ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) { try { @@ -147,7 +147,7 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio } } ::sal_Int32 SAL_CALL -ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getCrosses( ) { sal_Int32 nCrosses = xlAxisCrossesCustom; try @@ -181,7 +181,7 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept } void SAL_CALL -ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setCrossesAt( double _fCrossesAt ) { try { @@ -196,7 +196,7 @@ ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException } double SAL_CALL -ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getCrossesAt( ) { double fCrosses = 0.0; try @@ -211,19 +211,19 @@ ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaAxis::setType( ::sal_Int32 _nType ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setType( ::sal_Int32 _nType ) { mnType = _nType; } ::sal_Int32 SAL_CALL -ScVbaAxis::getType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getType( ) { return mnType; } void SAL_CALL -ScVbaAxis::setHasTitle( sal_Bool _bHasTitle ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setHasTitle( sal_Bool _bHasTitle ) { try { @@ -249,7 +249,7 @@ ScVbaAxis::setHasTitle( sal_Bool _bHasTitle ) throw (script::BasicErrorException } sal_Bool SAL_CALL -ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getHasTitle( ) { bool bHasTitle = false; try @@ -276,7 +276,7 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep } void SAL_CALL -ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMinorUnit( double _fMinorUnit ) { try { @@ -290,7 +290,7 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException } double SAL_CALL -ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMinorUnit( ) { double fMinor = 1.0; try @@ -306,7 +306,7 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaAxis::setMinorUnitIsAuto( sal_Bool _bMinorUnitIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMinorUnitIsAuto( sal_Bool _bMinorUnitIsAuto ) { try { @@ -320,7 +320,7 @@ ScVbaAxis::setMinorUnitIsAuto( sal_Bool _bMinorUnitIsAuto ) throw (script::Basic } sal_Bool SAL_CALL -ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMinorUnitIsAuto( ) { bool bIsAuto = false; try @@ -338,20 +338,20 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti } void SAL_CALL -ScVbaAxis::setReversePlotOrder( sal_Bool /*ReversePlotOrder*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setReversePlotOrder( sal_Bool /*ReversePlotOrder*/ ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); } sal_Bool SAL_CALL -ScVbaAxis::getReversePlotOrder( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getReversePlotOrder( ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); return false; } void SAL_CALL -ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMajorUnit( double _fMajorUnit ) { try { @@ -367,7 +367,7 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException } double SAL_CALL -ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMajorUnit( ) { double fMax = 1.0; try @@ -383,7 +383,7 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaAxis::setMajorUnitIsAuto( sal_Bool _bMajorUnitIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMajorUnitIsAuto( sal_Bool _bMajorUnitIsAuto ) { try { @@ -399,7 +399,7 @@ ScVbaAxis::setMajorUnitIsAuto( sal_Bool _bMajorUnitIsAuto ) throw (script::Basic } sal_Bool SAL_CALL -ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMajorUnitIsAuto( ) { bool bIsAuto = false; try @@ -417,7 +417,7 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti } void SAL_CALL -ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMaximumScale( double _fMaximumScale ) { try { @@ -433,7 +433,7 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc } double SAL_CALL -ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMaximumScale( ) { double fMax = 1.0; try @@ -452,7 +452,7 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE } void SAL_CALL -ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) { try { @@ -467,7 +467,7 @@ ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) throw (script: } sal_Bool SAL_CALL -ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMaximumScaleIsAuto( ) { bool bIsAuto = false; try @@ -483,7 +483,7 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru } void SAL_CALL -ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMinimumScale( double _fMinimumScale ) { try { @@ -497,7 +497,7 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc } double SAL_CALL -ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMinimumScale( ) { double fMin = 0.0; try @@ -513,7 +513,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE } void SAL_CALL -ScVbaAxis::setMinimumScaleIsAuto( sal_Bool _bMinimumScaleIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setMinimumScaleIsAuto( sal_Bool _bMinimumScaleIsAuto ) { try { @@ -529,7 +529,7 @@ ScVbaAxis::setMinimumScaleIsAuto( sal_Bool _bMinimumScaleIsAuto ) throw (script: } sal_Bool SAL_CALL -ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getMinimumScaleIsAuto( ) { bool bIsAuto = false; try @@ -547,13 +547,13 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru } ::sal_Int32 SAL_CALL -ScVbaAxis::getAxisGroup( ) throw (uno::RuntimeException, std::exception) +ScVbaAxis::getAxisGroup( ) { return mnGroup; } void SAL_CALL -ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) { try { @@ -580,7 +580,7 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce } ::sal_Int32 SAL_CALL -ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaAxis::getScaleType( ) { sal_Int32 nScaleType = xlScaleLinear; try @@ -603,36 +603,36 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce } double SAL_CALL -ScVbaAxis::getHeight( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaAxis::getHeight( ) { return oShapeHelper->getHeight(); } -void SAL_CALL ScVbaAxis::setHeight( double height ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAxis::setHeight( double height ) { oShapeHelper->setHeight( height ); } -double SAL_CALL ScVbaAxis::getWidth( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +double SAL_CALL ScVbaAxis::getWidth( ) { return oShapeHelper->getWidth( ); } -void SAL_CALL ScVbaAxis::setWidth( double width ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAxis::setWidth( double width ) { oShapeHelper->setWidth( width ); } -double SAL_CALL ScVbaAxis::getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +double SAL_CALL ScVbaAxis::getTop( ) { return oShapeHelper->getTop( ); } -void SAL_CALL ScVbaAxis::setTop( double top ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAxis::setTop( double top ) { oShapeHelper->setTop( top ); } -double SAL_CALL ScVbaAxis::getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +double SAL_CALL ScVbaAxis::getLeft( ) { return oShapeHelper->getLeft( ); } -void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaAxis::setLeft( double left ) { oShapeHelper->setLeft( left ); } diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index 12eccc8dd785..88004a31514b 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -33,55 +33,55 @@ class ScVbaAxis : public ScVbaAxis_BASE sal_Int32 mnGroup; bool bCrossesAreCustomized; /// @throws css::uno::RuntimeException - ScVbaChart* getChartPtr() throw( css::uno::RuntimeException ); + ScVbaChart* getChartPtr(); /// @throws css::script::BasicErrorException - bool isValueAxis() throw( css::script::BasicErrorException ); + bool isValueAxis(); std::unique_ptr<ov::ShapeHelper> oShapeHelper; public: ScVbaAxis( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup ); // Methods - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL getAxisTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayUnit( ::sal_Int32 DisplayUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDisplayUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCrosses( ::sal_Int32 Crosses ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCrosses( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCrossesAt( double CrossesAt ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getCrossesAt( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setType( ::sal_Int32 Type ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getType( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHasTitle( sal_Bool HasTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getHasTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinorUnit( double MinorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getMinorUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinorUnitIsAuto( sal_Bool MinorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMinorUnitIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReversePlotOrder( sal_Bool ReversePlotOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getReversePlotOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMajorUnit( double MajorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getMajorUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMajorUnitIsAuto( sal_Bool MajorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMajorUnitIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaximumScale( double MaximumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getMaximumScale( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaximumScaleIsAuto( sal_Bool MaximumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMaximumScaleIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinimumScale( double MinimumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getMinimumScale( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinimumScaleIsAuto( sal_Bool MinimumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMinimumScaleIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getAxisGroup( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScaleType( ::sal_Int32 ScaleType ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getScaleType( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getHeight( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeight( double height ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getWidth( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWidth( double width ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTop( double top ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual css::uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL getAxisTitle( ) override; + virtual void SAL_CALL setDisplayUnit( ::sal_Int32 DisplayUnit ) override; + virtual ::sal_Int32 SAL_CALL getDisplayUnit( ) override; + virtual void SAL_CALL setCrosses( ::sal_Int32 Crosses ) override; + virtual ::sal_Int32 SAL_CALL getCrosses( ) override; + virtual void SAL_CALL setCrossesAt( double CrossesAt ) override; + virtual double SAL_CALL getCrossesAt( ) override; + virtual void SAL_CALL setType( ::sal_Int32 Type ) override; + virtual ::sal_Int32 SAL_CALL getType( ) override; + virtual void SAL_CALL setHasTitle( sal_Bool HasTitle ) override; + virtual sal_Bool SAL_CALL getHasTitle( ) override; + virtual void SAL_CALL setMinorUnit( double MinorUnit ) override; + virtual double SAL_CALL getMinorUnit( ) override; + virtual void SAL_CALL setMinorUnitIsAuto( sal_Bool MinorUnitIsAuto ) override; + virtual sal_Bool SAL_CALL getMinorUnitIsAuto( ) override; + virtual void SAL_CALL setReversePlotOrder( sal_Bool ReversePlotOrder ) override; + virtual sal_Bool SAL_CALL getReversePlotOrder( ) override; + virtual void SAL_CALL setMajorUnit( double MajorUnit ) override; + virtual double SAL_CALL getMajorUnit( ) override; + virtual void SAL_CALL setMajorUnitIsAuto( sal_Bool MajorUnitIsAuto ) override; + virtual sal_Bool SAL_CALL getMajorUnitIsAuto( ) override; + virtual void SAL_CALL setMaximumScale( double MaximumScale ) override; + virtual double SAL_CALL getMaximumScale( ) override; + virtual void SAL_CALL setMaximumScaleIsAuto( sal_Bool MaximumScaleIsAuto ) override; + virtual sal_Bool SAL_CALL getMaximumScaleIsAuto( ) override; + virtual void SAL_CALL setMinimumScale( double MinimumScale ) override; + virtual double SAL_CALL getMinimumScale( ) override; + virtual void SAL_CALL setMinimumScaleIsAuto( sal_Bool MinimumScaleIsAuto ) override; + virtual sal_Bool SAL_CALL getMinimumScaleIsAuto( ) override; + virtual ::sal_Int32 SAL_CALL getAxisGroup( ) override; + virtual void SAL_CALL setScaleType( ::sal_Int32 ScaleType ) override; + virtual ::sal_Int32 SAL_CALL getScaleType( ) override; + virtual double SAL_CALL getHeight( ) override; + virtual void SAL_CALL setHeight( double height ) override; + virtual double SAL_CALL getWidth( ) override; + virtual void SAL_CALL setWidth( double width ) override; + virtual double SAL_CALL getTop( ) override; + virtual void SAL_CALL setTop( double top ) override; + virtual double SAL_CALL getLeft( ) override; + virtual void SAL_CALL setLeft( double left ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index c761f43dc993..3737005e9ee9 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -160,14 +160,14 @@ public: ScVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, ScVbaPalette& rPalette) : ScVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} // XBorder - uno::Any SAL_CALL getColor() throw (uno::RuntimeException, std::exception) override + uno::Any SAL_CALL getColor() override { table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); throw uno::RuntimeException("No Implementation available" ); } - void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) override + void SAL_CALL setColor( const uno::Any& _color ) override { sal_Int32 nColor = 0; _color >>= nColor; @@ -181,7 +181,7 @@ public: throw uno::RuntimeException("No Implementation available" ); } - uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) override + uno::Any SAL_CALL getColorIndex() override { sal_Int32 nColor = 0; XLRGBToOORGB( getColor() ) >>= nColor; @@ -201,7 +201,7 @@ public: return uno::makeAny(nIndex); } - void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) override + void SAL_CALL setColorIndex( const uno::Any& _colorindex ) override { sal_Int32 nColor = 0; _colorindex >>= nColor; @@ -209,7 +209,7 @@ public: nColor = 1; setColor( OORGBToXLRGB( m_Palette.getPalette()->getByIndex( --nColor ) ) ); } - uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) override + uno::Any SAL_CALL getWeight() override { table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) @@ -231,7 +231,7 @@ public: } throw uno::RuntimeException("Method failed" ); } - void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) override + void SAL_CALL setWeight( const uno::Any& _weight ) override { sal_Int32 nWeight = 0; _weight >>= nWeight; @@ -261,12 +261,12 @@ public: throw uno::RuntimeException("Method failed" ); } - uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) override + uno::Any SAL_CALL getLineStyle() override { // always return xlContinuous; return uno::makeAny( XlLineStyle::xlContinuous ); } - 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 excel line styles @@ -320,11 +320,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 ); @@ -335,11 +335,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<excel::XBorder>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } @@ -357,12 +357,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++ ); @@ -379,7 +379,7 @@ ScVbaBorders::ScVbaBorders( const uno::Reference< XHelperInterface >& xParent, c } uno::Reference< container::XEnumeration > -ScVbaBorders::createEnumeration() throw (uno::RuntimeException) +ScVbaBorders::createEnumeration() { return new RangeBorderEnumWrapper( m_xIndexAccess ); } @@ -391,18 +391,18 @@ ScVbaBorders::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaBorders::getElementType() throw (uno::RuntimeException) +ScVbaBorders::getElementType() { return cppu::UnoType<excel::XBorders>::get(); } uno::Any -ScVbaBorders::getItemByIntIndex( const sal_Int32 nIndex ) throw (uno::RuntimeException) +ScVbaBorders::getItemByIntIndex( const sal_Int32 nIndex ) { return createCollectionObject( m_xIndexAccess->getByIndex( nIndex ) ); } -uno::Any SAL_CALL ScVbaBorders::getColor() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaBorders::getColor() { sal_Int32 count = getCount(); uno::Any color; @@ -422,7 +422,7 @@ uno::Any SAL_CALL ScVbaBorders::getColor() throw (uno::RuntimeException, std::ex } return color; } -void SAL_CALL ScVbaBorders::setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaBorders::setColor( const uno::Any& _color ) { sal_Int32 count = getCount(); for( sal_Int32 i = 0; i < count ; i++ ) @@ -431,7 +431,7 @@ void SAL_CALL ScVbaBorders::setColor( const uno::Any& _color ) throw (uno::Runti xBorder->setColor( _color ); } } -uno::Any SAL_CALL ScVbaBorders::getColorIndex() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaBorders::getColorIndex() { sal_Int32 count = getCount(); uno::Any nColorIndex; @@ -451,7 +451,7 @@ uno::Any SAL_CALL ScVbaBorders::getColorIndex() throw (uno::RuntimeException, st } return nColorIndex; } -void SAL_CALL ScVbaBorders::setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaBorders::setColorIndex( const uno::Any& _colorindex ) { sal_Int32 count = getCount(); for( sal_Int32 i = 0; i < count ; i++ ) @@ -483,7 +483,7 @@ lcl_areAllLineWidthsSame( const table::TableBorder& maTableBorder, bool bIsCell return bRes; } -uno::Any SAL_CALL ScVbaBorders::getLineStyle() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaBorders::getLineStyle() { table::TableBorder aTableBorder; m_xProps->getPropertyValue( sTableBorder ) >>= aTableBorder; @@ -503,7 +503,7 @@ uno::Any SAL_CALL ScVbaBorders::getLineStyle() throw (uno::RuntimeException, std } return uno::makeAny( aLinestyle ); } -void SAL_CALL ScVbaBorders::setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaBorders::setLineStyle( const uno::Any& _linestyle ) { sal_Int32 count = getCount(); for( sal_Int32 i = 0; i < count ; i++ ) @@ -512,7 +512,7 @@ void SAL_CALL ScVbaBorders::setLineStyle( const uno::Any& _linestyle ) throw (un xBorder->setLineStyle( _linestyle ); } } -uno::Any SAL_CALL ScVbaBorders::getWeight() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaBorders::getWeight() { sal_Int32 count = getCount(); uno::Any weight; @@ -532,7 +532,7 @@ uno::Any SAL_CALL ScVbaBorders::getWeight() throw (uno::RuntimeException, std::e } return weight; } -void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) { sal_Int32 count = getCount(); for( sal_Int32 i = 0; i < count ; i++ ) diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index 61076363174d..dafcbe525cf5 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -32,29 +32,29 @@ class ScVbaPalette; class ScVbaBorders : public ScVbaBorders_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; bool bRangeIsSingleCell; css::uno::Reference< css::beans::XPropertySet > m_xProps; public: ScVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, ScVbaPalette& 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; // XBorders // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getLineStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getColor() override; + virtual void SAL_CALL setColor( const css::uno::Any& _color ) override; + virtual css::uno::Any SAL_CALL getColorIndex() override; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override; + virtual css::uno::Any SAL_CALL getLineStyle() override; + virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) override; + virtual css::uno::Any SAL_CALL getWeight() override; + virtual void SAL_CALL setWeight( const css::uno::Any& ) override; // xxxxBASE virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index 747878e082d6..10ce85c79f12 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -24,7 +24,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< text::XSimpleText>& xRange,const css::uno::Any& Start, const css::uno::Any& Length, bool Replace ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette), nLength(-1), nStart(1), bReplace( Replace ) +ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< text::XSimpleText>& xRange,const css::uno::Any& Start, const css::uno::Any& Length, bool Replace ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette), nLength(-1), nStart(1), bReplace( Replace ) { Start >>= nStart; if ( nStart < 1 ) @@ -49,41 +49,41 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar } OUString SAL_CALL -ScVbaCharacters::getCaption() throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::getCaption() { return m_xTextRange->getString(); } void SAL_CALL -ScVbaCharacters::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::setCaption( const OUString& _caption ) { m_xTextRange->setString( _caption ); } ::sal_Int32 SAL_CALL -ScVbaCharacters::getCount() throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::getCount() { return getCaption().getLength(); } OUString SAL_CALL -ScVbaCharacters::getText() throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::getText() { return getCaption(); } void SAL_CALL -ScVbaCharacters::setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::setText( const OUString& _text ) { setCaption( _text ); } uno::Reference< excel::XFont > SAL_CALL -ScVbaCharacters::getFont() throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::getFont() { uno::Reference< beans::XPropertySet > xProps( m_xTextRange, uno::UNO_QUERY_THROW ); return uno::Reference< excel::XFont >( new ScVbaFont( this, mxContext, m_aPalette, xProps ) ); } void SAL_CALL -ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) { // #TODO #FIXME needs implementation, or can't be done? throw uno::RuntimeException("Not Implemented" ); @@ -91,13 +91,13 @@ ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) thro // Methods void SAL_CALL -ScVbaCharacters::Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::Insert( const OUString& rString ) { m_xSimpleText->insertString( m_xTextRange, rString, bReplace ); } void SAL_CALL -ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException, std::exception) +ScVbaCharacters::Delete( ) { // #FIXME #TODO is this a bit suspect?, I wonder should the contents // of the cell be deleted from the parent ( range ) diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 552b472fe073..8dc1acd22f91 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -40,20 +40,20 @@ private: public: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - ScVbaCharacters( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const css::uno::Reference< css::text::XSimpleText >& xRange, const css::uno::Any& Start, const css::uno::Any& Length, bool bReplace = false ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + ScVbaCharacters( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const css::uno::Reference< css::text::XSimpleText >& xRange, const css::uno::Any& Start, const css::uno::Any& Length, bool bReplace = false ); // Attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; - 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::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() override; + virtual void SAL_CALL setCaption( const OUString& _caption ) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual OUString SAL_CALL getText() override; + virtual void SAL_CALL setText( const OUString& _text ) override; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() override; + virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) override; // Methods - virtual void SAL_CALL Insert( const OUString& String ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Insert( const OUString& String ) override; + virtual void SAL_CALL Delete( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 3919969749d9..e8b93b474614 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -78,7 +78,7 @@ ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xPar } OUString SAL_CALL -ScVbaChart::getName() throw (css::uno::RuntimeException, std::exception) +ScVbaChart::getName() { OUString sName; uno::Reference< beans::XPropertySet > xProps( mxChartDocument, uno::UNO_QUERY_THROW ); @@ -93,13 +93,13 @@ ScVbaChart::getName() throw (css::uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaChart::SeriesCollection(const uno::Any&) throw (uno::RuntimeException, std::exception) +ScVbaChart::SeriesCollection(const uno::Any&) { return uno::Any(); } ::sal_Int32 SAL_CALL -ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorException, std::exception) +ScVbaChart::getChartType() { sal_Int32 nChartType = -1; try @@ -218,7 +218,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce } void SAL_CALL -ScVbaChart::setChartType( ::sal_Int32 _nChartType ) throw ( uno::RuntimeException, script::BasicErrorException, std::exception) +ScVbaChart::setChartType( ::sal_Int32 _nChartType ) { try { @@ -543,7 +543,7 @@ try } void SAL_CALL -ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::Activate() { // #TODO how are Chart sheets handled ( I know we don't even consider // them in the worksheets/sheets collections ), but.....??? @@ -558,7 +558,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException } void SAL_CALL -ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& _xCalcRange, const css::uno::Any& _aPlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& _xCalcRange, const css::uno::Any& _aPlotBy ) { try { @@ -634,13 +634,13 @@ ScVbaChart::getDefaultSeriesDescriptions( sal_Int32 _nCount ) } void -ScVbaChart::setDefaultChartType() throw ( script::BasicErrorException ) +ScVbaChart::setDefaultChartType() { setChartType( xlColumnClustered ); } void -ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) { try { @@ -665,7 +665,7 @@ ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorExce } ::sal_Int32 SAL_CALL -ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::getPlotBy( ) { try { @@ -687,7 +687,7 @@ ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeExcept } void -ScVbaChart::setDiagram( const OUString& _sDiagramType ) throw( script::BasicErrorException ) +ScVbaChart::setDiagram( const OUString& _sDiagramType ) { try { @@ -705,19 +705,19 @@ ScVbaChart::setDiagram( const OUString& _sDiagramType ) throw( script::BasicErro // #TODO find out why we have Location/getLocation? there is afaik no // Location property, just a Location function for the Chart object sal_Int32 SAL_CALL -ScVbaChart::Location() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaChart::Location() { return getLocation(); } sal_Int32 SAL_CALL -ScVbaChart::getLocation() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaChart::getLocation() { return -1; } void SAL_CALL -ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ ) { // Helper api just stubs out the code <shrug> // #TODO come back and make sense out of this @@ -805,7 +805,7 @@ ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ ) } sal_Bool SAL_CALL -ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::getHasTitle( ) { bool bHasTitle = false; try @@ -820,7 +820,7 @@ ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaChart::setHasTitle( sal_Bool bTitle ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::setHasTitle( sal_Bool bTitle ) { try { @@ -834,7 +834,7 @@ ScVbaChart::setHasTitle( sal_Bool bTitle ) throw (script::BasicErrorException, u } sal_Bool SAL_CALL -ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::getHasLegend( ) { bool bHasLegend = false; try @@ -849,7 +849,7 @@ ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeExc } void SAL_CALL -ScVbaChart::setHasLegend( sal_Bool bLegend ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::setHasLegend( sal_Bool bLegend ) { try { @@ -862,7 +862,7 @@ ScVbaChart::setHasLegend( sal_Bool bLegend ) throw (script::BasicErrorException, } uno::Reference< excel::XChartTitle > SAL_CALL -ScVbaChart::getChartTitle( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::getChartTitle( ) { uno::Reference< drawing::XShape > xTitleShape = mxChartDocument->getTitle(); // #TODO check parent @@ -870,7 +870,7 @@ ScVbaChart::getChartTitle( ) throw (script::BasicErrorException, uno::RuntimeEx } uno::Any SAL_CALL -ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup ) { // mmm chart probably is the parent, #TODO check parent uno::Reference< excel::XAxes > xAxes = new ScVbaAxes( this, mxContext, this ); @@ -879,7 +879,7 @@ ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup ) throw (scrip return xAxes->Item( Type, AxisGroup ); } bool -ScVbaChart::is3D() throw ( uno::RuntimeException ) +ScVbaChart::is3D() { // #TODO perhaps provide limited Debughelper functionality bool is3d = false; @@ -888,7 +888,7 @@ ScVbaChart::is3D() throw ( uno::RuntimeException ) } sal_Int32 -ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( uno::RuntimeException ) +ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) { // #TODO perhaps provide limited Debughelper functionality if (isStacked()) @@ -903,7 +903,7 @@ ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, } bool -ScVbaChart::isStacked() throw ( uno::RuntimeException ) +ScVbaChart::isStacked() { // #TODO perhaps provide limited Debughelper functionality bool bStacked = false; @@ -912,7 +912,7 @@ ScVbaChart::isStacked() throw ( uno::RuntimeException ) } bool -ScVbaChart::is100PercentStacked() throw ( uno::RuntimeException ) +ScVbaChart::is100PercentStacked() { // #TODO perhaps provide limited Debughelper functionality bool b100Percent = false; @@ -921,7 +921,7 @@ ScVbaChart::is100PercentStacked() throw ( uno::RuntimeException ) } sal_Int32 -ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) throw ( script::BasicErrorException ) +ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) { try { @@ -953,7 +953,7 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _ } sal_Int32 -ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (script::BasicErrorException) +ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) { try { @@ -977,7 +977,7 @@ ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw } bool -ScVbaChart::hasMarkers() throw ( script::BasicErrorException ) +ScVbaChart::hasMarkers() { bool bHasMarkers = false; try @@ -995,7 +995,7 @@ ScVbaChart::hasMarkers() throw ( script::BasicErrorException ) } sal_Int32 -ScVbaChart::getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( script::BasicErrorException ) +ScVbaChart::getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) { if (hasMarkers()) return _nWithMarkers; @@ -1013,7 +1013,7 @@ ScVbaChart::assignDiagramAttributes() } uno::Reference< beans::XPropertySet > -ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException, uno::RuntimeException ) +ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) { assignDiagramAttributes(); uno::Reference< beans::XPropertySet > xAxisProps; diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index 359b5b10cf80..5c4e3171b786 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -51,23 +51,23 @@ friend class ScVbaAxis; static css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); /// @throws css::script::BasicErrorException - void setDefaultChartType()throw ( css::script::BasicErrorException ) ; + void setDefaultChartType() ; /// @throws css::script::BasicErrorException - void setDiagram( const OUString& _sDiagramType) throw( css::script::BasicErrorException ); + void setDiagram( const OUString& _sDiagramType); /// @throws css::uno::RuntimeException - bool isStacked() throw ( css::uno::RuntimeException ); + bool isStacked(); /// @throws css::uno::RuntimeException - bool is100PercentStacked() throw ( css::uno::RuntimeException ); + bool is100PercentStacked(); /// @throws css::uno::RuntimeException - sal_Int32 getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( css::uno::RuntimeException ); + sal_Int32 getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ); /// @throws css::script::BasicErrorException - sal_Int32 getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) throw ( css::script::BasicErrorException ); + sal_Int32 getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked); /// @throws css::script::BasicErrorException - sal_Int32 getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (css::script::BasicErrorException); + sal_Int32 getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown); /// @throws css::script::BasicErrorException - bool hasMarkers() throw ( css::script::BasicErrorException ); + bool hasMarkers(); /// @throws css::script::BasicErrorException - sal_Int32 getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( css::script::BasicErrorException ); + sal_Int32 getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers); void assignDiagramAttributes(); public: ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const css::uno::Reference< css::table::XTableChart >& _xTableChart ); @@ -75,28 +75,28 @@ public: // Non-interface const css::uno::Reference< css::beans::XPropertySet >& xDiagramPropertySet() const { return mxDiagramPropertySet; } /// @throws css::uno::RuntimeException - bool is3D() throw ( css::uno::RuntimeException ); + bool is3D(); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup); // Methods - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override; - virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override; - virtual void SAL_CALL Activate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& range, const css::uno::Any& PlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL Location( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getLocation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLocation( ::sal_Int32 where, const css::uno::Any& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getHasTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHasTitle( sal_Bool bTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getHasLegend( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHasLegend( sal_Bool bLegend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPlotBy( ::sal_Int32 xlRowCol ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getPlotBy( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) override; + virtual ::sal_Int32 SAL_CALL getChartType() override; + virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) override; + virtual void SAL_CALL Activate( ) override; + virtual void SAL_CALL setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& range, const css::uno::Any& PlotBy ) override; + virtual ::sal_Int32 SAL_CALL Location( ) override; + virtual ::sal_Int32 SAL_CALL getLocation( ) override; + virtual void SAL_CALL setLocation( ::sal_Int32 where, const css::uno::Any& Name ) override; + virtual sal_Bool SAL_CALL getHasTitle( ) override; + virtual void SAL_CALL setHasTitle( sal_Bool bTitle ) override; + virtual sal_Bool SAL_CALL getHasLegend( ) override; + virtual void SAL_CALL setHasLegend( sal_Bool bLegend ) override; + virtual void SAL_CALL setPlotBy( ::sal_Int32 xlRowCol ) override; + virtual ::sal_Int32 SAL_CALL getPlotBy( ) override; + virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) override; + virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 3d9778a4f1ad..eec8cdd29c27 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -49,7 +49,7 @@ OUString const & ScVbaChartObject::getPersistName() } uno::Reference< drawing::XShape > -ScVbaChartObject::setShape() throw ( script::BasicErrorException ) +ScVbaChartObject::setShape() { try { @@ -78,21 +78,19 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException ) } void SAL_CALL -ScVbaChartObject::setName( const OUString& sName ) throw (css::uno::RuntimeException, std::exception) +ScVbaChartObject::setName( const OUString& sName ) { xNamedShape->setName(sName); } OUString SAL_CALL -ScVbaChartObject::getName() throw (css::uno::RuntimeException, std::exception) +ScVbaChartObject::getName() { return xNamedShape->getName(); } void SAL_CALL ScVbaChartObject::Delete() - throw (css::script::BasicErrorException, - css::uno::RuntimeException, std::exception) { // parent of this object is sheet uno::Reference< excel::XWorksheet > xParent( getParent(), uno::UNO_QUERY_THROW ); @@ -105,7 +103,7 @@ ScVbaChartObject::Delete() } void -ScVbaChartObject::Activate() throw ( script::BasicErrorException ) +ScVbaChartObject::Activate() { try { @@ -123,7 +121,7 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException ) } uno::Reference< excel::XChart > SAL_CALL -ScVbaChartObject::getChart() throw (css::uno::RuntimeException, std::exception) +ScVbaChartObject::getChart() { return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart ); } diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index aa6d7f1f5fb9..6bce2f4b54c8 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -45,15 +45,15 @@ class ScVbaChartObject : public ChartObjectImpl_BASE css::uno::Reference< css::container::XNamed > xNamedShape; OUString const & getPersistName(); /// @throws css::script::BasicErrorException - css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException ); + css::uno::Reference< css::drawing::XShape > setShape(); public: ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); - 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 css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (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() override; + virtual void SAL_CALL setName( const OUString& sName ) override; + virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() override; + virtual void SAL_CALL Delete() override; /// @throws css::script::BasicErrorException - void Activate() throw ( css::script::BasicErrorException ); + void Activate(); // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index 6989795debbf..9e5f5c025714 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -41,8 +41,8 @@ class ChartObjectEnumerationImpl : public EnumerationHelperImpl public: /// @throws uno::RuntimeException - ChartObjectEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier, const uno::Reference< XHelperInterface >& _xParent ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( _xParent, xContext, xEnumeration ), xDrawPageSupplier( _xDrawPageSupplier ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + ChartObjectEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier, const uno::Reference< XHelperInterface >& _xParent ) : EnumerationHelperImpl( _xParent, xContext, xEnumeration ), xDrawPageSupplier( _xDrawPageSupplier ) {} + virtual uno::Any SAL_CALL nextElement( ) override { uno::Any ret; @@ -87,7 +87,7 @@ ScVbaChartObjects::removeByName(const OUString& _sChartName) } uno::Sequence< OUString > -ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ) +ScVbaChartObjects::getChartObjectNames() { uno::Sequence< OUString > sChartNames; try @@ -127,7 +127,7 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException // XChartObjects uno::Any SAL_CALL -ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight ) throw (script::BasicErrorException, std::exception) +ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight ) { try { @@ -150,7 +150,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight } return aNULL(); } -void SAL_CALL ScVbaChartObjects::Delete( ) throw (script::BasicErrorException, std::exception) +void SAL_CALL ScVbaChartObjects::Delete( ) { uno::Sequence< OUString > sChartNames = xTableCharts->getElementNames(); sal_Int32 ncount = sChartNames.getLength(); @@ -161,7 +161,7 @@ void SAL_CALL ScVbaChartObjects::Delete( ) throw (script::BasicErrorException, // XEnumerationAccess uno::Reference< container::XEnumeration > -ScVbaChartObjects::createEnumeration() throw (uno::RuntimeException) +ScVbaChartObjects::createEnumeration() { css::uno::Reference< container::XEnumerationAccess > xEnumAccess( xTableCharts, uno::UNO_QUERY_THROW ); return new ChartObjectEnumerationImpl( mxContext, xEnumAccess->createEnumeration(), xDrawPageSupplier, getParent() /* sheet */); @@ -170,7 +170,7 @@ ScVbaChartObjects::createEnumeration() throw (uno::RuntimeException) // XElementAccess uno::Type -ScVbaChartObjects::getElementType() throw (uno::RuntimeException) +ScVbaChartObjects::getElementType() { return cppu::UnoType<excel::XChartObject>::get(); } diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index e62b1ab2634a..915df9d75003 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -42,16 +42,16 @@ public: ScVbaChartObjects( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableCharts >& _xTableCharts, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); /// @throws css::script::BasicErrorException - css::uno::Sequence< OUString > getChartObjectNames() throw( css::script::BasicErrorException ); + css::uno::Sequence< OUString > getChartObjectNames(); void removeByName(const OUString& _sChartName); // XChartObjects - virtual css::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (css::script::BasicErrorException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) override; + virtual void SAL_CALL Delete( ) override; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; // ChartObjects_BASE diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index 411a15abe0de..bc39a9c6b2dd 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -42,7 +42,7 @@ ScVbaComment::ScVbaComment( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, - const uno::Reference< table::XCellRange >& xRange ) throw( lang::IllegalArgumentException, uno::RuntimeException ) : + const uno::Reference< table::XCellRange >& xRange ) : ScVbaComment_BASE( xParent, xContext ), mxModel( xModel, uno::UNO_SET_THROW ), mxRange( xRange ) @@ -55,7 +55,7 @@ ScVbaComment::ScVbaComment( // private helper functions uno::Reference< sheet::XSheetAnnotation > SAL_CALL -ScVbaComment::getAnnotation() throw (uno::RuntimeException) +ScVbaComment::getAnnotation() { uno::Reference< table::XCell > xCell( mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSheetAnnotationAnchor > xAnnoAnchor( xCell, uno::UNO_QUERY_THROW ); @@ -63,7 +63,7 @@ ScVbaComment::getAnnotation() throw (uno::RuntimeException) } uno::Reference< sheet::XSheetAnnotations > SAL_CALL -ScVbaComment::getAnnotations() throw (uno::RuntimeException) +ScVbaComment::getAnnotations() { uno::Reference< sheet::XSheetCellRange > xSheetCellRange(mxRange, ::uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheet > xSheet = xSheetCellRange->getSpreadsheet(); @@ -73,7 +73,7 @@ ScVbaComment::getAnnotations() throw (uno::RuntimeException) } sal_Int32 SAL_CALL -ScVbaComment::getAnnotationIndex() throw (uno::RuntimeException) +ScVbaComment::getAnnotationIndex() { uno::Reference< sheet::XSheetAnnotations > xAnnos = getAnnotations(); table::CellAddress aAddress = getAnnotation()->getPosition(); @@ -98,7 +98,7 @@ ScVbaComment::getAnnotationIndex() throw (uno::RuntimeException) } uno::Reference< excel::XComment > SAL_CALL -ScVbaComment::getCommentByIndex( sal_Int32 Index ) throw (uno::RuntimeException) +ScVbaComment::getCommentByIndex( sal_Int32 Index ) { uno::Reference< container::XIndexAccess > xIndexAccess( getAnnotations(), uno::UNO_QUERY_THROW ); // parent is sheet ( parent of the range which is the parent of the comment ) @@ -110,19 +110,19 @@ ScVbaComment::getCommentByIndex( sal_Int32 Index ) throw (uno::RuntimeException) // public vba functions OUString SAL_CALL -ScVbaComment::getAuthor() throw (uno::RuntimeException, std::exception) +ScVbaComment::getAuthor() { return getAnnotation()->getAuthor(); } void SAL_CALL -ScVbaComment::setAuthor( const OUString& /*_author*/ ) throw (uno::RuntimeException, std::exception) +ScVbaComment::setAuthor( const OUString& /*_author*/ ) { // #TODO #FIXME implementation needed } uno::Reference< msforms::XShape > SAL_CALL -ScVbaComment::getShape() throw (uno::RuntimeException, std::exception) +ScVbaComment::getShape() { uno::Reference< sheet::XSheetAnnotationShapeSupplier > xAnnoShapeSupp( getAnnotation(), uno::UNO_QUERY_THROW ); uno::Reference< drawing::XShape > xAnnoShape( xAnnoShapeSupp->getAnnotationShape(), uno::UNO_SET_THROW ); @@ -133,39 +133,39 @@ ScVbaComment::getShape() throw (uno::RuntimeException, std::exception) } sal_Bool SAL_CALL -ScVbaComment::getVisible() throw (uno::RuntimeException, std::exception) +ScVbaComment::getVisible() { return getAnnotation()->getIsVisible(); } void SAL_CALL -ScVbaComment::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception) +ScVbaComment::setVisible( sal_Bool _visible ) { getAnnotation()->setIsVisible( _visible ); } void SAL_CALL -ScVbaComment::Delete() throw (uno::RuntimeException, std::exception) +ScVbaComment::Delete() { getAnnotations()->removeByIndex( getAnnotationIndex() ); } uno::Reference< excel::XComment > SAL_CALL -ScVbaComment::Next() throw (uno::RuntimeException, std::exception) +ScVbaComment::Next() { // index: uno = 0, vba = 1 return getCommentByIndex( getAnnotationIndex() + 2 ); } uno::Reference< excel::XComment > SAL_CALL -ScVbaComment::Previous() throw (uno::RuntimeException, std::exception) +ScVbaComment::Previous() { // index: uno = 0, vba = 1 return getCommentByIndex( getAnnotationIndex() ); } OUString SAL_CALL -ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::Any& Overwrite ) throw (uno::RuntimeException, std::exception) +ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::Any& Overwrite ) { OUString sText; aText >>= sText; diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index 5383a8501768..3ee4d4550e27 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -38,13 +38,13 @@ class ScVbaComment : public ScVbaComment_BASE private: /// @throws css::uno::RuntimeException - css::uno::Reference< css::sheet::XSheetAnnotation > SAL_CALL getAnnotation() throw (css::uno::RuntimeException); + css::uno::Reference< css::sheet::XSheetAnnotation > SAL_CALL getAnnotation(); /// @throws css::uno::RuntimeException - css::uno::Reference< css::sheet::XSheetAnnotations > SAL_CALL getAnnotations() throw (css::uno::RuntimeException); + css::uno::Reference< css::sheet::XSheetAnnotations > SAL_CALL getAnnotations(); /// @throws css::uno::RuntimeException - sal_Int32 SAL_CALL getAnnotationIndex() throw (css::uno::RuntimeException); + sal_Int32 SAL_CALL getAnnotationIndex(); /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XComment > SAL_CALL getCommentByIndex( sal_Int32 Index ) throw (css::uno::RuntimeException); + css::uno::Reference< ov::excel::XComment > SAL_CALL getCommentByIndex( sal_Int32 Index ); public: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException @@ -52,20 +52,20 @@ 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::table::XCellRange >& xRange ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + const css::uno::Reference< css::table::XCellRange >& xRange ); // Attributes - virtual OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAuthor( const OUString& _author ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAuthor() override; + virtual void SAL_CALL setAuthor( const OUString& _author ) override; + virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() override; + virtual sal_Bool SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( sal_Bool _visible ) override; // Methods - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete() override; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() override; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() override; + virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index 2f92dfff1f6e..b78cc4eacf68 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -46,12 +46,12 @@ public: 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 ) : + const uno::Reference< frame::XModel >& xModel ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel, uno::UNO_SET_THROW ) {} - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement() override { return AnnotationToComment( m_xEnumeration->nextElement(), m_xContext, mxModel ); } @@ -71,7 +71,7 @@ ScVbaComments::ScVbaComments( // public helper functions uno::Reference< container::XEnumeration > -ScVbaComments::createEnumeration() throw (uno::RuntimeException) +ScVbaComments::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return new CommentEnumeration( mxParent, mxContext, xEnumAccess->createEnumeration(), mxModel ); @@ -84,7 +84,7 @@ ScVbaComments::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaComments::getElementType() throw (uno::RuntimeException) +ScVbaComments::getElementType() { return cppu::UnoType<excel::XComment>::get(); } diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx index 9a7e7315d94a..a45ae2a96f12 100644 --- a/sc/source/ui/vba/vbacomments.hxx +++ b/sc/source/ui/vba/vbacomments.hxx @@ -37,8 +37,8 @@ public: 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; // ScVbaComments_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index 2fe01884caa4..17e2fc901c2b 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.cxx @@ -37,7 +37,7 @@ ScVbaCondition< Ifc... >::ScVbaCondition( const uno::Reference< XHelperInterfac template< typename... Ifc > sheet::ConditionOperator -ScVbaCondition< Ifc... >::retrieveAPIOperator( const uno::Any& _aOperator) throw ( script::BasicErrorException ) +ScVbaCondition< Ifc... >::retrieveAPIOperator( const uno::Any& _aOperator) { sheet::ConditionOperator aRetAPIOperator = sheet::ConditionOperator_NONE; sal_Int32 nOperator = 0; @@ -79,21 +79,21 @@ ScVbaCondition< Ifc... >::retrieveAPIOperator( const uno::Any& _aOperator) throw template< typename... Ifc > OUString -ScVbaCondition< Ifc... >::Formula1( ) throw ( script::BasicErrorException, uno::RuntimeException ) +ScVbaCondition< Ifc... >::Formula1( ) { return mxSheetCondition->getFormula1(); } template< typename... Ifc > OUString -ScVbaCondition< Ifc... >::Formula2( ) throw ( script::BasicErrorException, uno::RuntimeException ) +ScVbaCondition< Ifc... >::Formula2( ) { return mxSheetCondition->getFormula2(); } template< typename... Ifc > void -ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException ) +ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1) { OUString sFormula; if ( (_aFormula1 >>= sFormula )) @@ -107,7 +107,7 @@ ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1) throw ( scrip template< typename... Ifc > sal_Int32 -ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue) throw ( script::BasicErrorException ) +ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue) { sal_Int32 retvalue = -1; sheet::ConditionOperator aConditionalOperator = mxSheetCondition->getOperator(); diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx index d5346f2d8f50..bedd0424f161 100644 --- a/sc/source/ui/vba/vbacondition.hxx +++ b/sc/source/ui/vba/vbacondition.hxx @@ -34,15 +34,15 @@ public: ScVbaCondition( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition ); /// @throws css::script::BasicErrorException - static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator) throw ( css::script::BasicErrorException ); + static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator); - virtual OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE; - virtual OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE; + virtual OUString SAL_CALL Formula1( ) SAL_OVERRIDE; + virtual OUString SAL_CALL Formula2( ) SAL_OVERRIDE; /// @throws css::script::BasicErrorException - virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ); + virtual void setFormula1( const css::uno::Any& _aFormula1); /// @throws css::script::BasicErrorException - virtual sal_Int32 Operator(bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException ); - virtual sal_Int32 SAL_CALL Operator() throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE = 0; + virtual sal_Int32 Operator(bool _bIncludeFormulaValue); + virtual sal_Int32 SAL_CALL Operator() SAL_OVERRIDE = 0; }; #endif diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index 93460c20c95e..8ab7cafb0415 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -24,7 +24,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; uno::Any -ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException, std::exception) +ScVbaDialogs::Item( const uno::Any &aItem ) { sal_Int32 nIndex = 0; aItem >>= nIndex; diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index dc62a5af18fc..c9e9c657b2b7 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -34,7 +34,7 @@ public: ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): ScVbaDialogs_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/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 4ffb20e0c84c..0224d7f39d10 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -55,7 +55,7 @@ namespace { @throws lang::IllegalArgumentException @throws uno::RuntimeException */ -SCTAB lclGetTabFromArgs( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException, uno::RuntimeException) +SCTAB lclGetTabFromArgs( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) { VbaEventsHelperBase::checkArgument( rArgs, nIndex ); @@ -127,28 +127,28 @@ public: void stopControllerListening( const uno::Reference< frame::XController >& rxController ); // XTopWindowListener - virtual void SAL_CALL windowOpened( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosed( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMinimized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowNormalized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowActivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowDeactivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowOpened( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowClosing( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowClosed( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowMinimized( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowNormalized( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowActivated( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowDeactivated( const lang::EventObject& rEvent ) override; // XWindowListener - virtual void SAL_CALL windowResized( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMoved( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowShown( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowHidden( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized( const awt::WindowEvent& rEvent ) override; + virtual void SAL_CALL windowMoved( const awt::WindowEvent& rEvent ) override; + virtual void SAL_CALL windowShown( const lang::EventObject& rEvent ) override; + virtual void SAL_CALL windowHidden( const lang::EventObject& rEvent ) override; // XBorderResizeListener - virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& aNewSize ) override; // XChangesListener - virtual void SAL_CALL changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changesOccurred( const util::ChangesEvent& rEvent ) override; // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const lang::EventObject& rEvent ) override; private: /** Starts listening to the document model. */ @@ -250,27 +250,27 @@ void ScVbaEventListener::stopControllerListening( const uno::Reference< frame::X } } -void SAL_CALL ScVbaEventListener::windowOpened( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowOpened( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowClosing( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowClosed( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowClosed( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowMinimized( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowMinimized( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowNormalized( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowNormalized( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -291,7 +291,7 @@ void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEve } } -void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -307,7 +307,7 @@ void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rE } } -void SAL_CALL ScVbaEventListener::windowResized( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowResized( const awt::WindowEvent& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -319,19 +319,19 @@ void SAL_CALL ScVbaEventListener::windowResized( const awt::WindowEvent& rEvent } } -void SAL_CALL ScVbaEventListener::windowMoved( const awt::WindowEvent& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowMoved( const awt::WindowEvent& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowShown( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowShown( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::windowHidden( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::windowHidden( const lang::EventObject& /*rEvent*/ ) { } -void SAL_CALL ScVbaEventListener::borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& /*aNewSize*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& /*aNewSize*/ ) { ::osl::MutexGuard aGuard( maMutex ); @@ -344,7 +344,7 @@ void SAL_CALL ScVbaEventListener::borderWidthsChanged( const uno::Reference< uno } } -void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -399,7 +399,7 @@ void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEv } } -void SAL_CALL ScVbaEventListener::disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventListener::disposing( const lang::EventObject& rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -569,7 +569,7 @@ ScVbaEventsHelper::~ScVbaEventsHelper() { } -void SAL_CALL ScVbaEventsHelper::notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaEventsHelper::notifyEvent( const css::document::EventObject& rEvent ) { static const uno::Sequence< uno::Any > saEmptyArgs; if( (rEvent.EventName == GlobalEventConfig::GetEventName( GlobalEventId::OPENDOC )) || @@ -624,13 +624,11 @@ void SAL_CALL ScVbaEventsHelper::notifyEvent( const css::document::EventObject& } OUString ScVbaEventsHelper::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("ScVbaEventsHelper"); } css::uno::Sequence<OUString> ScVbaEventsHelper::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ "com.sun.star.script.vba.VBASpreadsheetEventProcessor"}; @@ -639,7 +637,7 @@ css::uno::Sequence<OUString> ScVbaEventsHelper::getSupportedServiceNames() // protected ------------------------------------------------------------------ bool ScVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue, - const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& rArgs ) throw (uno::RuntimeException) + const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& rArgs ) { // document and document shell are needed during event processing if( !mpShell || !mpDoc ) @@ -689,7 +687,7 @@ bool ScVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue, } uno::Sequence< uno::Any > ScVbaEventsHelper::implBuildArgumentList( const EventHandlerInfo& rInfo, - const uno::Sequence< uno::Any >& rArgs ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + const uno::Sequence< uno::Any >& rArgs ) { // fill arguments for workbook events associated to sheet events according to sheet events, sheet will be added below bool bSheetEventAsBookEvent = rInfo.mnEventId > USERDEFINED_START; @@ -780,7 +778,7 @@ uno::Sequence< uno::Any > ScVbaEventsHelper::implBuildArgumentList( const EventH } void ScVbaEventsHelper::implPostProcessEvent( EventQueue& rEventQueue, - const EventHandlerInfo& rInfo, bool bCancel ) throw (uno::RuntimeException) + const EventHandlerInfo& rInfo, bool bCancel ) { switch( rInfo.mnEventId ) { @@ -801,7 +799,6 @@ void ScVbaEventsHelper::implPostProcessEvent( EventQueue& rEventQueue, OUString ScVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& rArgs ) const - throw (lang::IllegalArgumentException, uno::RuntimeException) { bool bSheetEvent = false; rInfo.maUserData >>= bSheetEvent; @@ -841,7 +838,7 @@ bool lclSelectionChanged( const ScRangeList& rLeft, const ScRangeList& rRight ) } // namespace -bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException, uno::RuntimeException) +bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) { uno::Reference< uno::XInterface > xOldSelection( maOldSelection, uno::UNO_QUERY ); uno::Reference< uno::XInterface > xNewSelection = getXSomethingFromArgs< uno::XInterface >( rArgs, nIndex, false ); @@ -853,7 +850,6 @@ bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rAr } uno::Any ScVbaEventsHelper::createWorksheet( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { // extract sheet index, will throw, if parameter is invalid SCTAB nTab = lclGetTabFromArgs( rArgs, nIndex ); @@ -861,7 +857,6 @@ uno::Any ScVbaEventsHelper::createWorksheet( const uno::Sequence< uno::Any >& rA } uno::Any ScVbaEventsHelper::createRange( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { // it is possible to pass an existing VBA Range object uno::Reference< excel::XRange > xVbaRange = getXSomethingFromArgs< excel::XRange >( rArgs, nIndex ); @@ -889,7 +884,6 @@ uno::Any ScVbaEventsHelper::createRange( const uno::Sequence< uno::Any >& rArgs, } uno::Any ScVbaEventsHelper::createHyperlink( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { uno::Reference< table::XCell > xCell = getXSomethingFromArgs< table::XCell >( rArgs, nIndex, false ); uno::Sequence< uno::Any > aArgs( 2 ); @@ -900,7 +894,6 @@ uno::Any ScVbaEventsHelper::createHyperlink( const uno::Sequence< uno::Any >& rA } uno::Any ScVbaEventsHelper::createWindow( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { uno::Sequence< uno::Any > aArgs( 3 ); aArgs[ 0 ] <<= getVBADocument( mxModel ); diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 4e3f33409d29..ce6eb35b8007 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -35,19 +35,17 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ScVbaEventsHelper() override; - virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() 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, css::uno::RuntimeException, std::exception) 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, css::uno::RuntimeException) 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; private: /** Checks if selection has been changed compared to selection of last call. @@ -55,28 +53,28 @@ private: @throws css::lang::IllegalArgumentException @throws css::uno::RuntimeException */ - bool isSelectionChanged( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + bool isSelectionChanged( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ); /** Creates a VBA Worksheet object (the argument must contain a sheet index). @throws css::lang::IllegalArgumentException @throws css::uno::RuntimeException */ - css::uno::Any createWorksheet( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + css::uno::Any createWorksheet( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const; /** Creates a VBA Range object (the argument must contain a UNO range or UNO range list). @throws css::lang::IllegalArgumentException @throws css::uno::RuntimeException */ - css::uno::Any createRange( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + css::uno::Any createRange( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const; /** Creates a VBA Hyperlink object (the argument must contain a UNO cell). @throws css::lang::IllegalArgumentException @throws css::uno::RuntimeException */ - css::uno::Any createHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + css::uno::Any createHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const; /** Creates a VBA Window object (the argument must contain a model controller). @throws css::lang::IllegalArgumentException @throws css::uno::RuntimeException */ - css::uno::Any createWindow( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + css::uno::Any createWindow( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const; private: ::rtl::Reference< ScVbaEventListener > mxListener; diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index d6525665de18..369d95ee0375 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -41,7 +41,7 @@ ScVbaFont::ScVbaFont( const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< beans::XPropertySet >& xPropertySet, - ScCellRangeObj* pRangeObj, bool bFormControl ) throw ( uno::RuntimeException ) : + ScCellRangeObj* pRangeObj, bool bFormControl ) : ScVbaFont_BASE( xParent, xContext, dPalette.getPalette(), xPropertySet, bFormControl ), mPalette( dPalette ), mpRangeObj( pRangeObj ) @@ -59,7 +59,7 @@ ScVbaFont::~ScVbaFont() } /// @throws css::uno::RuntimeException -static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf ) throw ( uno::RuntimeException ) +static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf ) { uno::Reference< text::XTextRange > xTxtRange( xIf, uno::UNO_QUERY_THROW ); uno::Reference< text::XSimpleText > xTxt( xTxtRange->getText(), uno::UNO_QUERY_THROW ) ; @@ -67,7 +67,7 @@ static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< return xProps; } void SAL_CALL -ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) +ScVbaFont::setSuperscript( const uno::Any& aValue ) { // #FIXEME create some sort of generic get/set code where // you can pass a functor @@ -110,7 +110,7 @@ ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getSuperscript() { uno::Reference< table::XCell> xCell( mxFont, uno::UNO_QUERY ); uno::Reference< table::XCellRange > xCellRange( mxFont, uno::UNO_QUERY ); @@ -143,7 +143,7 @@ ScVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) +ScVbaFont::setSubscript( const uno::Any& aValue ) { uno::Reference< table::XCell> xCell( mxFont, uno::UNO_QUERY ); uno::Reference< table::XCellRange > xCellRange( mxFont, uno::UNO_QUERY ); @@ -184,7 +184,7 @@ ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException, } uno::Any SAL_CALL -ScVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getSubscript() { uno::Reference< table::XCell> xCell( mxFont, uno::UNO_QUERY ); uno::Reference< table::XCellRange > xCellRange( mxFont, uno::UNO_QUERY ); @@ -218,7 +218,7 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaFont::getSize() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getSize() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_HEIGHT) == SfxItemState::DONTCARE ) @@ -227,7 +227,7 @@ ScVbaFont::getSize() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException, std::exception ) +ScVbaFont::setColorIndex( const uno::Any& _colorindex ) { sal_Int32 nIndex = 0; _colorindex >>= nIndex; @@ -244,7 +244,7 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep } uno::Any SAL_CALL -ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getColorIndex() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_COLOR) == SfxItemState::DONTCARE ) @@ -253,7 +253,7 @@ ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception ) +ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) { //XXX #TODO# #FIXME# //mxFont->setPropertyValue("CharSize", ( uno::Any )fValue ); @@ -262,7 +262,7 @@ ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::Runtime } uno::Any SAL_CALL -ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getStandardFontSize() { //XXX #TODO# #FIXME# throw uno::RuntimeException( "getStandardFontSize not supported" ); @@ -270,14 +270,14 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception ) +ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) { //XXX #TODO# #FIXME# throw uno::RuntimeException("setStandardFont not supported" ); } uno::Any SAL_CALL -ScVbaFont::getStandardFont() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getStandardFont() { //XXX #TODO# #FIXME# throw uno::RuntimeException("getStandardFont not supported"); @@ -285,7 +285,7 @@ ScVbaFont::getStandardFont() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException, std::exception ) +ScVbaFont::setFontStyle( const uno::Any& aValue ) { bool bBold = false; bool bItalic = false; @@ -316,7 +316,7 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException, } uno::Any SAL_CALL -ScVbaFont::getFontStyle() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getFontStyle() { OUStringBuffer aStyles; bool bValue = false; @@ -335,7 +335,7 @@ ScVbaFont::getFontStyle() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaFont::getBold() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getBold() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_WEIGHT) == SfxItemState::DONTCARE ) @@ -344,7 +344,7 @@ ScVbaFont::getBold() throw ( uno::RuntimeException, std::exception ) } void SAL_CALL -ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) +ScVbaFont::setUnderline( const uno::Any& aValue ) { // default sal_Int32 nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone; @@ -378,7 +378,7 @@ ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException, } uno::Any SAL_CALL -ScVbaFont::getUnderline() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getUnderline() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_UNDERLINE) == SfxItemState::DONTCARE ) @@ -405,7 +405,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaFont::getStrikethrough() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getStrikethrough() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT) == SfxItemState::DONTCARE ) @@ -414,7 +414,7 @@ ScVbaFont::getStrikethrough() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaFont::getShadow() throw (uno::RuntimeException, std::exception) +ScVbaFont::getShadow() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_SHADOWED) == SfxItemState::DONTCARE ) @@ -423,7 +423,7 @@ ScVbaFont::getShadow() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaFont::getItalic() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getItalic() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_POSTURE) == SfxItemState::DONTCARE ) @@ -433,7 +433,7 @@ ScVbaFont::getItalic() throw ( uno::RuntimeException, std::exception ) } uno::Any SAL_CALL -ScVbaFont::getName() throw ( uno::RuntimeException, std::exception ) +ScVbaFont::getName() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT) == SfxItemState::DONTCARE ) @@ -441,7 +441,7 @@ ScVbaFont::getName() throw ( uno::RuntimeException, std::exception ) return ScVbaFont_BASE::getName(); } uno::Any -ScVbaFont::getColor() throw (uno::RuntimeException, std::exception) +ScVbaFont::getColor() { // #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet ) uno::Any aAny; @@ -450,13 +450,13 @@ ScVbaFont::getColor() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) +ScVbaFont::setOutlineFont( const uno::Any& aValue ) { mxFont->setPropertyValue("CharContoured", aValue ); } uno::Any SAL_CALL -ScVbaFont::getOutlineFont() throw (uno::RuntimeException, std::exception) +ScVbaFont::getOutlineFont() { if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR) == SfxItemState::DONTCARE ) diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index d1138acec2c2..4a460e70b3b8 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -43,33 +43,33 @@ public: const css::uno::Reference< css::uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const css::uno::Reference< css::beans::XPropertySet >& xPropertySet, - ScCellRangeObj* pRangeObj = nullptr, bool bFormControl = false ) throw ( css::uno::RuntimeException ); + ScCellRangeObj* pRangeObj = nullptr, bool bFormControl = false ); virtual ~ScVbaFont() override;// {} // Attributes - virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStandardFontSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStandardFont() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStandardFont( const css::uno::Any& _standardfont ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFontStyle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFontStyle( const css::uno::Any& _fontstyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getBold() 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 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 getItalic() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) 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 setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getSize() override; + virtual css::uno::Any SAL_CALL getStandardFontSize() override; + virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) override; + virtual css::uno::Any SAL_CALL getStandardFont() override; + virtual void SAL_CALL setStandardFont( const css::uno::Any& _standardfont ) override; + virtual css::uno::Any SAL_CALL getFontStyle() override; + virtual void SAL_CALL setFontStyle( const css::uno::Any& _fontstyle ) override; + virtual css::uno::Any SAL_CALL getColorIndex() override; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override; + virtual css::uno::Any SAL_CALL getBold() 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 getStrikethrough() override; + virtual css::uno::Any SAL_CALL getShadow() override; + virtual css::uno::Any SAL_CALL getItalic() override; + virtual css::uno::Any SAL_CALL getSubscript() override; + virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) override; + virtual css::uno::Any SAL_CALL getSuperscript() override; + virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) override; + virtual css::uno::Any SAL_CALL getName() override; + virtual css::uno::Any SAL_CALL getColor() override ; + virtual css::uno::Any SAL_CALL getOutlineFont() override ; + virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) override ; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index db4f2dbe1eed..0d07983d30fc 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -55,7 +55,7 @@ ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xP const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, - bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) + bool bCheckAmbiguoity ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), mxPropertySet( _xPropertySet ), @@ -78,7 +78,7 @@ ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xP template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment) { try { @@ -116,7 +116,7 @@ ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment) thro template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getVerticalAlignment( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getVerticalAlignment( ) { uno::Any aResult = aNULL(); try @@ -153,7 +153,7 @@ ScVbaFormat< Ifc... >::getVerticalAlignment( ) throw (script::BasicErrorExcepti template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) { try { @@ -193,7 +193,7 @@ ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignme template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getHorizontalAlignment( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getHorizontalAlignment( ) { uno::Any NRetAlignment = aNULL(); try @@ -234,7 +234,7 @@ ScVbaFormat< Ifc... >::getHorizontalAlignment( ) throw (script::BasicErrorExcep template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation ) { try { @@ -271,7 +271,7 @@ ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation ) throw (sc } template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getOrientation( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getOrientation( ) { uno::Any NRetOrientation = aNULL(); try @@ -310,7 +310,7 @@ ScVbaFormat< Ifc... >::getOrientation( ) throw (script::BasicErrorException, un template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setWrapText( const uno::Any& _aWrapText ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setWrapText( const uno::Any& _aWrapText ) { try { @@ -324,7 +324,7 @@ ScVbaFormat< Ifc... >::setWrapText( const uno::Any& _aWrapText ) throw (script:: template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getWrapText( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormat< Ifc... >::getWrapText( ) { uno::Any aWrap = aNULL(); try @@ -344,7 +344,7 @@ ScVbaFormat< Ifc... >::getWrapText( ) throw (script::BasicErrorException, uno:: template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException ) +ScVbaFormat< Ifc... >::Borders( const uno::Any& Index ) { ScVbaPalette aPalette( excel::getDocShell( mxModel ) ); uno::Reference< XCollection > xColl = new ScVbaBorders( thisHelperIface(), ScVbaFormat_BASE::mxContext, uno::Reference< table::XCellRange >( mxPropertySet, uno::UNO_QUERY_THROW ), aPalette ); @@ -358,7 +358,7 @@ ScVbaFormat< Ifc... >::Borders( const uno::Any& Index ) throw (script::BasicErro template< typename... Ifc > uno::Reference< excel::XFont > SAL_CALL -ScVbaFormat< Ifc... >::Font( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::Font( ) { ScVbaPalette aPalette( excel::getDocShell( mxModel ) ); return new ScVbaFont( thisHelperIface(), ScVbaFormat_BASE::mxContext, aPalette, mxPropertySet ); @@ -366,14 +366,14 @@ ScVbaFormat< Ifc... >::Font( ) throw (script::BasicErrorException, uno::Runtime template< typename... Ifc > uno::Reference< excel::XInterior > SAL_CALL -ScVbaFormat< Ifc... >::Interior( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::Interior( ) { return new ScVbaInterior( thisHelperIface(), ScVbaFormat_BASE::mxContext, mxPropertySet ); } template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getNumberFormatLocal( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getNumberFormatLocal( ) { uno::Any aRet = uno::makeAny( OUString() ); try @@ -404,7 +404,7 @@ ScVbaFormat< Ifc... >::getNumberFormatLocal( ) throw (script::BasicErrorExcepti template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) { try { @@ -433,7 +433,7 @@ ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString ) { try { @@ -464,7 +464,7 @@ ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString ) throw ( template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setIndentLevel( const uno::Any& _aLevel ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setIndentLevel( const uno::Any& _aLevel ) { try { @@ -488,7 +488,7 @@ ScVbaFormat< Ifc... >::setIndentLevel( const uno::Any& _aLevel ) throw (script:: template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getIndentLevel( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getIndentLevel( ) { uno::Any NRetIndentLevel = aNULL(); try @@ -512,7 +512,7 @@ ScVbaFormat< Ifc... >::getIndentLevel( ) throw (script::BasicErrorException, un template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setLocked( const uno::Any& _aLocked ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setLocked( const uno::Any& _aLocked ) { try { @@ -533,7 +533,7 @@ ScVbaFormat< Ifc... >::setLocked( const uno::Any& _aLocked ) throw (script::Basi template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setFormulaHidden( const uno::Any& FormulaHidden ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setFormulaHidden( const uno::Any& FormulaHidden ) { try { @@ -553,7 +553,7 @@ ScVbaFormat< Ifc... >::setFormulaHidden( const uno::Any& FormulaHidden ) throw ( template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getLocked( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormat< Ifc... >::getLocked( ) { uno::Any aCellProtection = aNULL(); try @@ -587,7 +587,7 @@ ScVbaFormat< Ifc... >::getLocked( ) throw (script::BasicErrorException, uno::Ru template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getFormulaHidden( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormat< Ifc... >::getFormulaHidden( ) { uno::Any aBoolRet = aNULL(); try @@ -620,7 +620,7 @@ ScVbaFormat< Ifc... >::getFormulaHidden( ) throw (script::BasicErrorException, template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setShrinkToFit( const uno::Any& ShrinkToFit ) { try { @@ -635,7 +635,7 @@ ScVbaFormat< Ifc... >::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (scri template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getShrinkToFit( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getShrinkToFit( ) { uno::Any aRet = aNULL(); try @@ -653,7 +653,7 @@ ScVbaFormat< Ifc... >::getShrinkToFit( ) throw (script::BasicErrorException, un template< typename... Ifc > void SAL_CALL -ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder ) { try { @@ -686,7 +686,7 @@ ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder ) throw (sc template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getReadingOrder( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormat< Ifc... >::getReadingOrder( ) { uno::Any NRetReadingOrder = aNULL(); try @@ -718,7 +718,7 @@ ScVbaFormat< Ifc... >::getReadingOrder( ) throw (script::BasicErrorException, u template< typename... Ifc > uno::Any SAL_CALL -ScVbaFormat< Ifc... >::getNumberFormat( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormat< Ifc... >::getNumberFormat( ) { uno::Any aFormat = aNULL(); try @@ -745,7 +745,7 @@ ScVbaFormat< Ifc... >::getNumberFormat( ) throw (script::BasicErrorException, u template< typename... Ifc > bool -ScVbaFormat< Ifc... >::isAmbiguous(const OUString& _sPropertyName) throw ( script::BasicErrorException ) +ScVbaFormat< Ifc... >::isAmbiguous(const OUString& _sPropertyName) { bool bResult = false; try @@ -762,7 +762,7 @@ ScVbaFormat< Ifc... >::isAmbiguous(const OUString& _sPropertyName) throw ( scrip template< typename... Ifc > void -ScVbaFormat< Ifc... >::initializeNumberFormats() throw ( script::BasicErrorException, uno::RuntimeException ) +ScVbaFormat< Ifc... >::initializeNumberFormats() { if ( !xNumberFormats.is() ) { @@ -774,7 +774,7 @@ ScVbaFormat< Ifc... >::initializeNumberFormats() throw ( script::BasicErrorExcep template< typename... Ifc > uno::Reference< beans::XPropertyState > const & -ScVbaFormat< Ifc... >::getXPropertyState() throw ( uno::RuntimeException ) +ScVbaFormat< Ifc... >::getXPropertyState() { if ( !xPropertyState.is() ) xPropertyState.set( mxPropertySet, uno::UNO_QUERY_THROW ); @@ -783,14 +783,14 @@ ScVbaFormat< Ifc... >::getXPropertyState() throw ( uno::RuntimeException ) template< typename... Ifc > ScCellRangesBase* -ScVbaFormat< Ifc... >::getCellRangesBase() throw ( ::uno::RuntimeException ) +ScVbaFormat< Ifc... >::getCellRangesBase() { return ScCellRangesBase::getImplementation( mxPropertySet ); } template< typename... Ifc > SfxItemSet* -ScVbaFormat< Ifc... >::getCurrentDataSet() throw (uno::RuntimeException, std::exception) +ScVbaFormat< Ifc... >::getCurrentDataSet() { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index 604bd6fa4bff..d8bbc897e225 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -48,107 +48,107 @@ protected: bool mbCheckAmbiguoity; bool mbAddIndent; /// @throws css::script::BasicErrorException - bool isAmbiguous(const OUString& _sPropertyName) throw ( css::script::BasicErrorException ); + bool isAmbiguous(const OUString& _sPropertyName); /// @throws css::uno::RuntimeException - css::uno::Reference< css::beans::XPropertyState > const & getXPropertyState() throw ( css::uno::RuntimeException ); + css::uno::Reference< css::beans::XPropertyState > const & getXPropertyState(); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - void initializeNumberFormats() throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + void initializeNumberFormats(); /// @throws css::uno::RuntimeException - SfxItemSet* getCurrentDataSet( ) throw (css::uno::RuntimeException, std::exception); + SfxItemSet* getCurrentDataSet( ); protected: /// @throws css::uno::RuntimeException - virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ); + virtual ScCellRangesBase* getCellRangesBase(); public: /// @throws css::script::BasicErrorException - ScVbaFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( css::script::BasicErrorException ); + ScVbaFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& xModel, bool bCheckAmbiguoity ); virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() = 0; /// @throws css::uno::RuntimeException - void SAL_CALL setAddIndent( const css::uno::Any& BAddIndent) throw( css::uno::RuntimeException ) { BAddIndent >>= mbAddIndent; } + void SAL_CALL setAddIndent( const css::uno::Any& BAddIndent) { BAddIndent >>= mbAddIndent; } /// @throws css::uno::RuntimeException - css::uno::Any SAL_CALL getAddIndent() throw( css::uno::RuntimeException ) { return css::uno::makeAny( mbAddIndent ); } + css::uno::Any SAL_CALL getAddIndent() { return css::uno::makeAny( mbAddIndent ); } // Interface Methods /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setNumberFormat( const css::uno::Any& NumberFormat ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setNumberFormat( const css::uno::Any& NumberFormat ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getNumberFormat( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getNumberFormat( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setNumberFormatLocal( const css::uno::Any& NumberFormatLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setNumberFormatLocal( const css::uno::Any& NumberFormatLocal ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getNumberFormatLocal( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getNumberFormatLocal( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setIndentLevel( const css::uno::Any& IndentLevel ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setIndentLevel( const css::uno::Any& IndentLevel ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getIndentLevel( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getIndentLevel( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setHorizontalAlignment( const css::uno::Any& HorizontalAlignment ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setHorizontalAlignment( const css::uno::Any& HorizontalAlignment ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getHorizontalAlignment( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getHorizontalAlignment( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setVerticalAlignment( const css::uno::Any& VerticalAlignment ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setVerticalAlignment( const css::uno::Any& VerticalAlignment ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getVerticalAlignment( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getVerticalAlignment( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setOrientation( const css::uno::Any& Orientation ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setOrientation( const css::uno::Any& Orientation ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getOrientation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getOrientation( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setShrinkToFit( const css::uno::Any& ShrinkToFit ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setShrinkToFit( const css::uno::Any& ShrinkToFit ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getShrinkToFit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getShrinkToFit( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setWrapText( const css::uno::Any& WrapText ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setWrapText( const css::uno::Any& WrapText ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getWrapText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getWrapText( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setLocked( const css::uno::Any& Locked ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setLocked( const css::uno::Any& Locked ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getLocked( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getLocked( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getFormulaHidden( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getFormulaHidden( ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0; + virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) = 0; /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0; + virtual css::uno::Any SAL_CALL getMergeCells( ) = 0; /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getReadingOrder( ); }; #endif diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 17629ed9c68d..36d1fc2a3bec 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; /// @throws css::script::BasicErrorException static ScVbaFormatConditions* -lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions >& xFormatConditions ) throw ( script::BasicErrorException ) +lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions >& xFormatConditions ) { ScVbaFormatConditions* pFormatConditions = static_cast< ScVbaFormatConditions* >( xFormatConditions.get() ); if ( !pFormatConditions ) @@ -40,7 +40,7 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterfa const uno::Reference< sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, const uno::Reference< excel::XStyle >& _xStyle, const uno::Reference< excel::XFormatConditions >& _xFormatConditions, - const uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ) + const uno::Reference< css::beans::XPropertySet >& _xPropertySet ) : ScVbaFormatCondition_BASE( xParent, xContext, uno::Reference< sheet::XSheetCondition >( _xSheetConditionalEntry, css::uno::UNO_QUERY_THROW ) ), moFormatConditions( _xFormatConditions ), mxStyle( _xStyle ), mxParentRangePropertySet( _xPropertySet ) @@ -52,7 +52,7 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterfa } void SAL_CALL -ScVbaFormatCondition::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatCondition::Delete( ) { ScVbaFormatConditions* pFormatConditions = lcl_getScVbaFormatConditionsPtr( moFormatConditions ); pFormatConditions->removeFormatCondition(msStyleName, true); @@ -60,7 +60,7 @@ ScVbaFormatCondition::Delete( ) throw (script::BasicErrorException, uno::Runtim } void SAL_CALL -ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) { try { @@ -75,23 +75,23 @@ ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, co } uno::Reference< excel::XInterior > SAL_CALL -ScVbaFormatCondition::Interior( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatCondition::Interior( ) { return mxStyle->Interior(); } uno::Reference< excel::XFont > SAL_CALL -ScVbaFormatCondition::Font( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatCondition::Font( ) { return mxStyle->Font(); } uno::Any SAL_CALL -ScVbaFormatCondition::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatCondition::Borders( const uno::Any& Index ) { return mxStyle->Borders( Index ); } sheet::ConditionOperator -ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< sheet::XSheetCondition >& _xSheetCondition ) throw ( script::BasicErrorException ) +ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< sheet::XSheetCondition >& _xSheetCondition ) { sheet::ConditionOperator aAPIType = sheet::ConditionOperator_NONE; switch (_nVBAType) @@ -110,7 +110,7 @@ ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< } void -ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException ) +ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) { // getA1Formula *SHOULD* detect whether the formula is r1c1 or A1 syntax // and if R1C1 convert to A1 @@ -118,7 +118,7 @@ ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::B } ::sal_Int32 SAL_CALL -ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::RuntimeException, std::exception ) +ScVbaFormatCondition::Type( ) { sal_Int32 nReturnType = 0; if ( mxSheetCondition->getOperator() == sheet::ConditionOperator_FORMULA) @@ -129,19 +129,19 @@ ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::Runtime } ::sal_Int32 -ScVbaFormatCondition::Operator( bool bVal ) throw (script::BasicErrorException ) +ScVbaFormatCondition::Operator( bool bVal ) { return ScVbaFormatCondition_BASE::Operator( bVal ); } ::sal_Int32 SAL_CALL -ScVbaFormatCondition::Operator( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormatCondition::Operator( ) { return ScVbaFormatCondition_BASE::Operator( true ); } void -ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) +ScVbaFormatCondition::notifyRange() { try { diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index 60a4c8ab92f7..02c0b8c517b2 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -46,23 +46,23 @@ public: const css::uno::Reference< css::sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, const css::uno::Reference< ov::excel::XStyle >&, const css::uno::Reference< ov::excel::XFormatConditions >& _xFormatConditions, - const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException, css::script::BasicErrorException ); + const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ); /// @throws css::script::BasicErrorException - void notifyRange() throw ( css::script::BasicErrorException ); + void notifyRange(); /// @throws css::script::BasicErrorException - static css::sheet::ConditionOperator retrieveAPIType(sal_Int32 _nVBAType, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition ) throw( css::script::BasicErrorException ); + static css::sheet::ConditionOperator retrieveAPIType(sal_Int32 _nVBAType, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition ); //Methods - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Modify( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 Operator( bool ) throw (css::script::BasicErrorException) override; - virtual ::sal_Int32 SAL_CALL Operator( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ) override; - virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL Modify( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) override; + virtual ::sal_Int32 SAL_CALL Type( ) override; + virtual ::sal_Int32 Operator( bool ) override; + virtual ::sal_Int32 SAL_CALL Operator( ) override; + virtual void setFormula1( const css::uno::Any& _aFormula1) override; + virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) override; + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) override; + virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 6cfebf709b2b..7514695a553e 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -35,7 +35,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; void SAL_CALL -ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatConditions::Delete( ) { try { @@ -58,7 +58,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti } uno::Type SAL_CALL -ScVbaFormatConditions::getElementType() throw (css::uno::RuntimeException) +ScVbaFormatConditions::getElementType() { return cppu::UnoType<excel::XFormatCondition>::get(); } @@ -93,12 +93,12 @@ class EnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference<excel::XRange >& xRange, const uno::Reference<uno::XComponentContext >& xContext, const uno::Reference<excel::XStyles >& xStyles, const uno::Reference< excel::XFormatConditions >& xCollection, const uno::Reference<beans::XPropertySet >& xProps ) : m_xIndexAccess( xIndexAccess ), m_xParentRange( xRange ), m_xContext( xContext ), m_xStyles( xStyles ), m_xParentCollection( xCollection ), m_xProps( xProps ), 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 { try { @@ -131,13 +131,13 @@ public: } uno::Reference< excel::XFormatCondition > SAL_CALL -ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) { return Add( _nType, _aOperator, _aFormula1, _aFormula2, uno::Reference< excel::XStyle >() ); } uno::Reference< excel::XFormatCondition > -ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2, const css::uno::Reference< excel::XStyle >& _xStyle ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2, const css::uno::Reference< excel::XStyle >& _xStyle ) { // #TODO // #FIXME @@ -206,13 +206,13 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons } uno::Reference< container::XEnumeration > SAL_CALL -ScVbaFormatConditions::createEnumeration() throw (uno::RuntimeException) +ScVbaFormatConditions::createEnumeration() { return new EnumWrapper( m_xIndexAccess, mxRangeParent, mxContext, mxStyles, this, mxParentRangePropertySet ); } void -ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) +ScVbaFormatConditions::notifyRange() { try { @@ -225,7 +225,7 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) } OUString -ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( script::BasicErrorException ) +ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) { // #TODO, #FIXME hook-in proper formula conversion detection & logic OUString sFormula; @@ -245,7 +245,7 @@ ScVbaFormatConditions::getStyleName() } void -ScVbaFormatConditions::removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( script::BasicErrorException ) +ScVbaFormatConditions::removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) { try { diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index c34bc4871132..0978bc1875ab 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -47,22 +47,22 @@ class ScVbaFormatConditions: public CollTestImplHelper< ov::excel::XFormatCondit css::uno::Reference< css::beans::XPropertySet > mxParentRangePropertySet; public: /// @throws css::script::BasicErrorException - void notifyRange() throw ( css::script::BasicErrorException ); + void notifyRange(); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ); /// @throws css::script::BasicErrorException - static OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); + static OUString getA1Formula(const css::uno::Any& _aFormula); OUString getStyleName(); /// @throws css::script::BasicErrorException - void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( css::script::BasicErrorException ); + void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle); const css::uno::Reference< css::sheet::XSheetConditionalEntries >& getSheetConditionalEntries() const { return mxSheetConditionalEntries; } // XFormatConditions - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XFormatCondition > SAL_CALL Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual css::uno::Reference< ov::excel::XFormatCondition > SAL_CALL Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) 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/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index b0159503071f..598390fc8074 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -56,7 +56,7 @@ ScVbaGlobals::~ScVbaGlobals() // XGlobals uno::Reference<excel::XApplication > const & -ScVbaGlobals::getApplication() throw (uno::RuntimeException) +ScVbaGlobals::getApplication() { if ( !mxApplication.is() ) mxApplication.set( new ScVbaApplication( mxContext) ); @@ -64,13 +64,13 @@ ScVbaGlobals::getApplication() throw (uno::RuntimeException) } uno::Reference<excel::XApplication > SAL_CALL -ScVbaGlobals::getExcel() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getExcel() { return getApplication(); } uno::Reference< excel::XWorkbook > SAL_CALL -ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getActiveWorkbook() { uno::Reference< excel::XWorkbook > xWorkbook( getApplication()->getActiveWorkbook(), uno::UNO_QUERY); if ( xWorkbook.is() ) @@ -82,131 +82,131 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XWindow > SAL_CALL -ScVbaGlobals::getActiveWindow() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getActiveWindow() { return getApplication()->getActiveWindow(); } uno::Reference< excel::XWorksheet > SAL_CALL -ScVbaGlobals::getActiveSheet() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getActiveSheet() { return getApplication()->getActiveSheet(); } uno::Any SAL_CALL -ScVbaGlobals::WorkBooks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::WorkBooks( const uno::Any& aIndex ) { return uno::Any( getApplication()->Workbooks(aIndex) ); } uno::Any SAL_CALL -ScVbaGlobals::WorkSheets(const uno::Any& aIndex) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::WorkSheets(const uno::Any& aIndex) { return getApplication()->Worksheets( aIndex ); } uno::Any SAL_CALL -ScVbaGlobals::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Sheets( const uno::Any& aIndex ) { return WorkSheets( aIndex ); } uno::Any SAL_CALL -ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) { return getApplication()->Range( Cell1, Cell2 ); } uno::Any SAL_CALL -ScVbaGlobals::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException, std::exception ) +ScVbaGlobals::Names( const css::uno::Any& aIndex ) { return getApplication()->Names( aIndex ); } uno::Reference< excel::XRange > SAL_CALL -ScVbaGlobals::getActiveCell() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getActiveCell() { return getApplication()->getActiveCell(); } uno::Reference< XAssistant > SAL_CALL -ScVbaGlobals::getAssistant() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getAssistant() { return getApplication()->getAssistant(); } uno::Any SAL_CALL -ScVbaGlobals::getSelection() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getSelection() { return getApplication()->getSelection(); } uno::Reference< excel::XWorkbook > SAL_CALL -ScVbaGlobals::getThisWorkbook() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getThisWorkbook() { return getApplication()->getThisWorkbook(); } void SAL_CALL -ScVbaGlobals::Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaGlobals::Calculate() { return getApplication()->Calculate(); } uno::Reference< excel::XRange > SAL_CALL -ScVbaGlobals::Cells( const uno::Any& RowIndex, const uno::Any& ColumnIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Cells( const uno::Any& RowIndex, const uno::Any& ColumnIndex ) { return getApplication()->getActiveSheet()->Cells( RowIndex, ColumnIndex ); } uno::Reference< excel::XRange > SAL_CALL -ScVbaGlobals::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Columns( const uno::Any& aIndex ) { return getApplication()->getActiveSheet()->Columns( aIndex ); } uno::Any SAL_CALL -ScVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::CommandBars( const uno::Any& aIndex ) { uno::Reference< XApplicationBase > xBase( getApplication(), uno::UNO_QUERY_THROW ); return xBase->CommandBars( aIndex ); } css::uno::Reference< ov::excel::XRange > SAL_CALL -ScVbaGlobals::Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaGlobals::Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) { return getApplication()->Union( Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 ); } css::uno::Reference< ov::excel::XRange > SAL_CALL -ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) { return getApplication()->Intersect( Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 ); } uno::Any SAL_CALL -ScVbaGlobals::Evaluate( const OUString& Name ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Evaluate( const OUString& Name ) { return getApplication()->Evaluate( Name ); } css::uno::Any SAL_CALL -ScVbaGlobals::WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) +ScVbaGlobals::WorksheetFunction( ) { return getApplication()->WorksheetFunction(); } uno::Any SAL_CALL -ScVbaGlobals::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Windows( const uno::Any& aIndex ) { return getApplication()->Windows( aIndex ); } uno::Reference< excel::XRange > SAL_CALL -ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::Rows( const uno::Any& aIndex ) { return getApplication()->getActiveSheet()->Rows( aIndex ); } uno::Any SAL_CALL -ScVbaGlobals::getDebug() throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getDebug() { try // return empty object on error { @@ -222,13 +222,13 @@ ScVbaGlobals::getDebug() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaGlobals::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::MenuBars( const uno::Any& aIndex ) { return uno::Any( getApplication()->MenuBars(aIndex) ); } uno::Sequence< OUString > SAL_CALL -ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException, std::exception) +ScVbaGlobals::getAvailableServiceNames( ) { static bool bInit = false; static uno::Sequence< OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() ); diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 199868788e62..da401f40d5f2 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -38,8 +38,7 @@ class ScVbaGlobals : public ScVbaGlobals_BASE { css::uno::Reference< ov::excel::XApplication > mxApplication; /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XApplication > const & SAL_CALL getApplication() - throw (css::uno::RuntimeException); + css::uno::Reference< ov::excel::XApplication > const & SAL_CALL getApplication(); public: ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, @@ -47,36 +46,36 @@ public: virtual ~ScVbaGlobals() override; // XGlobals - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() override; + virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() override; + virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() override; + virtual void SAL_CALL Calculate( ) override; - virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) 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 Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() override; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) override; - virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getDebug() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL WorksheetFunction( ) override; + virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) override; + virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override; + virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() override; + virtual css::uno::Any SAL_CALL getDebug() override; + virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) 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; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index d9451e31b7a7..6b338e478106 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -34,7 +34,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs, - const uno::Reference< uno::XComponentContext >& rxContext ) throw (lang::IllegalArgumentException, uno::RuntimeException) : + const uno::Reference< uno::XComponentContext >& rxContext ) : HyperlinkImpl_BASE( getXSomethingFromArgs< XHelperInterface >( rArgs, 0 ), rxContext ), mxCell( getXSomethingFromArgs< table::XCell >( rArgs, 1, false ) ), mnType( office::MsoHyperlinkType::msoHyperlinkRange ) @@ -47,7 +47,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs, ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnchor, const uno::Reference< uno::XComponentContext >& rxContext, const uno::Any& rAddress, const uno::Any& rSubAddress, - const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) throw (uno::RuntimeException) : + const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) : HyperlinkImpl_BASE( rxAnchor, rxContext ) // parent of Hyperlink is the anchor object { // extract parameters, Address must not be empty @@ -105,52 +105,52 @@ ScVbaHyperlink::~ScVbaHyperlink() { } -OUString ScVbaHyperlink::getName() throw (uno::RuntimeException, std::exception) +OUString ScVbaHyperlink::getName() { // it seems this attribute is same as TextToDisplay return getTextToDisplay(); } -void ScVbaHyperlink::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception) +void ScVbaHyperlink::setName( const OUString& rName ) { setTextToDisplay( rName ); } -OUString ScVbaHyperlink::getAddress() throw (uno::RuntimeException, std::exception) +OUString ScVbaHyperlink::getAddress() { return getUrlComponents().first; } -void ScVbaHyperlink::setAddress( const OUString& rAddress ) throw (uno::RuntimeException, std::exception) +void ScVbaHyperlink::setAddress( const OUString& rAddress ) { UrlComponents aUrlComp = getUrlComponents(); aUrlComp.first = rAddress; setUrlComponents( aUrlComp ); } -OUString ScVbaHyperlink::getSubAddress() throw (uno::RuntimeException, std::exception) +OUString ScVbaHyperlink::getSubAddress() { return getUrlComponents().second; } -void ScVbaHyperlink::setSubAddress( const OUString& rSubAddress ) throw (uno::RuntimeException, std::exception) +void ScVbaHyperlink::setSubAddress( const OUString& rSubAddress ) { UrlComponents aUrlComp = getUrlComponents(); aUrlComp.second = rSubAddress; setUrlComponents( aUrlComp ); } -OUString SAL_CALL ScVbaHyperlink::getScreenTip() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaHyperlink::getScreenTip() { return maScreenTip; } -void SAL_CALL ScVbaHyperlink::setScreenTip( const OUString& rScreenTip ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaHyperlink::setScreenTip( const OUString& rScreenTip ) { maScreenTip = rScreenTip; } -OUString ScVbaHyperlink::getTextToDisplay() throw (uno::RuntimeException, std::exception) +OUString ScVbaHyperlink::getTextToDisplay() { ensureTextField(); OUString aTextToDisplay; @@ -158,18 +158,18 @@ OUString ScVbaHyperlink::getTextToDisplay() throw (uno::RuntimeException, std::e return aTextToDisplay; } -void ScVbaHyperlink::setTextToDisplay( const OUString& rTextToDisplay ) throw (uno::RuntimeException, std::exception) +void ScVbaHyperlink::setTextToDisplay( const OUString& rTextToDisplay ) { ensureTextField(); mxTextField->setPropertyValue("Representation", uno::Any( rTextToDisplay ) ); } -sal_Int32 SAL_CALL ScVbaHyperlink::getType() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaHyperlink::getType() { return mnType; } -uno::Reference< excel::XRange > SAL_CALL ScVbaHyperlink::getRange() throw (uno::RuntimeException, std::exception) +uno::Reference< excel::XRange > SAL_CALL ScVbaHyperlink::getRange() { if( mnType == office::MsoHyperlinkType::msoHyperlinkRange ) { @@ -188,7 +188,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaHyperlink::getRange() throw (uno:: throw uno::RuntimeException(); } -uno::Reference< msforms::XShape > SAL_CALL ScVbaHyperlink::getShape() throw (uno::RuntimeException, std::exception) +uno::Reference< msforms::XShape > SAL_CALL ScVbaHyperlink::getShape() { // error if called at a range Hyperlink object return uno::Reference< msforms::XShape >( getParent(), uno::UNO_QUERY_THROW ); @@ -198,13 +198,13 @@ VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaHyperlink, "ooo.vba.excel.Hyperlink" ) // private -------------------------------------------------------------------- -void ScVbaHyperlink::ensureTextField() throw (uno::RuntimeException) +void ScVbaHyperlink::ensureTextField() { if( !mxTextField.is() ) throw uno::RuntimeException(); } -ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() throw (uno::RuntimeException) +ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() { ensureTextField(); OUString aUrl; @@ -215,7 +215,7 @@ ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() throw (uno::Run return UrlComponents( aUrl.copy( 0, nHashPos ), aUrl.copy( nHashPos + 1 ) ); } -void ScVbaHyperlink::setUrlComponents( const UrlComponents& rUrlComp ) throw (uno::RuntimeException) +void ScVbaHyperlink::setUrlComponents( const UrlComponents& rUrlComp ) { ensureTextField(); OUStringBuffer aUrl( rUrlComp.first ); diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx index 899721280105..3e941a748541 100644 --- a/sc/source/ui/vba/vbahyperlink.hxx +++ b/sc/source/ui/vba/vbahyperlink.hxx @@ -36,31 +36,31 @@ public: /// @throws css::uno::RuntimeException ScVbaHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); /// @throws css::uno::RuntimeException ScVbaHyperlink( const css::uno::Reference< ov::XHelperInterface >& rxAnchor, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Any& rAddress, const css::uno::Any& rSubAddress, - const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ) throw (css::uno::RuntimeException); + const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ); virtual ~ScVbaHyperlink() override; // Attributes - 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 getAddress() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAddress( const OUString& rAddress ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& rName ) override; + virtual OUString SAL_CALL getAddress() override; + virtual void SAL_CALL setAddress( const OUString& rAddress ) override; + virtual OUString SAL_CALL getSubAddress() override; + virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) override; + virtual OUString SAL_CALL getScreenTip() override; + virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) override; + virtual OUString SAL_CALL getTextToDisplay() override; + virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) override; + virtual sal_Int32 SAL_CALL getType() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() override; + virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() override; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE @@ -69,11 +69,11 @@ private: typedef ::std::pair< OUString, OUString > UrlComponents; /// @throws css::uno::RuntimeException - void ensureTextField() throw (css::uno::RuntimeException); + void ensureTextField(); /// @throws css::uno::RuntimeException - UrlComponents getUrlComponents() throw (css::uno::RuntimeException); + UrlComponents getUrlComponents(); /// @throws css::uno::RuntimeException - void setUrlComponents( const UrlComponents& rUrlComp ) throw (css::uno::RuntimeException); + void setUrlComponents( const UrlComponents& rUrlComp ); private: css::uno::Reference< css::table::XCell > mxCell; diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 3e8f2260f209..0d3a2c608432 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -35,7 +35,7 @@ namespace { @throws css::uno::RuntimeException */ -bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRange >& rxInner ) throw (uno::RuntimeException) +bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRange >& rxInner ) { const ScRangeList& rScInner = ScVbaRange::getScRangeList( rxInner ); if( rScInner.empty() || rScOuter.empty() ) @@ -54,12 +54,12 @@ struct EqualAnchorFunctor uno::Reference< msforms::XShape > mxAnchorShape; sal_Int32 mnType; /// @throws uno::RuntimeException - explicit EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException); + explicit EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ); /// @throws uno::RuntimeException - bool operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const throw (uno::RuntimeException); + bool operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const; }; -EqualAnchorFunctor::EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException) : +EqualAnchorFunctor::EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ) : mnType( rxHlink->getType() ) { switch( mnType ) @@ -76,7 +76,7 @@ EqualAnchorFunctor::EqualAnchorFunctor( const uno::Reference< excel::XHyperlink } } -bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const throw (uno::RuntimeException) +bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const { sal_Int32 nType = rxHlink->getType(); if( nType != mnType ) @@ -110,37 +110,37 @@ class ScVbaHlinkContainer : public ::cppu::WeakImplHelper< container::XIndexAcce { public: /// @throws uno::RuntimeException - explicit ScVbaHlinkContainer() throw (uno::RuntimeException); + explicit ScVbaHlinkContainer(); /// @throws uno::RuntimeException - explicit ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetContainer, const ScRangeList& rScRanges ) throw (uno::RuntimeException); + explicit ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetContainer, const ScRangeList& rScRanges ); /** Inserts the passed hyperlink into the collection. Will remove a Hyperlink object with the same anchor as the passed Hyperlink object. @throws uno::RuntimeException */ - void insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException); + void insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ); // 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; // 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; private: typedef ::std::vector< uno::Reference< excel::XHyperlink > > HyperlinkVector; HyperlinkVector maHlinks; }; -ScVbaHlinkContainer::ScVbaHlinkContainer() throw (uno::RuntimeException) +ScVbaHlinkContainer::ScVbaHlinkContainer() { // TODO FIXME: fill with existing hyperlinks } ScVbaHlinkContainer::ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetContainer, - const ScRangeList& rScRanges ) throw (uno::RuntimeException) + const ScRangeList& rScRanges ) { for( sal_Int32 nIndex = 0, nCount = rxSheetContainer->getCount(); nIndex < nCount; ++nIndex ) { @@ -151,7 +151,7 @@ ScVbaHlinkContainer::ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetC } } -void ScVbaHlinkContainer::insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException) +void ScVbaHlinkContainer::insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) { HyperlinkVector::iterator aIt = ::std::find_if( maHlinks.begin(), maHlinks.end(), EqualAnchorFunctor( rxHlink ) ); if( aIt == maHlinks.end() ) @@ -160,25 +160,24 @@ void ScVbaHlinkContainer::insertHyperlink( const uno::Reference< excel::XHyperli *aIt = rxHlink; } -sal_Int32 SAL_CALL ScVbaHlinkContainer::getCount() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaHlinkContainer::getCount() { return static_cast< sal_Int32 >( maHlinks.size() ); } uno::Any SAL_CALL ScVbaHlinkContainer::getByIndex( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( (0 <= nIndex) && (nIndex < getCount()) ) return uno::Any( maHlinks[ static_cast< size_t >( nIndex ) ] ); throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScVbaHlinkContainer::getElementType() throw (uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScVbaHlinkContainer::getElementType() { return cppu::UnoType<excel::XHyperlink>::get(); } -sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() { return !maHlinks.empty(); } @@ -195,7 +194,7 @@ ScVbaHlinkContainerMember::~ScVbaHlinkContainerMember() } // namespace detail ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent, - const uno::Reference< uno::XComponentContext >& rxContext ) throw (uno::RuntimeException) : + const uno::Reference< uno::XComponentContext >& rxContext ) : detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer ), ScVbaHyperlinks_BASE( rxParent, rxContext, uno::Reference< container::XIndexAccess >( mxContainer.get() ) ) { @@ -203,7 +202,7 @@ ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxPa ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, - const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) throw (uno::RuntimeException) : + const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) : detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer( rxSheetHlinks->mxContainer, rScRanges ) ), ScVbaHyperlinks_BASE( rxParent, rxContext, uno::Reference< container::XIndexAccess >( mxContainer.get() ) ), mxSheetHlinks( rxSheetHlinks ) @@ -218,7 +217,7 @@ ScVbaHyperlinks::~ScVbaHyperlinks() uno::Reference< excel::XHyperlink > SAL_CALL ScVbaHyperlinks::Add( const uno::Any& rAnchor, const uno::Any& rAddress, const uno::Any& rSubAddress, - const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) throw (uno::RuntimeException, std::exception) + const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) { /* If this Hyperlinks object has been created from a Range object, the call to Add() is passed to the Hyperlinks object of the parent @@ -243,7 +242,7 @@ uno::Reference< excel::XHyperlink > SAL_CALL ScVbaHyperlinks::Add( return xHlink; } -void SAL_CALL ScVbaHyperlinks::Delete() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaHyperlinks::Delete() { // FIXME not implemented throw uno::RuntimeException(); @@ -251,14 +250,14 @@ void SAL_CALL ScVbaHyperlinks::Delete() throw (uno::RuntimeException, std::excep // XEnumerationAccess --------------------------------------------------------- -uno::Reference< container::XEnumeration > SAL_CALL ScVbaHyperlinks::createEnumeration() throw (uno::RuntimeException) +uno::Reference< container::XEnumeration > SAL_CALL ScVbaHyperlinks::createEnumeration() { return new SimpleIndexAccessToEnumeration( m_xIndexAccess ); } // XElementAccess ------------------------------------------------------------- -uno::Type SAL_CALL ScVbaHyperlinks::getElementType() throw (uno::RuntimeException) +uno::Type SAL_CALL ScVbaHyperlinks::getElementType() { return cppu::UnoType<excel::XHyperlink>::get(); } diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx index 81b49a6e10c3..48aa35b4b19b 100644 --- a/sc/source/ui/vba/vbahyperlinks.hxx +++ b/sc/source/ui/vba/vbahyperlinks.hxx @@ -101,29 +101,28 @@ public: /// @throws css::uno::RuntimeException explicit ScVbaHyperlinks( const css::uno::Reference< ov::XHelperInterface >& rxParent, - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); /// @throws css::uno::RuntimeException explicit ScVbaHyperlinks( const css::uno::Reference< ov::XHelperInterface >& rxParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) throw (css::uno::RuntimeException); + const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ); virtual ~ScVbaHyperlinks() override; // XHyperlinks virtual css::uno::Reference< ov::excel::XHyperlink > SAL_CALL Add( const css::uno::Any& rAnchor, const css::uno::Any& rAddress, const css::uno::Any& rSubAddress, - const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ) override; - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete() override; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; // ScVbaCollectionBase virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) override; diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 2b1a7d114e39..51b4c2270615 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -79,7 +79,7 @@ static PatternMap lcl_getPatternMap() static PatternMap aPatternMap( lcl_getPatternMap() ); -ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >& xProps, ScDocument* pScDoc ) throw ( lang::IllegalArgumentException) : ScVbaInterior_BASE( xParent, xContext ), m_xProps(xProps), m_pScDoc( pScDoc ) +ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >& xProps, ScDocument* pScDoc ) : ScVbaInterior_BASE( xParent, xContext ), m_xProps(xProps), m_pScDoc( pScDoc ) { // auto color m_aPattColor.SetColor( (sal_uInt32)0x0 ); @@ -89,14 +89,14 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, } uno::Any -ScVbaInterior::getColor() throw (uno::RuntimeException, std::exception) +ScVbaInterior::getColor() { Color aBackColor( GetBackColor() ); return uno::makeAny( OORGBToXLRGB( aBackColor.GetColor() ) ); } void -ScVbaInterior::setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) +ScVbaInterior::setColor( const uno::Any& _color ) { sal_Int32 nColor = 0; if( _color >>= nColor ) @@ -147,7 +147,7 @@ ScVbaInterior::getPalette() } void SAL_CALL -ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) +ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) { sal_Int32 nIndex = 0; _colorindex >>= nIndex; @@ -198,7 +198,7 @@ ScVbaInterior::GetColorIndex( const sal_Int32 nColor ) } uno::Any SAL_CALL -ScVbaInterior::getColorIndex() throw ( css::uno::RuntimeException, std::exception ) +ScVbaInterior::getColorIndex() { sal_Int32 nColor = 0; // hackly for excel::XlColorIndex::xlColorIndexNone @@ -293,7 +293,7 @@ ScVbaInterior::SetUserDefinedAttributes( const OUString& sName, const uno::Any& } // OOo do not support below API uno::Any SAL_CALL -ScVbaInterior::getPattern() throw (uno::RuntimeException, std::exception) +ScVbaInterior::getPattern() { // XlPattern uno::Any aPattern = GetUserDefinedAttributes( PATTERN ); @@ -302,7 +302,7 @@ ScVbaInterior::getPattern() throw (uno::RuntimeException, std::exception) return uno::makeAny( excel::XlPattern::xlPatternNone ); } void SAL_CALL -ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeException, std::exception) +ScVbaInterior::setPattern( const uno::Any& _pattern ) { if( _pattern >>= m_nPattern ) { @@ -337,7 +337,7 @@ ScVbaInterior::GetBackColor() return aBackColor; } uno::Any SAL_CALL -ScVbaInterior::getPatternColor() throw (uno::RuntimeException, std::exception) +ScVbaInterior::getPatternColor() { // 0 is the default color. no filled. uno::Any aPatternColor = GetUserDefinedAttributes( PATTERNCOLOR ); @@ -349,7 +349,7 @@ ScVbaInterior::getPatternColor() throw (uno::RuntimeException, std::exception) return uno::makeAny( sal_Int32( 0 ) ); } void SAL_CALL -ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::RuntimeException, std::exception) +ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) { sal_Int32 nPattColor = 0; if( _patterncolor >>= nPattColor ) @@ -361,7 +361,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt throw uno::RuntimeException("Invalid Pattern Color" ); } uno::Any SAL_CALL -ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException, std::exception) +ScVbaInterior::getPatternColorIndex() { sal_Int32 nColor = 0; XLRGBToOORGB( getPatternColor() ) >>= nColor; @@ -369,7 +369,7 @@ ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException, std::excepti return GetIndexColor( nColor ); } void SAL_CALL -ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw (uno::RuntimeException, std::exception) +ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) { sal_Int32 nColorIndex = 0; if( _patterncolorindex >>= nColorIndex ) diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 65abdbf1a7b3..98d928686f66 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -58,19 +58,19 @@ protected: public: /// @throws css::lang::IllegalArgumentException ScVbaInterior( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - const css::uno::Reference< css::beans::XPropertySet >& xProps, ScDocument* pScDoc = nullptr) throw ( css::lang::IllegalArgumentException); + const css::uno::Reference< css::beans::XPropertySet >& xProps, ScDocument* pScDoc = nullptr); - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getColor() override ; + virtual void SAL_CALL setColor( const css::uno::Any& _color ) override ; - virtual css::uno::Any SAL_CALL getColorIndex() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getPattern() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPattern( const css::uno::Any& _pattern ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPatternColor() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getColorIndex() override; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override; + virtual css::uno::Any SAL_CALL getPattern() override; + virtual void SAL_CALL setPattern( const css::uno::Any& _pattern ) override; + virtual css::uno::Any SAL_CALL getPatternColor() override; + virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) override; + virtual css::uno::Any SAL_CALL getPatternColorIndex() override; + virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) override; //XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx index f0088b8af289..0e023ac17e0a 100644 --- a/sc/source/ui/vba/vbamenu.cxx +++ b/sc/source/ui/vba/vbamenu.cxx @@ -13,30 +13,30 @@ using namespace com::sun::star; using namespace ooo::vba; -ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) throw( uno::RuntimeException ) : Menu_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl ) +ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) : Menu_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl ) { } OUString SAL_CALL -ScVbaMenu::getCaption() throw ( uno::RuntimeException, std::exception ) +ScVbaMenu::getCaption() { return m_xCommandBarControl->getCaption(); } void SAL_CALL -ScVbaMenu::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception) +ScVbaMenu::setCaption( const OUString& _caption ) { m_xCommandBarControl->setCaption( _caption ); } void SAL_CALL -ScVbaMenu::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaMenu::Delete( ) { m_xCommandBarControl->Delete(); } uno::Any SAL_CALL -ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaMenu::MenuItems( const uno::Any& aIndex ) { uno::Reference< XCommandBarControls > xCommandBarControls( m_xCommandBarControl->Controls( uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< excel::XMenuItems > xMenuItems( new ScVbaMenuItems( this, mxContext, xCommandBarControls ) ); diff --git a/sc/source/ui/vba/vbamenu.hxx b/sc/source/ui/vba/vbamenu.hxx index 7cc42f0336b2..a6e0e23979db 100644 --- a/sc/source/ui/vba/vbamenu.hxx +++ b/sc/source/ui/vba/vbamenu.hxx @@ -22,13 +22,13 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenu( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl ) throw( css::uno::RuntimeException ); + ScVbaMenu( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl ); - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() override; + virtual void SAL_CALL setCaption( const OUString& _caption ) override; - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx index e400ab3a31e9..2c7c04b1597a 100644 --- a/sc/source/ui/vba/vbamenubar.cxx +++ b/sc/source/ui/vba/vbamenubar.cxx @@ -13,12 +13,12 @@ using namespace com::sun::star; using namespace ooo::vba; -ScVbaMenuBar::ScVbaMenuBar( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBar >& rCommandBar ) throw( uno::RuntimeException ) : MenuBar_BASE(rParent, rContext), m_xCommandBar(rCommandBar) +ScVbaMenuBar::ScVbaMenuBar( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBar >& rCommandBar ) : MenuBar_BASE(rParent, rContext), m_xCommandBar(rCommandBar) { } uno::Any SAL_CALL -ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaMenuBar::Menus( const uno::Any& aIndex ) { uno::Reference< XCommandBarControls > xCommandBarControls( m_xCommandBar->Controls( uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< excel::XMenus > xMenus( new ScVbaMenus( this, mxContext, xCommandBarControls ) ); diff --git a/sc/source/ui/vba/vbamenubar.hxx b/sc/source/ui/vba/vbamenubar.hxx index 03ebf37b212b..5a07657f3a9a 100644 --- a/sc/source/ui/vba/vbamenubar.hxx +++ b/sc/source/ui/vba/vbamenubar.hxx @@ -22,9 +22,9 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenuBar( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBar >& rCommandBar ) throw( css::uno::RuntimeException ); + ScVbaMenuBar( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBar >& rCommandBar ); - virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 93a63ec6350c..1c2759990c66 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -21,14 +21,14 @@ class MenuBarEnumeration : public ::cppu::WeakImplHelper< container::XEnumeratio uno::Reference< container::XEnumeration > m_xEnumeration; public: /// @throws uno::RuntimeException - MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) + MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasMoreElements() override { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL nextElement() override { // FIXME: should be add menubar if( hasMoreElements() ) @@ -42,7 +42,7 @@ public: } }; -ScVbaMenuBars::ScVbaMenuBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBars >& xCommandBars ) throw ( uno::RuntimeException ) : MenuBars_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBars( xCommandBars ) +ScVbaMenuBars::ScVbaMenuBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBars >& xCommandBars ) : MenuBars_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBars( xCommandBars ) { } @@ -52,13 +52,13 @@ ScVbaMenuBars::~ScVbaMenuBars() // XEnumerationAccess uno::Type SAL_CALL -ScVbaMenuBars::getElementType() throw ( uno::RuntimeException ) +ScVbaMenuBars::getElementType() { return cppu::UnoType<excel::XMenuBar>::get(); } uno::Reference< container::XEnumeration > -ScVbaMenuBars::createEnumeration() throw ( uno::RuntimeException ) +ScVbaMenuBars::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBars, uno::UNO_QUERY_THROW ); return uno::Reference< container::XEnumeration >( new MenuBarEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) ); @@ -72,14 +72,14 @@ ScVbaMenuBars::createCollectionObject( const uno::Any& aSource ) } sal_Int32 SAL_CALL -ScVbaMenuBars::getCount() throw(css::uno::RuntimeException) +ScVbaMenuBars::getCount() { return m_xCommandBars->getCount(); } // ScVbaCollectionBaseImpl uno::Any SAL_CALL -ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException ) +ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) { sal_Int16 nIndex = 0; aIndex >>= nIndex; diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx index 17ac680815a5..da2017c40baf 100644 --- a/sc/source/ui/vba/vbamenubars.hxx +++ b/sc/source/ui/vba/vbamenubars.hxx @@ -25,16 +25,16 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenuBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBars >& xCommandBars ) throw (css::uno::RuntimeException); + ScVbaMenuBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBars >& xCommandBars ); virtual ~ScVbaMenuBars() 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& aSource ) override; - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx index 48321652ca3f..1ef5836cfe91 100644 --- a/sc/source/ui/vba/vbamenuitem.cxx +++ b/sc/source/ui/vba/vbamenuitem.cxx @@ -11,36 +11,36 @@ using namespace com::sun::star; using namespace ooo::vba; -ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) throw( uno::RuntimeException ) : MenuItem_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl ) +ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) : MenuItem_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl ) { } OUString SAL_CALL -ScVbaMenuItem::getCaption() throw ( uno::RuntimeException, std::exception ) +ScVbaMenuItem::getCaption() { return m_xCommandBarControl->getCaption(); } void SAL_CALL -ScVbaMenuItem::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception) +ScVbaMenuItem::setCaption( const OUString& _caption ) { m_xCommandBarControl->setCaption( _caption ); } OUString SAL_CALL -ScVbaMenuItem::getOnAction() throw ( uno::RuntimeException, std::exception ) +ScVbaMenuItem::getOnAction() { return m_xCommandBarControl->getOnAction(); } void SAL_CALL -ScVbaMenuItem::setOnAction( const OUString& _onaction ) throw (uno::RuntimeException, std::exception) +ScVbaMenuItem::setOnAction( const OUString& _onaction ) { m_xCommandBarControl->setOnAction( _onaction ); } void SAL_CALL -ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaMenuItem::Delete( ) { m_xCommandBarControl->Delete(); } diff --git a/sc/source/ui/vba/vbamenuitem.hxx b/sc/source/ui/vba/vbamenuitem.hxx index 5fc1bbc38c78..86d22c34bde6 100644 --- a/sc/source/ui/vba/vbamenuitem.hxx +++ b/sc/source/ui/vba/vbamenuitem.hxx @@ -22,14 +22,14 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl ) throw( css::uno::RuntimeException ); + ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl ); - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() override; + virtual void SAL_CALL setCaption( const OUString& _caption ) override; + virtual OUString SAL_CALL getOnAction() override; + virtual void SAL_CALL setOnAction( const OUString& _onaction ) override; - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index d5fd6484ecf3..76fb396352c9 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -24,14 +24,14 @@ class MenuEnumeration : public MenuEnumeration_BASE uno::Reference< container::XEnumeration > m_xEnumeration; public: /// @throws uno::RuntimeException - MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) + MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasMoreElements() override { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL nextElement() override { // FIXME: should be add menu if( hasMoreElements() ) @@ -55,19 +55,19 @@ public: } }; -ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : MenuItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls ) +ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) : MenuItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls ) { } // XEnumerationAccess uno::Type SAL_CALL -ScVbaMenuItems::getElementType() throw ( uno::RuntimeException ) +ScVbaMenuItems::getElementType() { return cppu::UnoType<excel::XMenuItem>::get(); } uno::Reference< container::XEnumeration > -ScVbaMenuItems::createEnumeration() throw ( uno::RuntimeException ) +ScVbaMenuItems::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW ); return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) ); @@ -81,7 +81,7 @@ ScVbaMenuItems::createCollectionObject( const uno::Any& aSource ) } sal_Int32 SAL_CALL -ScVbaMenuItems::getCount() throw(css::uno::RuntimeException) +ScVbaMenuItems::getCount() { // FIXME: should check if it is a popup menu return m_xCommandBarControls->getCount(); @@ -89,7 +89,7 @@ ScVbaMenuItems::getCount() throw(css::uno::RuntimeException) // ScVbaCollectionBaseImpl uno::Any SAL_CALL -ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException ) +ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) { uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW ); if( xCommandBarControl->getType() == office::MsoControlType::msoControlPopup ) @@ -99,7 +99,7 @@ ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) thro throw uno::RuntimeException(); } -uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) { sal_Int32 nType = office::MsoControlType::msoControlButton; uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore ); diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx index 21a19cc98ddf..506e3a9b2b3e 100644 --- a/sc/source/ui/vba/vbamenuitems.hxx +++ b/sc/source/ui/vba/vbamenuitems.hxx @@ -24,17 +24,17 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenuItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException ); + ScVbaMenuItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ); // 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& aSource ) override; // Methods - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) override; + virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index 8247faf5898d..be32c02008d0 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -23,14 +23,14 @@ class MenuEnumeration : public MenuEnumeration_BASE uno::Reference< container::XEnumeration > m_xEnumeration; public: /// @throws uno::RuntimeException - MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) + MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasMoreElements() override { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL nextElement() override { // FIXME: should be add menu if( hasMoreElements() ) @@ -49,19 +49,19 @@ public: } }; -ScVbaMenus::ScVbaMenus( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : Menus_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls ) +ScVbaMenus::ScVbaMenus( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) : Menus_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls ) { } // XEnumerationAccess uno::Type SAL_CALL -ScVbaMenus::getElementType() throw ( uno::RuntimeException ) +ScVbaMenus::getElementType() { return cppu::UnoType<excel::XMenu>::get(); } uno::Reference< container::XEnumeration > -ScVbaMenus::createEnumeration() throw ( uno::RuntimeException ) +ScVbaMenus::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW ); return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) ); @@ -75,7 +75,7 @@ ScVbaMenus::createCollectionObject( const uno::Any& aSource ) } sal_Int32 SAL_CALL -ScVbaMenus::getCount() throw(css::uno::RuntimeException) +ScVbaMenus::getCount() { // FIXME: should check if it is a popup menu return m_xCommandBarControls->getCount(); @@ -83,7 +83,7 @@ ScVbaMenus::getCount() throw(css::uno::RuntimeException) // ScVbaCollectionBaseImpl uno::Any SAL_CALL -ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException ) +ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) { uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW ); if( xCommandBarControl->getType() != office::MsoControlType::msoControlPopup ) @@ -91,7 +91,7 @@ ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( u return uno::makeAny( uno::Reference< excel::XMenu > ( new ScVbaMenu( this, mxContext, xCommandBarControl ) ) ); } -uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) { sal_Int32 nType = office::MsoControlType::msoControlPopup; uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore ); diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx index dff934db42d2..3727d7500564 100644 --- a/sc/source/ui/vba/vbamenus.hxx +++ b/sc/source/ui/vba/vbamenus.hxx @@ -24,17 +24,17 @@ private: public: /// @throws css::uno::RuntimeException - ScVbaMenus( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException ); + ScVbaMenus( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ); // 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& aSource ) override; // Methods - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) override; + virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx index 7fe9a92a5f72..6e6e86e9ac4b 100644 --- a/sc/source/ui/vba/vbaname.cxx +++ b/sc/source/ui/vba/vbaname.cxx @@ -56,37 +56,37 @@ ScVbaName::~ScVbaName() } OUString -ScVbaName::getName() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getName() { return mxNamedRange->getName(); } void -ScVbaName::setName( const OUString & rName ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setName( const OUString & rName ) { mxNamedRange->setName( rName ); } OUString -ScVbaName::getNameLocal() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getNameLocal() { return getName(); } void -ScVbaName::setNameLocal( const OUString & rName ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setNameLocal( const OUString & rName ) { setName( rName ); } sal_Bool -ScVbaName::getVisible() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getVisible() { return true; } void -ScVbaName::setVisible( sal_Bool /*bVisible*/ ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setVisible( sal_Bool /*bVisible*/ ) { } @@ -131,7 +131,7 @@ void ScVbaName::setContent( const OUString& rContent, const formula::FormulaGra } OUString -ScVbaName::getValue() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getValue() { rtl::OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); @@ -139,62 +139,62 @@ ScVbaName::getValue() throw (css::uno::RuntimeException, std::exception) } void -ScVbaName::setValue( const OUString & rValue ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setValue( const OUString & rValue ) { setContent( rValue, formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); } OUString -ScVbaName::getRefersTo() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getRefersTo() { return getValue(); } void -ScVbaName::setRefersTo( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setRefersTo( const OUString & rRefersTo ) { setValue( rRefersTo ); } OUString -ScVbaName::getRefersToLocal() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getRefersToLocal() { return getRefersTo(); } void -ScVbaName::setRefersToLocal( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setRefersToLocal( const OUString & rRefersTo ) { setRefersTo( rRefersTo ); } OUString -ScVbaName::getRefersToR1C1() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getRefersToR1C1() { rtl::OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); return sResult; } void -ScVbaName::setRefersToR1C1( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setRefersToR1C1( const OUString & rRefersTo ) { setContent( rRefersTo, formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); } OUString -ScVbaName::getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getRefersToR1C1Local() { return getRefersToR1C1(); } void -ScVbaName::setRefersToR1C1Local( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception) +ScVbaName::setRefersToR1C1Local( const OUString & rRefersTo ) { setRefersTo( rRefersTo ); } css::uno::Reference< ov::excel::XRange > -ScVbaName::getRefersToRange() throw (css::uno::RuntimeException, std::exception) +ScVbaName::getRefersToRange() { uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), excel::getDocShell( mxModel ), formula::FormulaGrammar::CONV_XL_R1C1 ); @@ -202,7 +202,7 @@ ScVbaName::getRefersToRange() throw (css::uno::RuntimeException, std::exception) } void -ScVbaName::Delete() throw (css::uno::RuntimeException, std::exception) +ScVbaName::Delete() { mxNames->removeByName( mxNamedRange->getName() ); } diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index c2b049948e8b..300b836612b6 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -41,26 +41,26 @@ public: virtual ~ScVbaName() override; // Attributes - 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 getNameLocal() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNameLocal( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const OUString &rValue ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString &rName ) override; + virtual OUString SAL_CALL getNameLocal() override; + virtual void SAL_CALL setNameLocal( const OUString &rName ) override; + virtual sal_Bool SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( sal_Bool bVisible ) override; + virtual OUString SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const OUString &rValue ) override; + virtual OUString SAL_CALL getRefersTo() override; + virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) override; + virtual OUString SAL_CALL getRefersToLocal() override; + virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) override; + virtual OUString SAL_CALL getRefersToR1C1() override; + virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) override; + virtual OUString SAL_CALL getRefersToR1C1Local() override; + virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() override; // Methods - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete() override; // XHelperInterface virtual OUString getServiceImplName() override; diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index 7042651bbb88..f9f1e32b0472 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -44,9 +44,9 @@ class NamesEnumeration : public EnumerationHelperImpl uno::Reference< sheet::XNamedRanges > m_xNames; public: /// @throws uno::RuntimeException - NamesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel , const uno::Reference< sheet::XNamedRanges >& xNames ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ), m_xNames( xNames ) {} + NamesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel , const uno::Reference< sheet::XNamedRanges >& xNames ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ), m_xNames( xNames ) {} - 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< sheet::XNamedRange > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< excel::XName > ( new ScVbaName( m_xParent, m_xContext, xNamed ,m_xNames , m_xModel ) ) ); @@ -92,7 +92,6 @@ ScVbaNames::Add( const css::uno::Any& Name , const css::uno::Any& /*CategoryLocal*/, const css::uno::Any& RefersToR1C1, const css::uno::Any& RefersToR1C1Local ) - throw (css::uno::RuntimeException, std::exception) { OUString sName; uno::Reference< excel::XRange > xRange; @@ -227,13 +226,13 @@ ScVbaNames::Add( const css::uno::Any& Name , // XEnumerationAccess css::uno::Type -ScVbaNames::getElementType() throw( css::uno::RuntimeException ) +ScVbaNames::getElementType() { return cppu::UnoType<ov::excel::XName>::get(); } uno::Reference< container::XEnumeration > -ScVbaNames::createEnumeration() throw (uno::RuntimeException) +ScVbaNames::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( mxNames, uno::UNO_QUERY_THROW ); return new NamesEnumeration( getParent(), mxContext, xEnumAccess->createEnumeration(), mxModel , mxNames ); diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index 912171f9ee21..bf8be0ca29e5 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.hxx @@ -46,8 +46,8 @@ public: virtual ~ScVbaNames() 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; // Methods virtual css::uno::Any SAL_CALL Add( const css::uno::Any& aName , @@ -60,9 +60,7 @@ public: const css::uno::Any& aRefersToLocal, const css::uno::Any& aCategoryLocal, const css::uno::Any& aRefersToR1C1, - const css::uno::Any& aRefersToR1C1Local ) - throw (css::uno::RuntimeException, - std::exception) override; + const css::uno::Any& aRefersToR1C1Local ) override; virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index b47a127417e8..9030b8ad661b 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.cxx @@ -48,90 +48,90 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen } uno::Reference< uno::XInterface > SAL_CALL -ScVbaOLEObject::getObject() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getObject() { return uno::Reference< uno::XInterface >( m_xControl, uno::UNO_QUERY_THROW ); } sal_Bool SAL_CALL -ScVbaOLEObject::getEnabled() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getEnabled() { return m_xControl->getEnabled(); } void SAL_CALL -ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setEnabled( sal_Bool _enabled ) { m_xControl->setEnabled( _enabled ); } sal_Bool SAL_CALL -ScVbaOLEObject::getVisible() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getVisible() { return m_xControl->getVisible(); } void SAL_CALL -ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setVisible( sal_Bool _visible ) { m_xControl->setVisible( _visible ); } double SAL_CALL -ScVbaOLEObject::getLeft() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getLeft() { return m_xControl->getLeft(); } void SAL_CALL -ScVbaOLEObject::setLeft( double _left ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setLeft( double _left ) { m_xControl->setLeft( _left ); } double SAL_CALL -ScVbaOLEObject::getTop() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getTop() { return m_xControl->getTop(); } void SAL_CALL -ScVbaOLEObject::setTop( double _top ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setTop( double _top ) { m_xControl->setTop( _top ); } double SAL_CALL -ScVbaOLEObject::getHeight() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getHeight() { return m_xControl->getHeight(); } void SAL_CALL -ScVbaOLEObject::setHeight( double _height ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setHeight( double _height ) { m_xControl->setHeight( _height ); } double SAL_CALL -ScVbaOLEObject::getWidth() throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::getWidth() { return m_xControl->getWidth(); } void SAL_CALL -ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException, std::exception) +ScVbaOLEObject::setWidth( double _width ) { m_xControl->setWidth( _width ); } -OUString SAL_CALL ScVbaOLEObject::getLinkedCell() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaOLEObject::getLinkedCell() { return m_xControl->getControlSource(); } -void SAL_CALL ScVbaOLEObject::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaOLEObject::setLinkedCell( const OUString& _linkedcell ) { m_xControl->setControlSource( _linkedcell ); } diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index e9285496035e..f3dc86c8f1c8 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -38,22 +38,22 @@ public: css::uno::Reference< css::drawing::XControlShape > const & xControlShape ); // XOLEObject Attributes - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() override; + virtual sal_Bool SAL_CALL getEnabled() override; + virtual void SAL_CALL setEnabled( sal_Bool _enabled ) override; + virtual sal_Bool SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( sal_Bool _visible ) override; - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getLeft() override; + virtual void SAL_CALL setLeft( double _left ) override; + virtual double SAL_CALL getTop() override; + virtual void SAL_CALL setTop( double _top ) override; + virtual double SAL_CALL getHeight() override; + virtual void SAL_CALL setHeight( double _height ) override; + virtual double SAL_CALL getWidth() override; + virtual void SAL_CALL setWidth( double _width ) override; + virtual OUString SAL_CALL getLinkedCell() override; + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECT_HXX diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 5ea0dfe40443..6b700cc33f6f 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -49,12 +49,12 @@ public: } } - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount() override { return vObjects.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(); @@ -62,12 +62,12 @@ 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<drawing::XControlShape>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() override { return ( getCount() > 0 ); } @@ -84,12 +84,12 @@ class EnumWrapper : public EnumerationHelper_BASE public: EnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xContext( xContext), 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() ) { @@ -113,7 +113,7 @@ ScVbaOLEObjects::ScVbaOLEObjects( const uno::Reference< XHelperInterface >& xPar { } uno::Reference< container::XEnumeration > -ScVbaOLEObjects::createEnumeration() throw (uno::RuntimeException) +ScVbaOLEObjects::createEnumeration() { return new EnumWrapper( getParent(), mxContext, m_xIndexAccess ); } @@ -131,7 +131,7 @@ ScVbaOLEObjects::createCollectionObject( const css::uno::Any& aSource ) } uno::Any -ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) throw (uno::RuntimeException) +ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) { try { @@ -158,7 +158,7 @@ ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) throw (uno::Runt } uno::Type -ScVbaOLEObjects::getElementType() throw (uno::RuntimeException) +ScVbaOLEObjects::getElementType() { return cppu::UnoType<ooo::vba::excel::XOLEObject>::get(); } diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx index ef992d2c5857..3ffc0a31621b 100644 --- a/sc/source/ui/vba/vbaoleobjects.hxx +++ b/sc/source/ui/vba/vbaoleobjects.hxx @@ -29,7 +29,7 @@ typedef CollTestImplHelper< ov::excel::XOLEObjects > OLEObjectsImpl_BASE; class ScVbaOLEObjects : public OLEObjectsImpl_BASE { protected: - virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException) override; + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) override; virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; public: @@ -37,8 +37,8 @@ public: 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; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx index 23553b25f054..67c521e9be73 100644 --- a/sc/source/ui/vba/vbaoutline.cxx +++ b/sc/source/ui/vba/vbaoutline.cxx @@ -21,7 +21,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; void -ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevels ) throw (uno::RuntimeException, std::exception) +ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevels ) { if (mxOutline.is()) { diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx index ae1991e60007..fa38211daaa2 100644 --- a/sc/source/ui/vba/vbaoutline.hxx +++ b/sc/source/ui/vba/vbaoutline.hxx @@ -34,7 +34,7 @@ public: css::uno::Reference<css::sheet::XSheetOutline> const & outline): ScVbaOutline_BASE( xParent, xContext) , mxOutline(outline) {} - virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException, std::exception) override ; + virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) override ; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index 2f29060bb1a2..53a63c01e29a 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -27,7 +27,7 @@ template< typename... Ifc > ScVbaPageBreak< Ifc... >::ScVbaPageBreak( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< beans::XPropertySet >& xProps, - sheet::TablePageBreakData aTablePageBreakData) throw (uno::RuntimeException): + sheet::TablePageBreakData aTablePageBreakData): ScVbaPageBreak_BASE( xParent, xContext ), mxRowColPropertySet( xProps ), maTablePageBreakData( aTablePageBreakData ) @@ -35,7 +35,7 @@ ScVbaPageBreak< Ifc... >::ScVbaPageBreak( const uno::Reference< XHelperInterface } template< typename... Ifc > -sal_Int32 ScVbaPageBreak< Ifc... >::getType() throw (uno::RuntimeException) +sal_Int32 ScVbaPageBreak< Ifc... >::getType() { uno::Any aValue = mxRowColPropertySet->getPropertyValue("IsStartOfNewPage"); bool hasPageBreak = false; @@ -51,7 +51,7 @@ sal_Int32 ScVbaPageBreak< Ifc... >::getType() throw (uno::RuntimeException) } template< typename... Ifc > -void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type) throw (uno::RuntimeException) +void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type) { if( (type != excel::XlPageBreak::xlPageBreakNone) && (type != excel::XlPageBreak::xlPageBreakManual) && @@ -74,13 +74,13 @@ void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type) throw (uno::RuntimeExcept } template< typename... Ifc > -void ScVbaPageBreak< Ifc... >::Delete() throw ( script::BasicErrorException, uno::RuntimeException) +void ScVbaPageBreak< Ifc... >::Delete() { mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(false)); } template< typename... Ifc > -uno::Reference< excel::XRange> ScVbaPageBreak< Ifc... >::Location() throw ( script::BasicErrorException, uno::RuntimeException) +uno::Reference< excel::XRange> ScVbaPageBreak< Ifc... >::Location() { uno::Reference< table::XCellRange > xRange( mxRowColPropertySet, uno::UNO_QUERY_THROW ); return new ScVbaRange( ScVbaPageBreak_BASE::getParent(), ScVbaPageBreak_BASE::mxContext, xRange); @@ -113,7 +113,7 @@ template class ScVbaPageBreak< excel::XVPageBreak >; ScVbaVPageBreak::ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, - css::sheet::TablePageBreakData aTablePageBreakData ) throw ( css::uno::RuntimeException ) + css::sheet::TablePageBreakData aTablePageBreakData ) : ScVbaVPageBreak_BASE( xParent, xContext, xProps, aTablePageBreakData ) { } diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index 9b26b34e7da5..e86c799b050d 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -41,13 +41,13 @@ public: ScVbaPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, - css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException); + css::sheet::TablePageBreakData aTablePageBreakData); - virtual sal_Int32 SAL_CALL getType( ) throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL setType(sal_Int32 type) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getType( ) SAL_OVERRIDE; + virtual void SAL_CALL setType(sal_Int32 type) SAL_OVERRIDE; - virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL Delete() SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() SAL_OVERRIDE; }; typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE; @@ -59,7 +59,7 @@ public: ScVbaHPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, - css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException): + css::sheet::TablePageBreakData aTablePageBreakData): ScVbaHPageBreak_BASE( xParent,xContext,xProps,aTablePageBreakData ){} // XHelperInterface @@ -77,7 +77,7 @@ public: ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::beans::XPropertySet >& xProps, - css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException); + css::sheet::TablePageBreakData aTablePageBreakData); virtual ~ScVbaVPageBreak() override; diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index eccd1809c911..b5d964a7a206 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -41,7 +41,7 @@ public: } /// @throws css::uno::RuntimeException - sal_Int32 getAPIStartofRange( const uno::Reference< excel::XRange >& xRange ) throw (css::uno::RuntimeException) + sal_Int32 getAPIStartofRange( const uno::Reference< excel::XRange >& xRange ) { if( m_bColumn ) return xRange->getColumn() - 1; @@ -49,7 +49,7 @@ public: } /// @throws uno::RuntimeException - sal_Int32 getAPIEndIndexofRange( const uno::Reference< excel::XRange >& xRange, sal_Int32 nUsedStart ) throw (uno::RuntimeException) + sal_Int32 getAPIEndIndexofRange( const uno::Reference< excel::XRange >& xRange, sal_Int32 nUsedStart ) { if( m_bColumn ) return nUsedStart + xRange->Columns( uno::Any() )->getCount() - 1; @@ -57,7 +57,7 @@ public: } /// @throws uno::RuntimeException - uno::Sequence<sheet::TablePageBreakData> getAllPageBreaks() throw (uno::RuntimeException) + uno::Sequence<sheet::TablePageBreakData> getAllPageBreaks() { if( m_bColumn ) return mxSheetPageBreak->getColumnPageBreaks(); @@ -65,7 +65,7 @@ public: } /// @throws uno::RuntimeException - uno::Reference<container::XIndexAccess> getRowColContainer() throw (uno::RuntimeException) + uno::Reference<container::XIndexAccess> getRowColContainer() { uno::Reference< table::XColumnRowRange > xColumnRowRange( mxSheetPageBreak, uno::UNO_QUERY_THROW ); uno::Reference<container::XIndexAccess> xIndexAccess; @@ -77,21 +77,21 @@ public: } /// @throws uno::RuntimeException - sheet::TablePageBreakData getTablePageBreakData( sal_Int32 nAPIItemIndex ) throw (uno::RuntimeException); + sheet::TablePageBreakData getTablePageBreakData( sal_Int32 nAPIItemIndex ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - uno::Any Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException); + uno::Any Add( const css::uno::Any& Before ); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; + virtual uno::Type SAL_CALL getElementType( ) override { if( m_bColumn ) return cppu::UnoType<excel::XVPageBreak>::get(); return cppu::UnoType<excel::XHPageBreak>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } @@ -102,7 +102,7 @@ public: * also considers the position and sizes of shapes and manually inserted page breaks * Note: In MS there is a limit of 1026 horizontal page breaks per sheet. */ -sal_Int32 SAL_CALL RangePageBreaks::getCount( ) throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL RangePageBreaks::getCount( ) { sal_Int32 nCount = 0; uno::Reference< excel::XWorksheet > xWorksheet( mxParent, uno::UNO_QUERY_THROW ); @@ -123,7 +123,7 @@ sal_Int32 SAL_CALL RangePageBreaks::getCount( ) throw (uno::RuntimeException, s return nCount; } -uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index ) { if( (Index < getCount()) && ( Index >= 0 )) { @@ -141,7 +141,7 @@ uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index ) throw (lang::In throw lang::IndexOutOfBoundsException(); } -sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPIItemIndex ) throw (uno::RuntimeException) +sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPIItemIndex ) { sal_Int32 index = -1; sheet::TablePageBreakData aTablePageBreakData; @@ -166,7 +166,7 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI return aTablePageBreakData; } -uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) +uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) { uno::Reference< excel::XRange > xRange; Before >>= xRange; @@ -193,12 +193,12 @@ class RangePageBreaksEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit RangePageBreaksEnumWrapper( 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++ ); @@ -208,12 +208,12 @@ public: ScVbaHPageBreaks::ScVbaHPageBreaks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, - uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak) throw (uno::RuntimeException): + uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak): ScVbaHPageBreaks_BASE( xParent,xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, false )) { } -uno::Any SAL_CALL ScVbaHPageBreaks::Add( const uno::Any& Before) throw ( script::BasicErrorException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaHPageBreaks::Add( const uno::Any& Before) { RangePageBreaks* pPageBreaks = dynamic_cast< RangePageBreaks* >( m_xIndexAccess.get() ); if( pPageBreaks ) @@ -224,7 +224,7 @@ uno::Any SAL_CALL ScVbaHPageBreaks::Add( const uno::Any& Before) throw ( script: } uno::Reference< container::XEnumeration > -ScVbaHPageBreaks::createEnumeration() throw (uno::RuntimeException) +ScVbaHPageBreaks::createEnumeration() { return new RangePageBreaksEnumWrapper( m_xIndexAccess ); } @@ -236,7 +236,7 @@ ScVbaHPageBreaks::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException) +ScVbaHPageBreaks::getElementType() { return cppu::UnoType<excel::XHPageBreak>::get(); } @@ -262,7 +262,7 @@ ScVbaHPageBreaks::getServiceNames() //VPageBreak ScVbaVPageBreaks::ScVbaVPageBreaks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, - uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( uno::RuntimeException ) + uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak ) : ScVbaVPageBreaks_BASE( xParent, xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, true ) ) { } @@ -272,7 +272,7 @@ ScVbaVPageBreaks::~ScVbaVPageBreaks() } uno::Any SAL_CALL -ScVbaVPageBreaks::Add( const uno::Any& Before ) throw ( script::BasicErrorException, uno::RuntimeException, std::exception ) +ScVbaVPageBreaks::Add( const uno::Any& Before ) { RangePageBreaks* pPageBreaks = dynamic_cast< RangePageBreaks* >( m_xIndexAccess.get() ); if( pPageBreaks ) @@ -283,7 +283,7 @@ ScVbaVPageBreaks::Add( const uno::Any& Before ) throw ( script::BasicErrorExcept } uno::Reference< container::XEnumeration > -ScVbaVPageBreaks::createEnumeration() throw ( uno::RuntimeException ) +ScVbaVPageBreaks::createEnumeration() { return new RangePageBreaksEnumWrapper( m_xIndexAccess ); } @@ -295,7 +295,7 @@ ScVbaVPageBreaks::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException ) +ScVbaVPageBreaks::getElementType() { return cppu::UnoType<excel::XVPageBreak>::get(); } diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index 762e6e7c8af9..cf656d074128 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.hxx @@ -42,14 +42,14 @@ public: /// @throws css::uno::RuntimeException ScVbaHPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak) throw (css::uno::RuntimeException); + css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak); // XHPageBreaks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) 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 @@ -66,16 +66,16 @@ public: /// @throws css::uno::RuntimeException ScVbaVPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( css::uno::RuntimeException ); + css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak ); virtual ~ScVbaVPageBreaks() override; // XVPageBreaks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) 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 diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index d39af7984864..64179f85f658 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -45,7 +45,7 @@ using namespace ::ooo::vba; ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheet >& xSheet, - const uno::Reference< frame::XModel >& xModel) throw (uno::RuntimeException): + const uno::Reference< frame::XModel >& xModel): ScVbaPageSetup_BASE( xParent, xContext ), mxSheet( xSheet ), mbIsLandscape( false ) { // query for current page style @@ -64,7 +64,7 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent mxPageProps->getPropertyValue("IsLandscape") >>= mbIsLandscape; } -OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getPrintArea() { OUString aPrintArea; uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW ); @@ -87,7 +87,7 @@ OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeExcepti return aPrintArea; } -void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) { uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW ); if( rAreas.isEmpty() || @@ -116,32 +116,32 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) throw (css: } } -double SAL_CALL ScVbaPageSetup::getHeaderMargin() throw (css::uno::RuntimeException) +double SAL_CALL ScVbaPageSetup::getHeaderMargin() { return VbaPageSetupBase::getHeaderMargin(); } -void SAL_CALL ScVbaPageSetup::setHeaderMargin( double margin ) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setHeaderMargin( double margin ) { VbaPageSetupBase::setHeaderMargin( margin ); } -double SAL_CALL ScVbaPageSetup::getFooterMargin() throw (css::uno::RuntimeException) +double SAL_CALL ScVbaPageSetup::getFooterMargin() { return VbaPageSetupBase::getFooterMargin(); } -void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) { VbaPageSetupBase::setFooterMargin( margin ); } -uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() { return mxPageProps->getPropertyValue("ScaleToPagesY"); } -void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) { sal_uInt16 scaleToPageY = 0; try @@ -159,12 +159,12 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) } } -uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide() throw (css::uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide() { return mxPageProps->getPropertyValue("ScaleToPagesX"); } -void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) { sal_uInt16 scaleToPageX = 0; try @@ -182,12 +182,12 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) } } -uno::Any SAL_CALL ScVbaPageSetup::getZoom() throw (css::uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaPageSetup::getZoom() { return mxPageProps->getPropertyValue("PageScale"); } -void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) { sal_uInt16 pageScale = 0; try @@ -230,7 +230,7 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru mxPageProps->setPropertyValue("PageScale", uno::makeAny( pageScale )); } -OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getLeftHeader() { OUString leftHeader; try @@ -249,7 +249,7 @@ OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeExcept return leftHeader; } -void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) { try { @@ -266,7 +266,7 @@ void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) throw ( } } -OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getCenterHeader() { OUString centerHeader; try @@ -285,7 +285,7 @@ OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeExce return centerHeader; } -void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) { try { @@ -302,7 +302,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) thr } } -OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getRightHeader() { OUString rightHeader; try @@ -321,7 +321,7 @@ OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeExcep return rightHeader; } -void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) { try { @@ -338,7 +338,7 @@ void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) throw } } -OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getLeftFooter() { OUString leftFooter; try @@ -357,7 +357,7 @@ OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeExcept return leftFooter; } -void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) { try { @@ -374,7 +374,7 @@ void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) throw ( } } -OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getCenterFooter() { OUString centerFooter; try @@ -393,7 +393,7 @@ OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeExce return centerFooter; } -void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) { try { @@ -411,7 +411,7 @@ void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) thr } -OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getRightFooter() { OUString rightFooter; try @@ -430,7 +430,7 @@ OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeExcep return rightFooter; } -void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) { try { @@ -447,7 +447,7 @@ void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) throw } } -sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() { sal_Int32 order = excel::XlOrder::xlDownThenOver; try @@ -465,7 +465,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException, return order; } -void SAL_CALL ScVbaPageSetup::setOrder(sal_Int32 order) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setOrder(sal_Int32 order) { bool bOrder = true; switch( order ) @@ -488,7 +488,7 @@ void SAL_CALL ScVbaPageSetup::setOrder(sal_Int32 order) throw (css::uno::Runtime } } -sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() { sal_Int16 number = 0; try @@ -508,7 +508,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime return number; } -void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) { if( firstPageNumber == excel::Constants::xlAutomatic ) firstPageNumber = 0; @@ -524,7 +524,7 @@ void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) thr } } -sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() { bool centerVertically = false; try @@ -538,7 +538,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::Runtime return centerVertically; } -void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) { try { @@ -549,7 +549,7 @@ void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) th } } -sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() { bool centerHorizontally = false; try @@ -563,7 +563,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::Runti return centerHorizontally; } -void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally) { try { @@ -574,7 +574,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally } } -sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() { bool printHeadings = false; try @@ -588,7 +588,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeExc return printHeadings; } -void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) { try { @@ -599,32 +599,32 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c } } -sal_Bool SAL_CALL ScVbaPageSetup::getPrintGridlines() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaPageSetup::getPrintGridlines() { return false; } -void SAL_CALL ScVbaPageSetup::setPrintGridlines( sal_Bool /*_printgridlines*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPrintGridlines( sal_Bool /*_printgridlines*/ ) { } -OUString SAL_CALL ScVbaPageSetup::getPrintTitleRows() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getPrintTitleRows() { return OUString(); } -void SAL_CALL ScVbaPageSetup::setPrintTitleRows( const OUString& /*_printtitlerows*/ ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPrintTitleRows( const OUString& /*_printtitlerows*/ ) { } -OUString SAL_CALL ScVbaPageSetup::getPrintTitleColumns() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaPageSetup::getPrintTitleColumns() { return OUString(); } -void SAL_CALL ScVbaPageSetup::setPrintTitleColumns( const OUString& /*_printtitlecolumns*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPrintTitleColumns( const OUString& /*_printtitlecolumns*/ ) { } -sal_Int32 SAL_CALL ScVbaPageSetup::getPaperSize() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaPageSetup::getPaperSize() { awt::Size aSize; // current papersize mxPageProps->getPropertyValue( "Size" ) >>= aSize; @@ -637,7 +637,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getPaperSize() throw (uno::RuntimeException, return nPaperSizeIndex; } -void SAL_CALL ScVbaPageSetup::setPaperSize( sal_Int32 papersize ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaPageSetup::setPaperSize( sal_Int32 papersize ) { if ( papersize != excel::XlPaperSize::xlPaperUser ) { diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index f0b84bc3eabd..e1c6c4cfc50b 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.hxx @@ -39,52 +39,52 @@ public: ScVbaPageSetup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSpreadsheet>& xSheet, - const css::uno::Reference< css::frame::XModel >& xModel) throw (css::uno::RuntimeException); + const css::uno::Reference< css::frame::XModel >& xModel); // Attribute - virtual OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException) override; - void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException) override; - double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException) override; - void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getFitToPagesTall() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFitToPagesWide() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getOrder() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOrder( sal_Int32 order ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getFirstPageNumber() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFirstPageNumber( sal_Int32 firstPageNumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCenterVertically() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCenterVertically( sal_Bool centerVertically ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCenterHorizontally() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCenterHorizontally( sal_Bool centerHorizontally ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrintHeadings() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPrintArea() override; + virtual void SAL_CALL setPrintArea( const OUString& rAreas ) override; + virtual double SAL_CALL getHeaderMargin() override; + void SAL_CALL setHeaderMargin( double margin ) override; + double SAL_CALL getFooterMargin() override; + void SAL_CALL setFooterMargin( double margin ) override; + virtual css::uno::Any SAL_CALL getFitToPagesTall() override; + virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) override; + virtual css::uno::Any SAL_CALL getFitToPagesWide() override; + virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) override; + virtual css::uno::Any SAL_CALL getZoom() override; + virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) override; + virtual OUString SAL_CALL getLeftHeader() override; + virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) override; + virtual OUString SAL_CALL getCenterHeader() override; + virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) override; + virtual OUString SAL_CALL getRightHeader() override; + virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) override; + virtual OUString SAL_CALL getLeftFooter() override; + virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) override; + virtual OUString SAL_CALL getCenterFooter() override; + virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) override; + virtual OUString SAL_CALL getRightFooter() override; + virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) override; + virtual sal_Int32 SAL_CALL getOrder() override; + virtual void SAL_CALL setOrder( sal_Int32 order ) override; + virtual sal_Int32 SAL_CALL getFirstPageNumber() override; + virtual void SAL_CALL setFirstPageNumber( sal_Int32 firstPageNumber ) override; + virtual sal_Bool SAL_CALL getCenterVertically() override; + virtual void SAL_CALL setCenterVertically( sal_Bool centerVertically ) override; + virtual sal_Bool SAL_CALL getCenterHorizontally() override; + virtual void SAL_CALL setCenterHorizontally( sal_Bool centerHorizontally ) override; + virtual sal_Bool SAL_CALL getPrintHeadings() override; + virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) override; - virtual sal_Bool SAL_CALL getPrintGridlines() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintGridlines( sal_Bool _printgridlines ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getPrintTitleRows() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPaperSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getPrintGridlines() override; + virtual void SAL_CALL setPrintGridlines( sal_Bool _printgridlines ) override; + virtual ::rtl::OUString SAL_CALL getPrintTitleRows() override; + virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) override; + virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() override; + virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) override; + virtual sal_Int32 SAL_CALL getPaperSize() override; + virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index e6b577f2f3d5..7454b6f01792 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -54,12 +54,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(spnDefColorTable8); } - 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(); @@ -67,11 +67,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/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx index 1b8e905e489a..5abb35c853be 100644 --- a/sc/source/ui/vba/vbapane.cxx +++ b/sc/source/ui/vba/vbapane.cxx @@ -30,7 +30,7 @@ ScVbaPane::ScVbaPane( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& rModel, - const uno::Reference< sheet::XViewPane >& rViewPane ) throw (uno::RuntimeException) : + const uno::Reference< sheet::XViewPane >& rViewPane ) : m_xModel(rModel, uno::UNO_SET_THROW), m_xViewPane(rViewPane, uno::UNO_SET_THROW), m_xParent(xParent), @@ -39,13 +39,13 @@ ScVbaPane::ScVbaPane( } sal_Int32 SAL_CALL -ScVbaPane::getScrollColumn() throw (uno::RuntimeException, std::exception) +ScVbaPane::getScrollColumn() { return ( m_xViewPane->getFirstVisibleColumn() + 1 ); } void SAL_CALL -ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeException, std::exception) +ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) { if( _scrollcolumn < 1 ) { @@ -55,13 +55,13 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti } sal_Int32 SAL_CALL -ScVbaPane::getScrollRow() throw (uno::RuntimeException, std::exception) +ScVbaPane::getScrollRow() { return ( m_xViewPane->getFirstVisibleRow() + 1 ); } void SAL_CALL -ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException, std::exception) +ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) { if( _scrollrow < 1 ) { @@ -71,7 +71,7 @@ ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException, st } uno::Reference< excel::XRange > SAL_CALL -ScVbaPane::getVisibleRange() throw (uno::RuntimeException, std::exception) +ScVbaPane::getVisibleRange() { // TODO: Excel includes partly visible rows/columns, Calc does not table::CellRangeAddress aRangeAddr = m_xViewPane->getVisibleRange(); @@ -85,7 +85,7 @@ ScVbaPane::getVisibleRange() throw (uno::RuntimeException, std::exception) //Method void SAL_CALL -ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception) +ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) { OUString messageBuffer; sal_Int32 downRows = 0; @@ -138,7 +138,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any } void SAL_CALL -ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception) +ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) { OUString messageBuffer; table::CellRangeAddress visibleRange = m_xViewPane->getVisibleRange(); diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx index 831aca519f6a..5c3589223219 100644 --- a/sc/source/ui/vba/vbapane.hxx +++ b/sc/source/ui/vba/vbapane.hxx @@ -33,18 +33,18 @@ public: const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, - const css::uno::Reference< css::sheet::XViewPane >& rViewPane ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::sheet::XViewPane >& rViewPane ); // XPane attributes - virtual sal_Int32 SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScrollColumn( sal_Int32 _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setScrollRow( sal_Int32 _scrollrow ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getScrollColumn() override; + virtual void SAL_CALL setScrollColumn( sal_Int32 _scrollcolumn ) override; + virtual sal_Int32 SAL_CALL getScrollRow() override; + virtual void SAL_CALL setScrollRow( sal_Int32 _scrollrow ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() override; // XPane methods - virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override; + virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override; protected: css::uno::Reference< css::frame::XModel > m_xModel; diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index fff859362c9d..db42296a52c4 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -26,7 +26,7 @@ ScVbaPivotCache::ScVbaPivotCache( const uno::Reference< XHelperInterface >& xPar } void SAL_CALL -ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException, std::exception) +ScVbaPivotCache::Refresh() { m_xTable->refresh(); } diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx index 417d20370c02..f7004774dffc 100644 --- a/sc/source/ui/vba/vbapivotcache.hxx +++ b/sc/source/ui/vba/vbapivotcache.hxx @@ -32,7 +32,7 @@ class ScVbaPivotCache : public PivotCacheImpl_BASE public: ScVbaPivotCache( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); - virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Refresh() override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index 2e3758f7f388..a8af3db58e2a 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -27,7 +27,7 @@ ScVbaPivotTable::ScVbaPivotTable( const uno::Reference< uno::XComponentContext > } uno::Reference< excel::XPivotCache > -ScVbaPivotTable::PivotCache() throw (uno::RuntimeException, std::exception) +ScVbaPivotTable::PivotCache() { // #FIXME with a quick example failed to determine what the parent // should be, leaving as null at the moment diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx index b673f6a730ea..eb16e9905efe 100644 --- a/sc/source/ui/vba/vbapivottable.hxx +++ b/sc/source/ui/vba/vbapivottable.hxx @@ -31,7 +31,7 @@ class ScVbaPivotTable : public PivotTableImpl_BASE css::uno::Reference< css::sheet::XDataPilotTable > m_xTable; public: ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); - virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index 97facba0c103..f60c5e53b7db 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -34,9 +34,9 @@ class PivotTableEnumeration : public EnumerationHelperImpl { public: /// @throws uno::RuntimeException - PivotTableEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} + PivotTableEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { return DataPilotToPivotTable( m_xEnumeration->nextElement(), m_xContext ); } @@ -48,7 +48,7 @@ ScVbaPivotTables::ScVbaPivotTables( const uno::Reference< XHelperInterface >& xP } uno::Reference< container::XEnumeration > -ScVbaPivotTables::createEnumeration() throw (uno::RuntimeException) +ScVbaPivotTables::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return new PivotTableEnumeration( mxParent, mxContext, xEnumAccess->createEnumeration() ); @@ -61,7 +61,7 @@ ScVbaPivotTables::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaPivotTables::getElementType() throw (uno::RuntimeException) +ScVbaPivotTables::getElementType() { return cppu::UnoType<excel::XPivotTable>::get(); } diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index 908afee55bd1..5b95d9724472 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -37,8 +37,8 @@ public: ScVbaPivotTables( 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; // XPivotTables diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 8599c4450e44..4d444f2aaebc 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -253,7 +253,7 @@ static uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const return xRange; } -ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException ) +ScCellRangesBase* ScVbaRange::getCellRangesBase() { if( mxRanges.is() ) return ScCellRangesBase::getImplementation( mxRanges ); @@ -262,12 +262,12 @@ ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException throw uno::RuntimeException("General Error creating range - Unknown" ); } -ScCellRangeObj* ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException ) +ScCellRangeObj* ScVbaRange::getCellRangeObj() { return dynamic_cast< ScCellRangeObj* >( getCellRangesBase() ); } -SfxItemSet* ScVbaRange::getCurrentDataSet( ) throw (uno::RuntimeException, std::exception) +SfxItemSet* ScVbaRange::getCurrentDataSet( ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) @@ -299,9 +299,9 @@ class SingleRangeEnumeration : public EnumerationHelper_BASE bool bHasMore; public: /// @throws uno::RuntimeException - explicit SingleRangeEnumeration( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) : m_xRange( xRange ), bHasMore( true ) { } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return bHasMore; } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + explicit SingleRangeEnumeration( const uno::Reference< table::XCellRange >& xRange ) : m_xRange( xRange ), bHasMore( true ) { } + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return bHasMore; } + virtual uno::Any SAL_CALL nextElement( ) override { if ( !bHasMore ) throw container::NoSuchElementException(); @@ -322,18 +322,18 @@ private: public: explicit SingleRangeIndexAccess( const uno::Reference< table::XCellRange >& xRange ) : m_xRange( xRange ) {} // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (::uno::RuntimeException, std::exception) override { return 1; } - 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 1; } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index != 0 ) throw lang::IndexOutOfBoundsException(); return uno::makeAny( m_xRange ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<table::XCellRange>::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<table::XCellRange>::get(); } + virtual sal_Bool SAL_CALL hasElements() override { return true; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) override { return new SingleRangeEnumeration( m_xRange ); } + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() override { return new SingleRangeEnumeration( m_xRange ); } }; @@ -343,8 +343,8 @@ class RangesEnumerationImpl : public EnumerationHelperImpl bool mbIsColumns; public: /// @throws uno::RuntimeException - RangesEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + RangesEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {} + virtual uno::Any SAL_CALL nextElement( ) override { return lcl_makeRange( m_xParent, m_xContext, m_xEnumeration->nextElement(), mbIsRows, mbIsColumns ); } @@ -358,10 +358,10 @@ public: ScVbaRangeAreas( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, bool bIsRows, bool bIsColumns ) : ScVbaCollectionBaseImpl( xParent, xContext, xIndexAccess ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {} // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException) override; + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException) override { return cppu::UnoType<excel::XRange>::get(); } + virtual uno::Type SAL_CALL getElementType() override { return cppu::UnoType<excel::XRange>::get(); } virtual uno::Any createCollectionObject( const uno::Any& aSource ) override; @@ -372,7 +372,7 @@ public: }; uno::Reference< container::XEnumeration > SAL_CALL -ScVbaRangeAreas::createEnumeration() throw (uno::RuntimeException) +ScVbaRangeAreas::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW ); return new RangesEnumerationImpl( mxParent, mxContext, xEnumAccess->createEnumeration(), mbIsRows, mbIsColumns ); @@ -387,7 +387,7 @@ ScVbaRangeAreas::createCollectionObject( const uno::Any& aSource ) // assume that xIf is infact a ScCellRangesBase /// @throws uno::RuntimeException ScDocShell* -getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException ) +getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) { ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf ); if ( !pUno ) @@ -397,7 +397,7 @@ getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::R /// @throws uno::RuntimeException ScDocShell* -getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) +getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) { // need the ScCellRangesBase to get docshell uno::Reference< uno::XInterface > xIf( xRange ); @@ -406,7 +406,7 @@ getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) throw /// @throws uno::RuntimeException ScDocShell* -getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) throw ( uno::RuntimeException ) +getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) { // need the ScCellRangesBase to get docshell uno::Reference< uno::XInterface > xIf( xRanges ); @@ -414,14 +414,14 @@ getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >& } /// @throws uno::RuntimeException -uno::Reference< frame::XModel > getModelFromXIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException ) +uno::Reference< frame::XModel > getModelFromXIf( const uno::Reference< uno::XInterface >& xIf ) { ScDocShell* pDocShell = getDocShellFromIf(xIf ); return pDocShell->GetModel(); } /// @throws uno::RuntimeException -uno::Reference< frame::XModel > getModelFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) +uno::Reference< frame::XModel > getModelFromRange( const uno::Reference< table::XCellRange >& xRange ) { // the XInterface for getImplementation can be any derived interface, no need for queryInterface uno::Reference< uno::XInterface > xIf( xRange ); @@ -439,7 +439,7 @@ getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange ) } ScDocument& -ScVbaRange::getScDocument() throw (uno::RuntimeException) +ScVbaRange::getScDocument() { if ( mxRanges.is() ) { @@ -451,7 +451,7 @@ ScVbaRange::getScDocument() throw (uno::RuntimeException) } ScDocShell* -ScVbaRange::getScDocShell() throw (uno::RuntimeException) +ScVbaRange::getScDocShell() { if ( mxRanges.is() ) { @@ -468,28 +468,28 @@ ScVbaRange* ScVbaRange::getImplementation( const uno::Reference< excel::XRange > return dynamic_cast< ScVbaRange* >( rxRange.get() ); } -uno::Reference< frame::XModel > ScVbaRange::getUnoModel() throw (uno::RuntimeException) +uno::Reference< frame::XModel > ScVbaRange::getUnoModel() { if( ScDocShell* pDocShell = getScDocShell() ) return pDocShell->GetModel(); throw uno::RuntimeException(); } -uno::Reference< frame::XModel > ScVbaRange::getUnoModel( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) +uno::Reference< frame::XModel > ScVbaRange::getUnoModel( const uno::Reference< excel::XRange >& rxRange ) { if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) ) return pScVbaRange->getUnoModel(); throw uno::RuntimeException(); } -const ScRangeList& ScVbaRange::getScRangeList() throw (uno::RuntimeException) +const ScRangeList& ScVbaRange::getScRangeList() { if( ScCellRangesBase* pScRangesBase = getCellRangesBase() ) return pScRangesBase->GetRangeList(); throw uno::RuntimeException("Cannot obtain UNO range implementation object" ); } -const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) +const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) { if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) ) return pScVbaRange->getScRangeList(); @@ -626,9 +626,9 @@ public: { } - virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) override { return mCurElem < mMaxElems; } + virtual sal_Bool SAL_CALL hasMoreElements() override { return mCurElem < mMaxElems; } - 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(); @@ -646,7 +646,7 @@ class CellsEnumeration : public CellsEnumeration_BASE vCellPos::const_iterator m_it; /// @throws uno::RuntimeException - uno::Reference< table::XCellRange > getArea( sal_Int32 nVBAIndex ) throw ( uno::RuntimeException ) + uno::Reference< table::XCellRange > getArea( sal_Int32 nVBAIndex ) { if ( nVBAIndex < 1 || nVBAIndex > m_xAreas->getCount() ) throw uno::RuntimeException(); @@ -677,9 +677,9 @@ public: } m_it = m_CellPositions.begin(); } - virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) override { return m_it != m_CellPositions.end(); } + virtual sal_Bool SAL_CALL hasMoreElements() override { return m_it != m_CellPositions.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(); @@ -1097,42 +1097,42 @@ class RangeHelper public: /// @throws uno::RuntimeException - explicit RangeHelper( const uno::Reference< table::XCellRange >& xCellRange ) throw (uno::RuntimeException) : m_xCellRange( xCellRange ) + explicit RangeHelper( const uno::Reference< table::XCellRange >& xCellRange ) : m_xCellRange( xCellRange ) { if ( !m_xCellRange.is() ) throw uno::RuntimeException(); } /// @throws uno::RuntimeException - explicit RangeHelper( const uno::Any& rCellRange ) throw (uno::RuntimeException) + explicit RangeHelper( const uno::Any& rCellRange ) { m_xCellRange.set(rCellRange, uno::UNO_QUERY_THROW); } /// @throws uno::RuntimeException - uno::Reference< sheet::XSheetCellRange > getSheetCellRange() throw (uno::RuntimeException) + uno::Reference< sheet::XSheetCellRange > getSheetCellRange() { return uno::Reference< sheet::XSheetCellRange >(m_xCellRange, uno::UNO_QUERY_THROW); } /// @throws uno::RuntimeException - uno::Reference< sheet::XSpreadsheet > getSpreadSheet() throw (uno::RuntimeException) + uno::Reference< sheet::XSpreadsheet > getSpreadSheet() { return getSheetCellRange()->getSpreadsheet(); } /// @throws uno::RuntimeException - uno::Reference< table::XCellRange > getCellRangeFromSheet() throw (uno::RuntimeException) + uno::Reference< table::XCellRange > getCellRangeFromSheet() { return uno::Reference< table::XCellRange >(getSpreadSheet(), uno::UNO_QUERY_THROW ); } /// @throws uno::RuntimeException - uno::Reference< sheet::XCellRangeAddressable > getCellRangeAddressable() throw (uno::RuntimeException) + uno::Reference< sheet::XCellRangeAddressable > getCellRangeAddressable() { return uno::Reference< sheet::XCellRangeAddressable >(m_xCellRange, ::uno::UNO_QUERY_THROW); } /// @throws uno::RuntimeException - uno::Reference< sheet::XSheetCellCursor > getSheetCellCursor() throw ( uno::RuntimeException ) + uno::Reference< sheet::XSheetCellCursor > getSheetCellCursor() { return uno::Reference< sheet::XSheetCellCursor >( getSpreadSheet()->createCursorByRange( getSheetCellRange() ), uno::UNO_QUERY_THROW ); } @@ -1167,7 +1167,7 @@ ScVbaRange::getCellRangesForAddress( ScRefFlags& rResFlags, const OUString& sAdd return false; } -bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv ) throw ( uno::RuntimeException ) +bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv ) { // see if there is a match with a named range uno::Reference< beans::XPropertySet > xProps( pDocSh->GetModel(), uno::UNO_QUERY_THROW ); @@ -1241,7 +1241,7 @@ bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRang /// @throws uno::RuntimeException ScVbaRange* -getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException, std::exception ) +getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) { ScRangeList aCellRanges; ScRange refRange; @@ -1265,13 +1265,13 @@ namespace { /// @throws uno::RuntimeException template< typename RangeType > -inline table::CellRangeAddress lclGetRangeAddress( const uno::Reference< RangeType >& rxCellRange ) throw (uno::RuntimeException) +inline table::CellRangeAddress lclGetRangeAddress( const uno::Reference< RangeType >& rxCellRange ) { return uno::Reference< sheet::XCellRangeAddressable >( rxCellRange, uno::UNO_QUERY_THROW )->getRangeAddress(); } /// @throws uno::RuntimeException -void lclClearRange( const uno::Reference< table::XCellRange >& rxCellRange ) throw (uno::RuntimeException) +void lclClearRange( const uno::Reference< table::XCellRange >& rxCellRange ) { using namespace ::com::sun::star::sheet::CellFlags; sal_Int32 nFlags = VALUE | DATETIME | STRING | ANNOTATION | FORMULA | HARDATTR | STYLES | EDITATTR | FORMATTED; @@ -1280,7 +1280,7 @@ void lclClearRange( const uno::Reference< table::XCellRange >& rxCellRange ) thr } /// @throws uno::RuntimeException -uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference< table::XCellRange >& rxCellRange, bool bRecursive ) throw (uno::RuntimeException) +uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference< table::XCellRange >& rxCellRange, bool bRecursive ) { uno::Reference< sheet::XSheetCellRange > xNewCellRange( rxCellRange, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheet > xSheet( xNewCellRange->getSpreadsheet(), uno::UNO_SET_THROW ); @@ -1300,7 +1300,7 @@ uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference } /// @throws uno::RuntimeException -uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive ) throw (uno::RuntimeException) +uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive ) { if( !rxCellRanges.is() ) throw uno::RuntimeException("Missing cell ranges object" ); @@ -1321,7 +1321,7 @@ uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno:: } /// @throws uno::RuntimeException -void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange, bool bMerge ) throw (uno::RuntimeException) +void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange, bool bMerge ) { uno::Reference< util::XMergeable > xMerge( lclExpandToMerged( rxCellRange, true ), uno::UNO_QUERY_THROW ); // Calc cannot merge over merged ranges, always unmerge first @@ -1344,7 +1344,7 @@ void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange, } /// @throws uno::RuntimeException -util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxCellRange ) throw (uno::RuntimeException) +util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxCellRange ) { /* 1) Check if range is completely inside one single merged range. To do this, try to extend from top-left cell only (not from entire range). @@ -1374,14 +1374,14 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC css::uno::Reference< excel::XRange > ScVbaRange::getRangeObjectForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sRangeName, - ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) throw ( uno::RuntimeException, std::exception ) + ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) { table::CellRangeAddress refAddr; return getRangeForName( xContext, sRangeName, pDocSh, refAddr, eConv ); } /// @throws uno::RuntimeException -table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh ) throw ( uno::RuntimeException ) +table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh ) { uno::Reference< table::XCellRange > xRangeParam; switch ( aParam.getValueTypeClass() ) @@ -1421,7 +1421,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, /// @throws uno::RuntimeException static uno::Reference< XCollection > -lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext, const uno::Reference< table::XCellRange >& xRange ) throw( uno::RuntimeException ) +lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext, const uno::Reference< table::XCellRange >& xRange ) { uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW ); ScDocument& rDoc = getDocumentFromRange(xRange); @@ -1431,7 +1431,7 @@ lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno } ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args, - uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) : ScVbaRange_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( false ), mbIsColumns( false ) + uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaRange_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( false ), mbIsColumns( false ) { mxRange.set( mxPropertySet, uno::UNO_QUERY ); mxRanges.set( mxPropertySet, uno::UNO_QUERY ); @@ -1447,7 +1447,7 @@ ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args, m_Areas = new ScVbaRangeAreas( mxParent, mxContext, xIndex, mbIsRows, mbIsColumns ); } -ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, bool bIsRows, bool bIsColumns ) throw( lang::IllegalArgumentException ) +ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, bool bIsRows, bool bIsColumns ) : ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRange, uno::UNO_QUERY_THROW ), getModelFromRange( xRange), true ), mxRange( xRange ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) @@ -1463,7 +1463,6 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const } ScVbaRange::ScVbaRange(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows, bool bIsColumns) - throw (lang::IllegalArgumentException, uno::RuntimeException) : ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRanges, uno::UNO_QUERY_THROW ), getModelFromXIf( uno::Reference< uno::XInterface >( xRanges, uno::UNO_QUERY_THROW ) ), true ), mxRanges( xRanges ),mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) { @@ -1504,7 +1503,7 @@ ScVbaRange::visitArray( ArrayVisitor& visitor ) } uno::Any -ScVbaRange::getValue( ValueGetter& valueGetter) throw (uno::RuntimeException) +ScVbaRange::getValue( ValueGetter& valueGetter) { uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW ); // single cell range @@ -1522,7 +1521,7 @@ ScVbaRange::getValue( ValueGetter& valueGetter) throw (uno::RuntimeException) } uno::Any SAL_CALL -ScVbaRange::getValue() throw (uno::RuntimeException, std::exception) +ScVbaRange::getValue() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1540,7 +1539,7 @@ ScVbaRange::getValue() throw (uno::RuntimeException, std::exception) } void -ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter ) throw (uno::RuntimeException) +ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter ) { uno::TypeClass aClass = aValue.getValueTypeClass(); if ( aClass == uno::TypeClass_SEQUENCE ) @@ -1577,7 +1576,7 @@ ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter ) throw ( } void SAL_CALL -ScVbaRange::setValue( const uno::Any &aValue ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setValue( const uno::Any &aValue ) { // If this is a multiple selection apply setValue over all areas if ( m_Areas->getCount() > 1 ) @@ -1592,7 +1591,7 @@ ScVbaRange::setValue( const uno::Any &aValue ) throw (uno::RuntimeException, st } void SAL_CALL -ScVbaRange::Clear() throw (uno::RuntimeException, std::exception) +ScVbaRange::Clear() { using namespace ::com::sun::star::sheet::CellFlags; sal_Int32 nFlags = VALUE | DATETIME | STRING | FORMULA | HARDATTR | EDITATTR | FORMATTED; @@ -1601,7 +1600,7 @@ ScVbaRange::Clear() throw (uno::RuntimeException, std::exception) //helper ClearContent void -ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (uno::RuntimeException) +ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1628,13 +1627,13 @@ ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (uno::Runti } void SAL_CALL -ScVbaRange::ClearComments() throw (uno::RuntimeException, std::exception) +ScVbaRange::ClearComments() { ClearContents( sheet::CellFlags::ANNOTATION, false ); } void SAL_CALL -ScVbaRange::ClearContents() throw (uno::RuntimeException, std::exception) +ScVbaRange::ClearContents() { using namespace ::com::sun::star::sheet::CellFlags; sal_Int32 nFlags = VALUE | DATETIME | STRING | FORMULA; @@ -1642,7 +1641,7 @@ ScVbaRange::ClearContents() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaRange::ClearFormats() throw (uno::RuntimeException, std::exception) +ScVbaRange::ClearFormats() { // FIXME: need to check if we need to combine FORMATTED using namespace ::com::sun::star::sheet::CellFlags; @@ -1651,7 +1650,7 @@ ScVbaRange::ClearFormats() throw (uno::RuntimeException, std::exception) } void -ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException) +ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::Grammar eGram ) { // If this is a multiple selection apply setFormula over all areas if ( m_Areas->getCount() > 1 ) @@ -1666,7 +1665,7 @@ ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar:: } uno::Any -ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException) +ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1683,32 +1682,32 @@ ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) throw (uno } void -ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setFormula(const uno::Any &rFormula ) { // #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO // results in "=$a$1:a1", temporalily disable conversion setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); } uno::Any -ScVbaRange::getFormulaR1C1() throw (css::uno::RuntimeException, std::exception) +ScVbaRange::getFormulaR1C1() { return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); } void -ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) { setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); } uno::Any -ScVbaRange::getFormula() throw (css::uno::RuntimeException, std::exception) +ScVbaRange::getFormula() { return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); } sal_Int32 -ScVbaRange::getCount() throw (uno::RuntimeException, std::exception) +ScVbaRange::getCount() { // If this is a multiple selection apply setValue over all areas if ( m_Areas->getCount() > 1 ) @@ -1732,7 +1731,7 @@ ScVbaRange::getCount() throw (uno::RuntimeException, std::exception) } sal_Int32 -ScVbaRange::getRow() throw (uno::RuntimeException, std::exception) +ScVbaRange::getRow() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1748,7 +1747,7 @@ ScVbaRange::getRow() throw (uno::RuntimeException, std::exception) } sal_Int32 -ScVbaRange::getColumn() throw (uno::RuntimeException, std::exception) +ScVbaRange::getColumn() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1764,7 +1763,7 @@ ScVbaRange::getColumn() throw (uno::RuntimeException, std::exception) } uno::Any -ScVbaRange::HasFormula() throw (uno::RuntimeException, std::exception) +ScVbaRange::HasFormula() { if ( m_Areas->getCount() > 1 ) { @@ -1805,7 +1804,7 @@ ScVbaRange::HasFormula() throw (uno::RuntimeException, std::exception) return uno::makeAny( true ); } void -ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( uno::RuntimeException ) +ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) { if ( m_Areas->getCount() > 1 ) { @@ -1827,35 +1826,35 @@ ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFi } void -ScVbaRange::FillLeft() throw (uno::RuntimeException, std::exception) +ScVbaRange::FillLeft() { fillSeries(sheet::FillDirection_TO_LEFT, sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } void -ScVbaRange::FillRight() throw (uno::RuntimeException, std::exception) +ScVbaRange::FillRight() { fillSeries(sheet::FillDirection_TO_RIGHT, sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } void -ScVbaRange::FillUp() throw (uno::RuntimeException, std::exception) +ScVbaRange::FillUp() { fillSeries(sheet::FillDirection_TO_TOP, sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } void -ScVbaRange::FillDown() throw (uno::RuntimeException, std::exception) +ScVbaRange::FillDown() { fillSeries(sheet::FillDirection_TO_BOTTOM, sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } OUString -ScVbaRange::getText() throw (uno::RuntimeException, std::exception) +ScVbaRange::getText() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1871,7 +1870,7 @@ ScVbaRange::getText() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XRange > -ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) { SCROW nRowOffset = 0; SCCOL nColOffset = 0; @@ -1907,7 +1906,7 @@ ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw ( } uno::Reference< excel::XRange > -ScVbaRange::CurrentRegion() throw (uno::RuntimeException, std::exception) +ScVbaRange::CurrentRegion() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1928,7 +1927,7 @@ ScVbaRange::CurrentRegion() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XRange > -ScVbaRange::CurrentArray() throw (uno::RuntimeException, std::exception) +ScVbaRange::CurrentArray() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1948,7 +1947,7 @@ ScVbaRange::CurrentArray() throw (uno::RuntimeException, std::exception) } uno::Any -ScVbaRange::getFormulaArray() throw (uno::RuntimeException, std::exception) +ScVbaRange::getFormulaArray() { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -1986,7 +1985,7 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeException, std::exception) } void -ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeException, std::exception) +ScVbaRange::setFormulaArray(const uno::Any& rFormula) { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -2022,7 +2021,7 @@ ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeExcepti } OUString -ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno::RuntimeException, std::exception) +ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -2048,7 +2047,7 @@ ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno } OUString -ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo ) { if ( m_Areas->getCount() > 1 ) { @@ -2123,7 +2122,7 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut } uno::Reference < excel::XFont > -ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException) +ScVbaRange::Font() { uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY ); ScDocument& rDoc = getScDocument(); @@ -2145,7 +2144,7 @@ ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException) } uno::Reference< excel::XRange > -ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) throw(uno::RuntimeException, std::exception) +ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) { // #TODO code within the test below "if ( m_Areas.... " can be removed // Test is performed only because m_xRange is NOT set to be @@ -2167,7 +2166,7 @@ uno::Reference< excel::XRange > ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::table::XCellRange >& xRange, - const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) throw(uno::RuntimeException) + const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) { sal_Int32 nRow = 0, nColumn = 0; @@ -2245,7 +2244,7 @@ ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent, } void -ScVbaRange::Select() throw (uno::RuntimeException, std::exception) +ScVbaRange::Select() { ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); if ( !pUnoRangesBase ) @@ -2295,7 +2294,7 @@ void setCursor( SCCOL nCol, SCROW nRow, const uno::Reference< frame::XModel >& x } void -ScVbaRange::Activate() throw (uno::RuntimeException, std::exception) +ScVbaRange::Activate() { // get first cell of current range uno::Reference< table::XCellRange > xCellRange; @@ -2355,7 +2354,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XRange > -ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Rows(const uno::Any& aIndex ) { OUString sAddress; @@ -2398,7 +2397,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exc } uno::Reference< excel::XRange > -ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Columns(const uno::Any& aIndex ) { OUString sAddress; @@ -2438,7 +2437,7 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException, std:: } void -ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) { bool bMerge = extractBoolFromAny( aIsMerged ); @@ -2472,7 +2471,7 @@ ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) throw (script::BasicError } uno::Any -ScVbaRange::getMergeCells() throw (script::BasicErrorException, uno::RuntimeException) +ScVbaRange::getMergeCells() { if( mxRanges.is() ) { @@ -2501,7 +2500,7 @@ ScVbaRange::getMergeCells() throw (script::BasicErrorException, uno::RuntimeExce } void -ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException, std::exception) +ScVbaRange::Copy(const ::uno::Any& Destination) { if ( m_Areas->getCount() > 1 ) throw uno::RuntimeException("That command cannot be used on multiple selections" ); @@ -2531,7 +2530,7 @@ ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException, st } void -ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException, std::exception) +ScVbaRange::Cut(const ::uno::Any& Destination) { if ( m_Areas->getCount() > 1 ) throw uno::RuntimeException("That command cannot be used on multiple selections" ); @@ -2557,7 +2556,7 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException, std } void -ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErrorException, uno::RuntimeException) +ScVbaRange::setNumberFormat( const uno::Any& aFormat ) { OUString sFormat; aFormat >>= sFormat; @@ -2576,7 +2575,7 @@ ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErro } uno::Any -ScVbaRange::getNumberFormat() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::getNumberFormat() { if ( m_Areas->getCount() > 1 ) @@ -2605,7 +2604,7 @@ ScVbaRange::getNumberFormat() throw (script::BasicErrorException, uno::RuntimeEx } uno::Reference< excel::XRange > -ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) { long nRowSize = 0, nColumnSize = 0; bool bIsRowChanged = ( RowSize >>= nRowSize ), bIsColumnChanged = ( ColumnSize >>= nColumnSize ); @@ -2629,7 +2628,7 @@ ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw } void -ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) { if ( m_Areas->getCount() > 1 ) { @@ -2648,7 +2647,7 @@ ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) throw (script::BasicErrorE } uno::Any -ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::getWrapText() { if ( m_Areas->getCount() > 1 ) { @@ -2676,18 +2675,18 @@ ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeExcept return aValue; } -uno::Reference< excel::XInterior > ScVbaRange::Interior( ) throw ( script::BasicErrorException, uno::RuntimeException) +uno::Reference< excel::XInterior > ScVbaRange::Interior( ) { uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW ); return new ScVbaInterior ( this, mxContext, xProps, &getScDocument() ); } uno::Reference< excel::XRange > -ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2 ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2 ) { return Range( Cell1, Cell2, false ); } uno::Reference< excel::XRange > -ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseInpuRangeTab ) { uno::Reference< table::XCellRange > xCellRange = mxRange; @@ -2788,7 +2787,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI // Allow access to underlying openoffice uno api ( useful for debugging // with openoffice basic ) -uno::Any SAL_CALL ScVbaRange::getCellRange( ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaRange::getCellRange( ) { uno::Any aAny; if ( mxRanges.is() ) @@ -2798,7 +2797,7 @@ uno::Any SAL_CALL ScVbaRange::getCellRange( ) throw (uno::RuntimeException, std return aAny; } -uno::Any ScVbaRange::getCellRange( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) +uno::Any ScVbaRange::getCellRange( const uno::Reference< excel::XRange >& rxRange ) { if( ScVbaRange* pVbaRange = getImplementation( rxRange ) ) return pVbaRange->getCellRange(); @@ -2854,7 +2853,7 @@ getPasteFormulaBits( sal_Int32 Operation) return nFormulaBits; } void SAL_CALL -ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) +ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) { if ( m_Areas->getCount() > 1 ) throw uno::RuntimeException("That command cannot be used on multiple selections" ); @@ -2888,7 +2887,7 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons } uno::Reference< excel::XRange > -ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException) +ScVbaRange::getEntireColumnOrRow( bool bColumn ) { ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); // copy the range list @@ -2919,19 +2918,19 @@ ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException) } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::getEntireRow() throw (uno::RuntimeException, std::exception) +ScVbaRange::getEntireRow() { return getEntireColumnOrRow(false); } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::getEntireColumn() throw (uno::RuntimeException, std::exception) +ScVbaRange::getEntireColumn() { return getEntireColumnOrRow(true); } uno::Reference< excel::XComment > SAL_CALL -ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException, std::exception) +ScVbaRange::AddComment( const uno::Any& Text ) { // if there is already a comment in the top-left cell then throw if( getComment().is() ) @@ -2955,7 +2954,7 @@ ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException, std } uno::Reference< excel::XComment > SAL_CALL -ScVbaRange::getComment() throw (uno::RuntimeException, std::exception) +ScVbaRange::getComment() { // intentional behavior to return a null object if no // comment defined @@ -2968,7 +2967,7 @@ ScVbaRange::getComment() throw (uno::RuntimeException, std::exception) /// @throws uno::RuntimeException uno::Reference< beans::XPropertySet > -getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool bRows ) throw ( uno::RuntimeException ) +getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool bRows ) { uno::Reference< table::XColumnRowRange > xColRow( xCellRange, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps; @@ -2980,7 +2979,7 @@ getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool } uno::Any SAL_CALL -ScVbaRange::getHidden() throw (uno::RuntimeException, std::exception) +ScVbaRange::getHidden() { // if multi-area result is the result of the // first area @@ -3004,7 +3003,7 @@ ScVbaRange::getHidden() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setHidden( const uno::Any& _hidden ) { if ( m_Areas->getCount() > 1 ) { @@ -3030,7 +3029,7 @@ ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException, s } sal_Bool SAL_CALL -ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) { if ( m_Areas->getCount() > 1 ) { @@ -3132,7 +3131,7 @@ ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const un } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) { // return a Range object that represents the first cell where that information is found. OUString sWhat; @@ -3321,7 +3320,7 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere // helper method for Sort /// @throws uno::RuntimeException sal_Int32 findSortPropertyIndex( const uno::Sequence< beans::PropertyValue >& props, -const OUString& sPropName ) throw( uno::RuntimeException ) +const OUString& sPropName ) { const beans::PropertyValue* pProp = props.getConstArray(); sal_Int32 nItems = props.getLength(); @@ -3339,7 +3338,7 @@ const OUString& sPropName ) throw( uno::RuntimeException ) /// @throws uno::RuntimeException void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRange, const uno::Reference< table::XCellRange >& xColRowKey, sal_Int16 nOrder, - table::TableSortField& aTableField, bool bIsSortColumn, bool bMatchCase ) throw ( uno::RuntimeException ) + table::TableSortField& aTableField, bool bIsSortColumn, bool bMatchCase ) { RangeHelper parentRange( xParentRange ); RangeHelper colRowRange( xColRowKey ); @@ -3373,7 +3372,7 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan } void SAL_CALL -ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& Key2, const uno::Any& /*Type*/, const uno::Any& Order2, const uno::Any& Key3, const uno::Any& Order3, const uno::Any& Header, const uno::Any& OrderCustom, const uno::Any& MatchCase, const uno::Any& Orientation, const uno::Any& SortMethod, const uno::Any& DataOption1, const uno::Any& DataOption2, const uno::Any& DataOption3 ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& Key2, const uno::Any& /*Type*/, const uno::Any& Order2, const uno::Any& Key3, const uno::Any& Order3, const uno::Any& Header, const uno::Any& OrderCustom, const uno::Any& MatchCase, const uno::Any& Orientation, const uno::Any& SortMethod, const uno::Any& DataOption1, const uno::Any& DataOption2, const uno::Any& DataOption3 ) { // #TODO# #FIXME# can we do something with Type if ( m_Areas->getCount() > 1 ) @@ -3549,7 +3548,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException, std::exception) +ScVbaRange::End( ::sal_Int32 Direction ) { if ( m_Areas->getCount() > 1 ) { @@ -3640,7 +3639,7 @@ ScVbaRange::isSingleCellRange() } uno::Reference< excel::XCharacters > SAL_CALL -ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException, std::exception) +ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) { if ( !isSingleCellRange() ) throw uno::RuntimeException("Can't create Characters property for multicell range " ); @@ -3652,7 +3651,7 @@ ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (u } void SAL_CALL -ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Delete( const uno::Any& Shift ) { if ( m_Areas->getCount() > 1 ) { @@ -3700,7 +3699,7 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException, std::e //XElementAccess sal_Bool SAL_CALL -ScVbaRange::hasElements() throw (uno::RuntimeException, std::exception) +ScVbaRange::hasElements() { uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY ); if ( xColumnRowRange.is() ) @@ -3712,7 +3711,7 @@ ScVbaRange::hasElements() throw (uno::RuntimeException, std::exception) // XEnumerationAccess uno::Reference< container::XEnumeration > SAL_CALL -ScVbaRange::createEnumeration() throw (uno::RuntimeException, std::exception) +ScVbaRange::createEnumeration() { if ( mbIsColumns || mbIsRows ) { @@ -3730,7 +3729,7 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException, std::exception) } OUString SAL_CALL -ScVbaRange::getDefaultMethodName( ) throw (uno::RuntimeException, std::exception) +ScVbaRange::getDefaultMethodName( ) { return OUString( "Item" ); } @@ -3738,7 +3737,6 @@ ScVbaRange::getDefaultMethodName( ) throw (uno::RuntimeException, std::exceptio // returns calc internal col. width ( in points ) double ScVbaRange::getCalcColWidth(const table::CellRangeAddress& rAddress) - throw (uno::RuntimeException, std::exception) { ScDocument& rDoc = getScDocument(); sal_uInt16 nWidth = rDoc.GetOriginalWidth( static_cast< SCCOL >( rAddress.StartColumn ), static_cast< SCTAB >( rAddress.Sheet ) ); @@ -3749,7 +3747,6 @@ ScVbaRange::getCalcColWidth(const table::CellRangeAddress& rAddress) double ScVbaRange::getCalcRowHeight(const table::CellRangeAddress& rAddress) - throw (uno::RuntimeException, std::exception) { ScDocument& rDoc = getDocumentFromRange( mxRange ); sal_uInt16 nWidth = rDoc.GetOriginalHeight( rAddress.StartRow, rAddress.Sheet ); @@ -3772,7 +3769,7 @@ double getDefaultCharWidth( ScDocShell* pDocShell ) } uno::Any SAL_CALL -ScVbaRange::getColumnWidth() throw (uno::RuntimeException, std::exception) +ScVbaRange::getColumnWidth() { sal_Int32 nLen = m_Areas->getCount(); if ( nLen > 1 ) @@ -3809,7 +3806,7 @@ ScVbaRange::getColumnWidth() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) { sal_Int32 nLen = m_Areas->getCount(); if ( nLen > 1 ) @@ -3841,7 +3838,7 @@ ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeEx } uno::Any SAL_CALL -ScVbaRange::getWidth() throw (uno::RuntimeException, std::exception) +ScVbaRange::getWidth() { if ( m_Areas->getCount() > 1 ) { @@ -3862,7 +3859,7 @@ ScVbaRange::getWidth() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaRange::Areas( const uno::Any& item) throw (uno::RuntimeException, std::exception) +ScVbaRange::Areas( const uno::Any& item) { if ( !item.hasValue() ) return uno::makeAny( m_Areas ); @@ -3870,7 +3867,7 @@ ScVbaRange::Areas( const uno::Any& item) throw (uno::RuntimeException, std::exce } uno::Reference< excel::XRange > -ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ) +ScVbaRange::getArea( sal_Int32 nIndex ) { if ( !m_Areas.is() ) throw uno::RuntimeException("No areas available" ); @@ -3879,7 +3876,7 @@ ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ) } uno::Any -ScVbaRange::Borders( const uno::Any& item ) throw( script::BasicErrorException, uno::RuntimeException ) +ScVbaRange::Borders( const uno::Any& item ) { if ( !item.hasValue() ) return uno::makeAny( getBorders() ); @@ -3888,7 +3885,7 @@ ScVbaRange::Borders( const uno::Any& item ) throw( script::BasicErrorException, uno::Any SAL_CALL ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& Weight, - const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException, std::exception) + const css::uno::Any& ColorIndex, const css::uno::Any& Color ) { sal_Int32 nCount = getBorders()->getCount(); @@ -3935,7 +3932,6 @@ ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& W uno::Any SAL_CALL ScVbaRange::getRowHeight() - throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = m_Areas->getCount(); if ( nLen > 1 ) @@ -3974,7 +3970,7 @@ ScVbaRange::getRowHeight() } void SAL_CALL -ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeException, std::exception) +ScVbaRange::setRowHeight( const uno::Any& _rowheight) { sal_Int32 nLen = m_Areas->getCount(); if ( nLen > 1 ) @@ -4000,7 +3996,7 @@ ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeExcepti } uno::Any SAL_CALL -ScVbaRange::getPageBreak() throw (uno::RuntimeException, std::exception) +ScVbaRange::getPageBreak() { sal_Int32 nPageBreak = excel::XlPageBreak::xlPageBreakNone; ScDocShell* pShell = getDocShellFromRange( mxRange ); @@ -4036,7 +4032,7 @@ ScVbaRange::getPageBreak() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeException, std::exception) +ScVbaRange::setPageBreak( const uno::Any& _pagebreak) { sal_Int32 nPageBreak = 0; _pagebreak >>= nPageBreak; @@ -4067,7 +4063,7 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeExcepti } uno::Any SAL_CALL -ScVbaRange::getHeight() throw (uno::RuntimeException, std::exception) +ScVbaRange::getHeight() { if ( m_Areas->getCount() > 1 ) { @@ -4088,7 +4084,7 @@ ScVbaRange::getHeight() throw (uno::RuntimeException, std::exception) } awt::Point -ScVbaRange::getPosition() throw ( uno::RuntimeException ) +ScVbaRange::getPosition() { awt::Point aPoint; uno::Reference< beans::XPropertySet > xProps; @@ -4100,7 +4096,7 @@ ScVbaRange::getPosition() throw ( uno::RuntimeException ) return aPoint; } uno::Any SAL_CALL -ScVbaRange::getLeft() throw (uno::RuntimeException, std::exception) +ScVbaRange::getLeft() { // helperapi returns the first ranges left ( and top below ) if ( m_Areas->getCount() > 1 ) @@ -4110,7 +4106,7 @@ ScVbaRange::getLeft() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaRange::getTop() throw (uno::RuntimeException, std::exception) +ScVbaRange::getTop() { // helperapi returns the first ranges top if ( m_Areas->getCount() > 1 ) @@ -4143,7 +4139,7 @@ uno::Reference< sheet::XCellRangeReferrer > getNamedRange( const uno::Reference< } uno::Reference< excel::XName > -ScVbaRange::getName() throw (uno::RuntimeException, std::exception) +ScVbaRange::getName() { uno::Reference< beans::XPropertySet > xProps( getUnoModel(), uno::UNO_QUERY ); uno::Reference< table::XCellRange > thisRange( getCellRange(), uno::UNO_QUERY_THROW ); @@ -4170,7 +4166,7 @@ ScVbaRange::getName() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XWorksheet > -ScVbaRange::getWorksheet() throw (uno::RuntimeException, std::exception) +ScVbaRange::getWorksheet() { // #TODO #FIXME parent should always be set up ( currently thats not // the case ) @@ -4195,7 +4191,7 @@ ScVbaRange::getWorksheet() throw (uno::RuntimeException, std::exception) // #TODO remove this ugly application processing // Process an application Range request e.g. 'Range("a1,b2,a4:b6") uno::Reference< excel::XRange > -ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception) +ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) { // Although the documentation seems clear that Range without a // qualifier then it's a shortcut for ActiveSheet.Range @@ -4376,7 +4372,6 @@ static void lcl_setTableFieldsFromCriteria( OUString& sCriteria1, uno::Reference void SAL_CALL ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const uno::Any& Operator, const uno::Any& Criteria2, const uno::Any& /*VisibleDropDown*/ ) - throw (uno::RuntimeException, std::exception) { // Is there an existing autofilter RangeHelper thisRange( mxRange ); @@ -4621,7 +4616,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const } void SAL_CALL -ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) { // It appears ( from the web ) that the undocumented CopyOrigin // param should contain member of enum XlInsertFormatOrigin @@ -4672,7 +4667,7 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) thro } void SAL_CALL -ScVbaRange::Autofit() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Autofit() { sal_Int32 nLen = m_Areas->getCount(); if ( nLen > 1 ) @@ -4709,7 +4704,7 @@ ScVbaRange::Autofit() throw (script::BasicErrorException, uno::RuntimeException, } uno::Any SAL_CALL -ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaRange::Hyperlinks( const uno::Any& aIndex ) { /* The range object always returns a new Hyperlinks object containing a fixed list of existing hyperlinks in the range. @@ -4730,7 +4725,7 @@ ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException, s } css::uno::Reference< excel::XValidation > SAL_CALL -ScVbaRange::getValidation() throw (css::uno::RuntimeException, std::exception) +ScVbaRange::getValidation() { if ( !m_xValidation.is() ) m_xValidation = new ScVbaValidation( this, mxContext, mxRange ); @@ -4740,7 +4735,7 @@ ScVbaRange::getValidation() throw (css::uno::RuntimeException, std::exception) namespace { /// @throws uno::RuntimeException -sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCell >& rxCell ) throw (uno::RuntimeException) +sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCell >& rxCell ) { /* TODO/FIXME: We need an apostroph-prefix property at the cell to implement this correctly. For now, return an apostroph for every text @@ -4754,7 +4749,7 @@ sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCell >& rxCell ) thr } /// @throws uno::RuntimeException -sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCellRange >& rxRange ) throw (uno::RuntimeException) +sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCellRange >& rxRange ) { /* This implementation is able to handle different prefixes (needed if Application.TransitionNavigKeys is true). The function lclGetPrefixChar @@ -4782,7 +4777,7 @@ sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCellRange >& rxRange } /// @throws uno::RuntimeException -sal_Unicode lclGetPrefixChar( const uno::Reference< sheet::XSheetCellRangeContainer >& rxRanges ) throw (uno::RuntimeException) +sal_Unicode lclGetPrefixChar( const uno::Reference< sheet::XSheetCellRangeContainer >& rxRanges ) { sal_Unicode cCurrPrefix = 0; uno::Reference< container::XEnumerationAccess > xRangesEA( rxRanges, uno::UNO_QUERY_THROW ); @@ -4806,7 +4801,7 @@ inline uno::Any lclGetPrefixVariant( sal_Unicode cPrefixChar ) } // namespace -uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() { /* (1) If Application.TransitionNavigKeys is false, this function returns an apostroph character if the text cell begins with an apostroph @@ -4831,7 +4826,7 @@ uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException, throw uno::RuntimeException("Unexpected empty Range object" ); } -uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException, std::exception) +uno::Any ScVbaRange::getShowDetail() { // #FIXME, If the specified range is in a PivotTable report @@ -4869,7 +4864,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException, std::ex return aNULL(); } -void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::RuntimeException, std::exception) +void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) { // #FIXME, If the specified range is in a PivotTable report @@ -4905,7 +4900,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::MergeArea() { uno::Reference< sheet::XSheetCellRange > xMergeShellCellRange(mxRange->getCellRangeByPosition(0,0,0,0), uno::UNO_QUERY_THROW); uno::Reference< sheet::XSheetCellCursor > xMergeSheetCursor(xMergeShellCellRange->getSpreadsheet()->createCursorByRange( xMergeShellCellRange ), uno::UNO_QUERY_THROW); @@ -4934,7 +4929,7 @@ ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeExceptio } void SAL_CALL -ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException, std::exception) +ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) { ScDocShell* pShell = nullptr; @@ -4968,7 +4963,7 @@ ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& } void SAL_CALL -ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const uno::Any& Type ) throw (uno::RuntimeException, std::exception) +ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const uno::Any& Type ) { uno::Reference< excel::XRange > xDest( Destination, uno::UNO_QUERY_THROW ); ScVbaRange* pRange = getImplementation( xDest ); @@ -5083,7 +5078,7 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const nCount, fStep, fEndValue, true, true ); } sal_Bool SAL_CALL -ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange >& ChangingCell ) throw (uno::RuntimeException, std::exception) +ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange >& ChangingCell ) { ScDocShell* pDocShell = getScDocShell(); bool bRes = true; @@ -5113,13 +5108,13 @@ ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange } void -ScVbaRange::Calculate( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Calculate( ) { getWorksheet()->Calculate(); } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) { if ( mbIsRows || mbIsColumns ) { @@ -5136,7 +5131,7 @@ ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::B } void -ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::AutoOutline( ) { // #TODO #FIXME needs to check for summary row/col ( whatever they are ) // not valid for multi Area Addresses @@ -5160,7 +5155,7 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce } void SAL_CALL -ScVbaRange:: ClearOutline( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange:: ClearOutline( ) { if ( m_Areas->getCount() > 1 ) { @@ -5178,7 +5173,7 @@ ScVbaRange:: ClearOutline( ) throw (script::BasicErrorException, uno::RuntimeEx } void -ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, uno::RuntimeException ) +ScVbaRange::groupUnGroup( bool bUnGroup ) { if ( m_Areas->getCount() > 1 ) DebugHelper::basicexception(ERRCODE_BASIC_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY); @@ -5195,24 +5190,24 @@ ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, u } void SAL_CALL -ScVbaRange::Group( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Group( ) { groupUnGroup(false); } void SAL_CALL -ScVbaRange::Ungroup( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Ungroup( ) { groupUnGroup(true); } /// @throws uno::RuntimeException -static void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, bool _bMerge ) throw ( uno::RuntimeException ) +static void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, bool _bMerge ) { uno::Reference< util::XMergeable > xMergeable( xCellRange, uno::UNO_QUERY_THROW ); xMergeable->merge(_bMerge); } void SAL_CALL -ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Merge( const uno::Any& Across ) { if ( m_Areas->getCount() > 1 ) { @@ -5241,7 +5236,7 @@ ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException, } void SAL_CALL -ScVbaRange::UnMerge( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::UnMerge( ) { if ( m_Areas->getCount() > 1 ) { @@ -5257,7 +5252,7 @@ ScVbaRange::UnMerge( ) throw (script::BasicErrorException, uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaRange::getStyle() throw (css::script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::getStyle() { if ( m_Areas->getCount() > 1 ) { @@ -5273,7 +5268,7 @@ ScVbaRange::getStyle() throw (css::script::BasicErrorException, uno::RuntimeExce return uno::makeAny( xStyle ); } void SAL_CALL -ScVbaRange::setStyle( const uno::Any& _style ) throw (uno::RuntimeException, std::exception) +ScVbaRange::setStyle( const uno::Any& _style ) { if ( m_Areas->getCount() > 1 ) { @@ -5317,7 +5312,7 @@ ScVbaRange::PreviousNext( bool bIsPrevious ) } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::Next() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Next() { if ( m_Areas->getCount() > 1 ) { @@ -5328,7 +5323,7 @@ ScVbaRange::Next() throw (script::BasicErrorException, uno::RuntimeException, st } uno::Reference< excel::XRange > SAL_CALL -ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Previous() { if ( m_Areas->getCount() > 1 ) { @@ -5340,8 +5335,6 @@ ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException uno::Reference< excel::XRange > SAL_CALL ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) - throw (script::BasicErrorException, uno::RuntimeException, - std::exception) { bool bIsSingleCell = isSingleCellRange(); bool bIsMultiArea = ( m_Areas->getCount() > 1 ); @@ -5422,7 +5415,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) } /// @throws script::BasicErrorException -static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script::BasicErrorException ) +static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) { sal_Int32 nType = excel::XlSpecialCellsValue::xlNumbers; aType >>= nType; @@ -5450,7 +5443,7 @@ static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script } uno::Reference< excel::XRange > -ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( script::BasicErrorException ) +ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) { uno::Reference< excel::XRange > xRange; try @@ -5506,14 +5499,14 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( } void SAL_CALL -ScVbaRange::RemoveSubtotal( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::RemoveSubtotal( ) { uno::Reference< sheet::XSubTotalCalculatable > xSub( mxRange, uno::UNO_QUERY_THROW ); xSub->removeSubTotals(); } void SAL_CALL -ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::Sequence< ::sal_Int32 >& _nTotalList, const uno::Any& aReplace, const uno::Any& PageBreaks, const uno::Any& /*SummaryBelowData*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::Sequence< ::sal_Int32 >& _nTotalList, const uno::Any& aReplace, const uno::Any& PageBreaks, const uno::Any& /*SummaryBelowData*/ ) { try { @@ -5602,7 +5595,7 @@ ScVbaRange::getServiceNames() } sal_Bool SAL_CALL -ScVbaRange::hasError() throw (uno::RuntimeException, std::exception) +ScVbaRange::hasError() { double dResult = 0.0; uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 958d43b27abb..73cd9de39ea5 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -88,79 +88,77 @@ class ScVbaRange : public ScVbaRange_BASE bool mbIsColumns; css::uno::Reference< ov::excel::XValidation > m_xValidation; /// @throws css::uno::RuntimeException - double getCalcColWidth(const css::table::CellRangeAddress&) - throw (css::uno::RuntimeException, std::exception); + double getCalcColWidth(const css::table::CellRangeAddress&); /// @throws css::uno::RuntimeException - double getCalcRowHeight(const css::table::CellRangeAddress&) - throw (css::uno::RuntimeException, std::exception); + double getCalcRowHeight(const css::table::CellRangeAddress&); void visitArray( ArrayVisitor& vistor ); /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XRange > getEntireColumnOrRow( bool bColumn ) throw( css::uno::RuntimeException ); + css::uno::Reference< ov::excel::XRange > getEntireColumnOrRow( bool bColumn ); /// @throws css::uno::RuntimeException - void fillSeries( css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( css::uno::RuntimeException ); + void fillSeries( css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ); /// @throws css::uno::RuntimeException - void ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (css::uno::RuntimeException); + void ClearContents( sal_Int32 nFlags, bool bFireEvent ); /// @throws css::uno::RuntimeException - css::uno::Any getValue( ValueGetter& rValueGetter ) throw (css::uno::RuntimeException); + css::uno::Any getValue( ValueGetter& rValueGetter ); /// @throws css::uno::RuntimeException - void setValue( const css::uno::Any& aValue, ValueSetter& setter ) throw ( css::uno::RuntimeException); + void setValue( const css::uno::Any& aValue, ValueSetter& setter ); /// @throws css::uno::RuntimeException - css::uno::Any getFormulaValue( formula::FormulaGrammar::Grammar ) throw (css::uno::RuntimeException); + css::uno::Any getFormulaValue( formula::FormulaGrammar::Grammar ); /// @throws css::uno::RuntimeException - void setFormulaValue( const css::uno::Any& aValue, formula::FormulaGrammar::Grammar ) throw ( css::uno::RuntimeException); + void setFormulaValue( const css::uno::Any& aValue, formula::FormulaGrammar::Grammar ); /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XRange > getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ); + css::uno::Reference< ov::excel::XRange > getArea( sal_Int32 nIndex ); /// @throws css::uno::RuntimeException - ScCellRangeObj* getCellRangeObj( ) throw ( css::uno::RuntimeException ); + ScCellRangeObj* getCellRangeObj( ); css::uno::Reference< ov::XCollection >& getBorders(); /// @throws css::uno::RuntimeException - void groupUnGroup( bool bUnGroup ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + void groupUnGroup( bool bUnGroup ); css::uno::Reference< ov::excel::XRange > PreviousNext( bool bIsPrevious ); /// @throws css::script::BasicErrorException - css::uno::Reference< ov::excel::XRange > SpecialCellsImpl( sal_Int32 nType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException ); + css::uno::Reference< ov::excel::XRange > SpecialCellsImpl( sal_Int32 nType, const css::uno::Any& _oValue); /// @throws css::uno::RuntimeException - css::awt::Point getPosition() throw ( css::uno::RuntimeException ); + css::awt::Point getPosition(); /** Fires a Worksheet_Change event for this range or range list. */ void fireChangeEvent(); protected: - virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ) override; + virtual ScCellRangesBase* getCellRangesBase() override; /// @throws css::uno::RuntimeException - SfxItemSet* getCurrentDataSet() throw (css::uno::RuntimeException, std::exception); + SfxItemSet* getCurrentDataSet(); public: /// @throws css::lang::IllegalArgumentException - ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException ); + ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows = false, bool bIsColumns = false ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - ScVbaRange( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + ScVbaRange( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); /// @throws css::uno::RuntimeException - ScDocument& getScDocument() throw (css::uno::RuntimeException); + ScDocument& getScDocument(); /// @throws css::uno::RuntimeException - ScDocShell* getScDocShell() throw (css::uno::RuntimeException); + ScDocShell* getScDocShell(); /** Returns the ScVbaRange implementation object for the passed VBA Range object. */ static ScVbaRange* getImplementation( const css::uno::Reference< ov::excel::XRange >& rxRange ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::frame::XModel > getUnoModel() throw (css::uno::RuntimeException); + css::uno::Reference< css::frame::XModel > getUnoModel(); /// @throws css::uno::RuntimeException - static css::uno::Reference< css::frame::XModel > getUnoModel( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); + static css::uno::Reference< css::frame::XModel > getUnoModel( const css::uno::Reference< ov::excel::XRange >& rxRange ); /// @throws css::uno::RuntimeException - const ScRangeList& getScRangeList() throw (css::uno::RuntimeException); + const ScRangeList& getScRangeList(); /// @throws css::uno::RuntimeException - static const ScRangeList& getScRangeList( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); + static const ScRangeList& getScRangeList( const css::uno::Reference< ov::excel::XRange >& rxRange ); virtual ~ScVbaRange() override; virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() override { return this; } @@ -170,145 +168,138 @@ public: static css::uno::Reference< ov::excel::XRange > getRangeObjectForName( const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString& sRangeName, ScDocShell* pDocSh, - formula::FormulaGrammar::AddressConvention eConv ) throw ( css::uno::RuntimeException, std::exception ); + formula::FormulaGrammar::AddressConvention eConv ); /// @throws css::uno::RuntimeException static css::uno::Reference< ov::excel::XRange > CellsHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, - const css::uno::Any &nRowIndex, const css::uno::Any &nColumnIndex ) throw(css::uno::RuntimeException); + const css::uno::Any &nRowIndex, const css::uno::Any &nColumnIndex ); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& aValue ) throw ( css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula( const css::uno::Any& rFormula ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFormulaArray() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormulaArray(const css::uno::Any& rFormula) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFormulaR1C1() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormulaR1C1( const css::uno::Any &rFormula ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getRow() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getColumn() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getFormula() override; + virtual void SAL_CALL setFormula( const css::uno::Any& rFormula ) override; + virtual css::uno::Any SAL_CALL getFormulaArray() override; + virtual void SAL_CALL setFormulaArray(const css::uno::Any& rFormula) override; + virtual css::uno::Any SAL_CALL getFormulaR1C1() override; + virtual void SAL_CALL setFormulaR1C1( const css::uno::Any &rFormula ) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual ::sal_Int32 SAL_CALL getRow() override; + virtual ::sal_Int32 SAL_CALL getColumn() override; + virtual OUString SAL_CALL getText() override; using ScVbaRange_BASE::setNumberFormat; - virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getNumberFormat() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMergeCells( const css::uno::Any& bMerge ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getMergeCells() throw (css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual void SAL_CALL setWrapText( const css::uno::Any& bIsWrapped ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getWrapText() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireRow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireColumn() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL getComment() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getHidden() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getColumnWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnWidth( const css::uno::Any& _columnwidth ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getRowHeight() - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowHeight( const css::uno::Any& _rowheight ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getHeight() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< ov::excel::XName > SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getWorksheet() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPageBreak() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XValidation > SAL_CALL getValidation() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPrefixCharacter() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getShowDetail() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) override; + virtual css::uno::Any SAL_CALL getNumberFormat() override; + virtual void SAL_CALL setMergeCells( const css::uno::Any& bMerge ) override; + virtual css::uno::Any SAL_CALL getMergeCells() override; + virtual void SAL_CALL setWrapText( const css::uno::Any& bIsWrapped ) override; + virtual css::uno::Any SAL_CALL getWrapText() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireRow() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireColumn() override; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL getComment() override; + virtual css::uno::Any SAL_CALL getHidden() override; + virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) override; + virtual css::uno::Any SAL_CALL getColumnWidth() override; + virtual void SAL_CALL setColumnWidth( const css::uno::Any& _columnwidth ) override; + virtual css::uno::Any SAL_CALL getRowHeight() override; + virtual void SAL_CALL setRowHeight( const css::uno::Any& _rowheight ) override; + virtual css::uno::Any SAL_CALL getWidth() override; + virtual css::uno::Any SAL_CALL getHeight() override; + virtual css::uno::Any SAL_CALL getTop() override; + virtual css::uno::Any SAL_CALL getLeft() override; + + virtual css::uno::Reference< ov::excel::XName > SAL_CALL getName() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getWorksheet() override; + virtual css::uno::Any SAL_CALL getPageBreak() override; + virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) override; + virtual css::uno::Reference< ov::excel::XValidation > SAL_CALL getValidation() override; + virtual css::uno::Any SAL_CALL getPrefixCharacter() override; + virtual css::uno::Any SAL_CALL getShowDetail() override; + virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) override; // Methods - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Clear() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ClearComments() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ClearContents() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ClearFormats() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL HasFormula() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL FillLeft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL FillRight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL FillUp() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL FillDown() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) - throw (css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows( const css::uno::Any& nIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any &nIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Copy( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Cut( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Resize( const css::uno::Any& RowSize, const css::uno::Any& ColumnSize ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() throw ( css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) override ; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) override; + virtual void SAL_CALL Clear() override; + virtual void SAL_CALL ClearComments() override; + virtual void SAL_CALL ClearContents() override; + virtual void SAL_CALL ClearFormats() override; + virtual css::uno::Any SAL_CALL HasFormula() override; + virtual void SAL_CALL FillLeft() override; + virtual void SAL_CALL FillRight() override; + virtual void SAL_CALL FillUp() override; + virtual void SAL_CALL FillDown() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() override; + virtual OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) override; + + virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) override; + + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) override; + virtual void SAL_CALL Select() override; + virtual void SAL_CALL Activate() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows( const css::uno::Any& nIndex ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any &nIndex ) override; + virtual void SAL_CALL Copy( const css::uno::Any& Destination ) override; + virtual void SAL_CALL Cut( const css::uno::Any& Destination ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Resize( const css::uno::Any& RowSize, const css::uno::Any& ColumnSize ) override; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() override; + virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) override ; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) override; /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ); + virtual css::uno::Any SAL_CALL getCellRange( ) override; /// @throws css::uno::RuntimeException - static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); - virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod, const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( const css::uno::Any& Shift ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) override; + static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ); + virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) override; + virtual sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) override; + virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod, const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) override; + virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) override; + virtual void SAL_CALL Delete( const css::uno::Any& Shift ) override; + virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) override; + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) override; virtual css::uno::Any SAL_CALL BorderAround( const css::uno::Any& LineStyle, - const css::uno::Any& Weight, const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL AutoFilter( const css::uno::Any& Field, const css::uno::Any& Criteria1, const css::uno::Any& Operator, const css::uno::Any& Criteria2, const css::uno::Any& VisibleDropDown ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Autofit() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) throw (css::uno::RuntimeException, std::exception) override ; - void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL AutoOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const css::uno::Any& row, const css::uno::Any& column ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ClearOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Ungroup( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Group( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Merge( const css::uno::Any& Across ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL UnMerge( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getStyle() throw (css::script::BasicErrorException, 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< ov::excel::XRange > SAL_CALL Next() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Previous() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL RemoveSubtotal( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL MergeArea() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Subtotal( ::sal_Int32 GroupBy, ::sal_Int32 Function, const css::uno::Sequence< ::sal_Int32 >& TotalList, const css::uno::Any& Replace, const css::uno::Any& PageBreaks, const css::uno::Any& SummaryBelowData ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + const css::uno::Any& Weight, const css::uno::Any& ColorIndex, const css::uno::Any& Color ) override; + virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) override; + + virtual void SAL_CALL AutoFilter( const css::uno::Any& Field, const css::uno::Any& Criteria1, const css::uno::Any& Operator, const css::uno::Any& Criteria2, const css::uno::Any& VisibleDropDown ) override; + virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) override; + virtual void SAL_CALL Autofit() override; + virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) override; + virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) override ; + void SAL_CALL Calculate( ) override; + virtual void SAL_CALL AutoOutline( ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const css::uno::Any& row, const css::uno::Any& column ) override; + virtual void SAL_CALL ClearOutline( ) override; + virtual void SAL_CALL Ungroup( ) override; + virtual void SAL_CALL Group( ) override; + virtual void SAL_CALL Merge( const css::uno::Any& Across ) override; + virtual void SAL_CALL UnMerge( ) override; + virtual css::uno::Any SAL_CALL getStyle() override; + virtual void SAL_CALL setStyle( const css::uno::Any& _style ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Next() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Previous() override; + virtual void SAL_CALL RemoveSubtotal( ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL MergeArea() override; + virtual void SAL_CALL Subtotal( ::sal_Int32 GroupBy, ::sal_Int32 Function, const css::uno::Sequence< ::sal_Int32 >& TotalList, const css::uno::Any& Replace, const css::uno::Any& PageBreaks, const css::uno::Any& SummaryBelowData ) 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 css::uno::Type SAL_CALL getElementType() override { return cppu::UnoType<ov::excel::XRange>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() override; // XDefaultMethod - OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getDefaultMethodName( ) override; // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) override { return OUString("Value"); } // #TODO completely rewrite ScVbaRange, it's become a hackfest // it needs to be closer to ScCellRangeBase in that the underlying @@ -318,13 +309,12 @@ public: // * object should be a lightweight as possible // * we shouldn't need hacks like this below /// @throws css::uno::RuntimeException - static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception); + static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ); static bool getCellRangesForAddress(ScRefFlags &rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter ); - virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) - throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) override; // XErrorQuery - virtual sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasError( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; @@ -333,8 +323,7 @@ public: /// @throws css::uno::RuntimeException bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, - formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) - throw ( css::uno::RuntimeException ); + formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ); #endif // INCLUDED_SC_SOURCE_UI_VBA_VBARANGE_HXX diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 889754fea7b4..7764a137d148 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -42,7 +42,7 @@ ScVbaButtonCharacters::ScVbaButtonCharacters( const uno::Reference< beans::XPropertySet >& rxPropSet, const ScVbaPalette& rPalette, const uno::Any& rStart, - const uno::Any& rLength ) throw (uno::RuntimeException) : + const uno::Any& rLength ) : ScVbaButtonCharacters_BASE( rxParent, rxContext ), maPalette( rPalette ), mxPropSet( rxPropSet, uno::UNO_SET_THROW ) @@ -63,7 +63,7 @@ ScVbaButtonCharacters::~ScVbaButtonCharacters() // XCharacters attributes -OUString SAL_CALL ScVbaButtonCharacters::getCaption() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaButtonCharacters::getCaption() { // ignore invalid mnStart and/or mnLength members OUString aString = getFullString(); @@ -72,7 +72,7 @@ OUString SAL_CALL ScVbaButtonCharacters::getCaption() throw (uno::RuntimeExcepti return aString.copy( nStart, nLength ); } -void SAL_CALL ScVbaButtonCharacters::setCaption( const OUString& rCaption ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButtonCharacters::setCaption( const OUString& rCaption ) { /* Replace the covered text with the passed text, ignore invalid mnStart and/or mnLength members. This operation does not affect the mnLength @@ -87,37 +87,37 @@ void SAL_CALL ScVbaButtonCharacters::setCaption( const OUString& rCaption ) thro setFullString( aString.replaceAt( nStart, nLength, rCaption ) ); } -sal_Int32 SAL_CALL ScVbaButtonCharacters::getCount() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaButtonCharacters::getCount() { // always return the total length of the caption return getFullString().getLength(); } -OUString SAL_CALL ScVbaButtonCharacters::getText() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaButtonCharacters::getText() { // Text attribute same as Caption attribute? return getCaption(); } -void SAL_CALL ScVbaButtonCharacters::setText( const OUString& rText ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButtonCharacters::setText( const OUString& rText ) { // Text attribute same as Caption attribute? setCaption( rText ); } -uno::Reference< excel::XFont > SAL_CALL ScVbaButtonCharacters::getFont() throw (uno::RuntimeException, std::exception) +uno::Reference< excel::XFont > SAL_CALL ScVbaButtonCharacters::getFont() { return new ScVbaFont( this, mxContext, maPalette, mxPropSet, nullptr, true ); } -void SAL_CALL ScVbaButtonCharacters::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButtonCharacters::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ ) { // TODO } // XCharacters methods -void SAL_CALL ScVbaButtonCharacters::Insert( const OUString& rString ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButtonCharacters::Insert( const OUString& rString ) { /* The Insert() operation is in fact "replace covered characters", at least for buttons... It seems there is no easy way to really insert a @@ -125,7 +125,7 @@ void SAL_CALL ScVbaButtonCharacters::Insert( const OUString& rString ) throw (un setCaption( rString ); } -void SAL_CALL ScVbaButtonCharacters::Delete() throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButtonCharacters::Delete() { /* The Delete() operation is nothing else than "replace with empty string". This does not affect the mnLength parameter, multiple calls of Delete() @@ -140,12 +140,12 @@ VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaButtonCharacters, "ooo.vba.excel.Character // private -OUString ScVbaButtonCharacters::getFullString() const throw (uno::RuntimeException) +OUString ScVbaButtonCharacters::getFullString() const { return mxPropSet->getPropertyValue( "Label" ).get< OUString >(); } -void ScVbaButtonCharacters::setFullString( const OUString& rString ) throw (uno::RuntimeException) +void ScVbaButtonCharacters::setFullString( const OUString& rString ) { mxPropSet->setPropertyValue( "Label", uno::Any( rString ) ); } @@ -154,7 +154,7 @@ ScVbaSheetObjectBase::ScVbaSheetObjectBase( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, - const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) : + const uno::Reference< drawing::XShape >& rxShape ) : ScVbaSheetObject_BASE( rxParent, rxContext ), maPalette( rxModel ), mxModel( rxModel, uno::UNO_SET_THROW ), @@ -165,65 +165,65 @@ ScVbaSheetObjectBase::ScVbaSheetObjectBase( // XSheetObject attributes -double SAL_CALL ScVbaSheetObjectBase::getLeft() throw (uno::RuntimeException, std::exception) +double SAL_CALL ScVbaSheetObjectBase::getLeft() { return HmmToPoints( mxShape->getPosition().X ); } -void SAL_CALL ScVbaSheetObjectBase::setLeft( double fLeft ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setLeft( double fLeft ) { if( fLeft < 0.0 ) throw uno::RuntimeException(); mxShape->setPosition( awt::Point( PointsToHmm( fLeft ), mxShape->getPosition().Y ) ); } -double SAL_CALL ScVbaSheetObjectBase::getTop() throw (uno::RuntimeException, std::exception) +double SAL_CALL ScVbaSheetObjectBase::getTop() { return HmmToPoints( mxShape->getPosition().Y ); } -void SAL_CALL ScVbaSheetObjectBase::setTop( double fTop ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setTop( double fTop ) { if( fTop < 0.0 ) throw uno::RuntimeException(); mxShape->setPosition( awt::Point( mxShape->getPosition().X, PointsToHmm( fTop ) ) ); } -double SAL_CALL ScVbaSheetObjectBase::getWidth() throw (uno::RuntimeException, std::exception) +double SAL_CALL ScVbaSheetObjectBase::getWidth() { return HmmToPoints( mxShape->getSize().Width ); } -void SAL_CALL ScVbaSheetObjectBase::setWidth( double fWidth ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setWidth( double fWidth ) { if( fWidth <= 0.0 ) throw uno::RuntimeException(); mxShape->setSize( awt::Size( PointsToHmm( fWidth ), mxShape->getSize().Height ) ); } -double SAL_CALL ScVbaSheetObjectBase::getHeight() throw (uno::RuntimeException, std::exception) +double SAL_CALL ScVbaSheetObjectBase::getHeight() { return HmmToPoints( mxShape->getSize().Height ); } -void SAL_CALL ScVbaSheetObjectBase::setHeight( double fHeight ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setHeight( double fHeight ) { if( fHeight <= 0.0 ) throw uno::RuntimeException(); mxShape->setSize( awt::Size( mxShape->getSize().Width, PointsToHmm( fHeight ) ) ); } -OUString SAL_CALL ScVbaSheetObjectBase::getName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaSheetObjectBase::getName() { return mxShapeProps->getPropertyValue( "Name" ).get< OUString >(); } -void SAL_CALL ScVbaSheetObjectBase::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setName( const OUString& rName ) { mxShapeProps->setPropertyValue( "Name", uno::Any( rName ) ); } -sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() { sal_Int32 nRet = excel::XlPlacement::xlMoveAndSize; #if 0 // TODO: not working at the moment. @@ -242,7 +242,7 @@ sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() throw (uno::RuntimeExcep return nRet; } -void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) { #if 0 // TODO: not working at the moment. SvxShape* pShape = SvxShape::getImplementation( mxShape ); @@ -263,27 +263,27 @@ void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) thr #endif } -sal_Bool SAL_CALL ScVbaSheetObjectBase::getPrintObject() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaSheetObjectBase::getPrintObject() { // not supported return true; } -void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ ) { // not supported } // private -void ScVbaSheetObjectBase::setDefaultProperties( sal_Int32 nIndex ) throw (uno::RuntimeException) +void ScVbaSheetObjectBase::setDefaultProperties( sal_Int32 nIndex ) { OUString aName = OUStringBuffer( implGetBaseName() ).append( ' ' ).append( nIndex + 1 ).makeStringAndClear(); setName( aName ); implSetDefaultProperties(); } -void ScVbaSheetObjectBase::implSetDefaultProperties() throw (uno::RuntimeException) +void ScVbaSheetObjectBase::implSetDefaultProperties() { } @@ -293,7 +293,7 @@ ScVbaControlObjectBase::ScVbaControlObjectBase( const uno::Reference< frame::XModel >& rxModel, const uno::Reference< container::XIndexContainer >& rxFormIC, const uno::Reference< drawing::XControlShape >& rxControlShape, - ListenerType eListenerType ) throw (uno::RuntimeException) : + ListenerType eListenerType ) : ScVbaControlObject_BASE( rxParent, rxContext, rxModel, uno::Reference< drawing::XShape >( rxControlShape, uno::UNO_QUERY_THROW ) ), mxFormIC( rxFormIC, uno::UNO_SET_THROW ), mxControlProps( rxControlShape->getControl(), uno::UNO_QUERY_THROW ) @@ -327,17 +327,17 @@ ScVbaControlObjectBase::ScVbaControlObjectBase( // XSheetObject attributes -OUString SAL_CALL ScVbaControlObjectBase::getName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaControlObjectBase::getName() { return mxControlProps->getPropertyValue( "Name" ).get< OUString >(); } -void SAL_CALL ScVbaControlObjectBase::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaControlObjectBase::setName( const OUString& rName ) { mxControlProps->setPropertyValue( "Name", uno::Any( rName ) ); } -OUString SAL_CALL ScVbaControlObjectBase::getOnAction() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaControlObjectBase::getOnAction() { uno::Reference< script::XEventAttacherManager > xEventMgr( mxFormIC, uno::UNO_QUERY_THROW ); sal_Int32 nIndex = getModelIndexInForm(); @@ -354,7 +354,7 @@ OUString SAL_CALL ScVbaControlObjectBase::getOnAction() throw (uno::RuntimeExcep return OUString(); } -void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName ) { uno::Reference< script::XEventAttacherManager > xEventMgr( mxFormIC, uno::UNO_QUERY_THROW ); sal_Int32 nIndex = getModelIndexInForm(); @@ -377,32 +377,32 @@ void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName ) } } -sal_Bool SAL_CALL ScVbaControlObjectBase::getPrintObject() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaControlObjectBase::getPrintObject() { return mxControlProps->getPropertyValue( "Printable" ).get<bool>(); } -void SAL_CALL ScVbaControlObjectBase::setPrintObject( sal_Bool bPrintObject ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaControlObjectBase::setPrintObject( sal_Bool bPrintObject ) { mxControlProps->setPropertyValue( "Printable", uno::Any( bPrintObject ) ); } // XControlObject attributes -sal_Bool SAL_CALL ScVbaControlObjectBase::getAutoSize() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaControlObjectBase::getAutoSize() { // not supported return false; } -void SAL_CALL ScVbaControlObjectBase::setAutoSize( sal_Bool /*bAutoSize*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaControlObjectBase::setAutoSize( sal_Bool /*bAutoSize*/ ) { // not supported } // private -sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const throw (uno::RuntimeException) +sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const { for( sal_Int32 nIndex = 0, nCount = mxFormIC->getCount(); nIndex < nCount; ++nIndex ) { @@ -418,34 +418,34 @@ ScVbaButton::ScVbaButton( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, const uno::Reference< container::XIndexContainer >& rxFormIC, - const uno::Reference< drawing::XControlShape >& rxControlShape ) throw (uno::RuntimeException) : + const uno::Reference< drawing::XControlShape >& rxControlShape ) : ScVbaButton_BASE( rxParent, rxContext, rxModel, rxFormIC, rxControlShape, LISTENER_ACTION ) { } // XButton attributes -OUString SAL_CALL ScVbaButton::getCaption() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScVbaButton::getCaption() { return mxControlProps->getPropertyValue( "Label" ).get< OUString >(); } -void SAL_CALL ScVbaButton::setCaption( const OUString& rCaption ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButton::setCaption( const OUString& rCaption ) { mxControlProps->setPropertyValue( "Label", uno::Any( rCaption ) ); } -uno::Reference< excel::XFont > SAL_CALL ScVbaButton::getFont() throw (uno::RuntimeException, std::exception) +uno::Reference< excel::XFont > SAL_CALL ScVbaButton::getFont() { return new ScVbaFont( this, mxContext, maPalette, mxControlProps, nullptr, true ); } -void SAL_CALL ScVbaButton::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButton::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ ) { // TODO } -sal_Int32 SAL_CALL ScVbaButton::getHorizontalAlignment() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaButton::getHorizontalAlignment() { switch( mxControlProps->getPropertyValue( "Align" ).get< sal_Int16 >() ) { @@ -456,7 +456,7 @@ sal_Int32 SAL_CALL ScVbaButton::getHorizontalAlignment() throw (uno::RuntimeExce return excel::Constants::xlCenter; } -void SAL_CALL ScVbaButton::setHorizontalAlignment( sal_Int32 nAlign ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButton::setHorizontalAlignment( sal_Int32 nAlign ) { sal_Int32 nAwtAlign = awt::TextAlign::CENTER; switch( nAlign ) @@ -469,7 +469,7 @@ void SAL_CALL ScVbaButton::setHorizontalAlignment( sal_Int32 nAlign ) throw (uno mxControlProps->setPropertyValue( "Align", uno::Any( static_cast< sal_Int16 >( nAwtAlign ) ) ); } -sal_Int32 SAL_CALL ScVbaButton::getVerticalAlignment() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaButton::getVerticalAlignment() { switch( mxControlProps->getPropertyValue( "VerticalAlign" ).get< style::VerticalAlignment >() ) { @@ -481,7 +481,7 @@ sal_Int32 SAL_CALL ScVbaButton::getVerticalAlignment() throw (uno::RuntimeExcept return excel::Constants::xlCenter; } -void SAL_CALL ScVbaButton::setVerticalAlignment( sal_Int32 nAlign ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButton::setVerticalAlignment( sal_Int32 nAlign ) { style::VerticalAlignment eAwtAlign = style::VerticalAlignment_MIDDLE; switch( nAlign ) @@ -493,20 +493,20 @@ void SAL_CALL ScVbaButton::setVerticalAlignment( sal_Int32 nAlign ) throw (uno:: mxControlProps->setPropertyValue( "VerticalAlign", uno::Any( eAwtAlign ) ); } -sal_Int32 SAL_CALL ScVbaButton::getOrientation() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaButton::getOrientation() { // not supported return excel::XlOrientation::xlHorizontal; } -void SAL_CALL ScVbaButton::setOrientation( sal_Int32 /*nOrientation*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaButton::setOrientation( sal_Int32 /*nOrientation*/ ) { // not supported } // XButton methods -uno::Reference< excel::XCharacters > SAL_CALL ScVbaButton::Characters( const uno::Any& rStart, const uno::Any& rLength ) throw (uno::RuntimeException, std::exception) +uno::Reference< excel::XCharacters > SAL_CALL ScVbaButton::Characters( const uno::Any& rStart, const uno::Any& rLength ) { return new ScVbaButtonCharacters( this, mxContext, mxControlProps, maPalette, rStart, rLength ); } @@ -522,7 +522,7 @@ OUString ScVbaButton::implGetBaseName() const return OUString( "Button" ); } -void ScVbaButton::implSetDefaultProperties() throw (uno::RuntimeException) +void ScVbaButton::implSetDefaultProperties() { setCaption( getName() ); } diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 5c1a7200d44f..721bcf99a243 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -45,30 +45,30 @@ public: const css::uno::Reference< css::beans::XPropertySet >& rxPropSet, const ScVbaPalette& rPalette, const css::uno::Any& rStart, - const css::uno::Any& rLength ) throw (css::uno::RuntimeException); + const css::uno::Any& rLength ); virtual ~ScVbaButtonCharacters() override; // XCharacters attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception) override; - 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 sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() override; + virtual void SAL_CALL setCaption( const OUString& rCaption ) override; + virtual OUString SAL_CALL getText() override; + virtual void SAL_CALL setText( const OUString& rText ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() override; + virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) override; // XCharacters methods - virtual void SAL_CALL Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Insert( const OUString& rString ) override; + virtual void SAL_CALL Delete() override; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE private: /// @throws css::uno::RuntimeException - OUString getFullString() const throw (css::uno::RuntimeException); + OUString getFullString() const; /// @throws css::uno::RuntimeException - void setFullString( const OUString& rString ) throw (css::uno::RuntimeException); + void setFullString( const OUString& rString ); private: ScVbaPalette maPalette; @@ -88,29 +88,29 @@ public: const css::uno::Reference< ov::XHelperInterface >& rxParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XModel >& rxModel, - const css::uno::Reference< css::drawing::XShape >& rxShape ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::drawing::XShape >& rxShape ); // XSheetObject attributes - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLeft( double fLeft ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTop( double fTop ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWidth( double fWidth ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHeight( double fHeight ) throw (css::uno::RuntimeException, std::exception) override; - 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 sal_Int32 SAL_CALL getPlacement() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getLeft() override; + virtual void SAL_CALL setLeft( double fLeft ) override; + virtual double SAL_CALL getTop() override; + virtual void SAL_CALL setTop( double fTop ) override; + virtual double SAL_CALL getWidth() override; + virtual void SAL_CALL setWidth( double fWidth ) override; + virtual double SAL_CALL getHeight() override; + virtual void SAL_CALL setHeight( double fHeight ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& rName ) override; + virtual sal_Int32 SAL_CALL getPlacement() override; + virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) override; + virtual sal_Bool SAL_CALL getPrintObject() override; + virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) override; /** Sets default properties after a new object has been created. @throws css::uno::RuntimeException */ - void setDefaultProperties( sal_Int32 nIndex ) throw (css::uno::RuntimeException); + void setDefaultProperties( sal_Int32 nIndex ); protected: /** Derived classes return the base name used for new objects. */ @@ -119,7 +119,7 @@ protected: @throws css::uno::RuntimeException */ - virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); + virtual void implSetDefaultProperties(); protected: ScVbaPalette maPalette; @@ -150,23 +150,23 @@ public: const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::container::XIndexContainer >& rxFormIC, const css::uno::Reference< css::drawing::XControlShape >& rxControlShape, - ListenerType eListenerType ) throw (css::uno::RuntimeException); + ListenerType eListenerType ); // XSheetObject attributes - 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 getOnAction() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOnAction( const OUString& rMacroName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& rName ) override; + virtual OUString SAL_CALL getOnAction() override; + virtual void SAL_CALL setOnAction( const OUString& rMacroName ) override; + virtual sal_Bool SAL_CALL getPrintObject() override; + virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) override; // XControlObject attributes - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoSize() override; + virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) override; protected: /// @throws css::uno::RuntimeException - sal_Int32 getModelIndexInForm() const throw (css::uno::RuntimeException); + sal_Int32 getModelIndexInForm() const; protected: css::uno::Reference< css::container::XIndexContainer > mxFormIC; @@ -186,30 +186,30 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::container::XIndexContainer >& rxFormIC, - const css::uno::Reference< css::drawing::XControlShape >& rxControlShape ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::drawing::XControlShape >& rxControlShape ); // XButton attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getHorizontalAlignment() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHorizontalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getVerticalAlignment() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() override; + virtual void SAL_CALL setCaption( const OUString& rCaption ) override; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() override; + virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) override; + virtual sal_Int32 SAL_CALL getHorizontalAlignment() override; + virtual void SAL_CALL setHorizontalAlignment( sal_Int32 nAlign ) override; + virtual sal_Int32 SAL_CALL getVerticalAlignment() override; + virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) override; + virtual sal_Int32 SAL_CALL getOrientation() override; + virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) override; // XButton methods css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters( - const css::uno::Any& rStart, const css::uno::Any& rLength ) throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rStart, const css::uno::Any& rLength ) override; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE protected: virtual OUString implGetBaseName() const override; - virtual void implSetDefaultProperties() throw (css::uno::RuntimeException) override; + virtual void implSetDefaultProperties() override; }; #endif diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 2ac40eb50176..ab8c102ced38 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -57,7 +57,7 @@ inline bool lclGetProperty( Type& orValue, const uno::Reference< beans::XPropert @throws uno::RuntimeException */ -inline double lclPointsToHmm( const uno::Any& rPoints ) throw (uno::RuntimeException) +inline double lclPointsToHmm( const uno::Any& rPoints ) { return PointsToHmm( ::rtl::math::approxFloor( rPoints.get< double >() / 0.75 ) * 0.75 ); } @@ -80,7 +80,7 @@ public: const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, const uno::Reference< sheet::XSpreadsheet >& rxSheet, - const uno::Type& rVbaType ) throw (uno::RuntimeException); + const uno::Type& rVbaType ); /** Returns the VBA helper interface of the VBA collection object. */ inline const uno::Reference< XHelperInterface >& getParent() const { return mxParent; } @@ -94,40 +94,40 @@ public: @throws uno::RuntimeException */ - void collectShapes() throw (uno::RuntimeException); + void collectShapes(); /** Creates and returns a new UNO shape. @throws uno::RuntimeException */ - uno::Reference< drawing::XShape > createShape( const awt::Point& rPos, const awt::Size& rSize ) throw (uno::RuntimeException); + uno::Reference< drawing::XShape > createShape( const awt::Point& rPos, const awt::Size& rSize ); /** Inserts the passed shape into the draw page and into this container, and returns its index in the draw page. @throws uno::RuntimeException */ - sal_Int32 insertShape( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException); + sal_Int32 insertShape( const uno::Reference< drawing::XShape >& rxShape ); /** Creates and returns a new VBA implementation object for the passed shape. @throws uno::RuntimeException */ - ::rtl::Reference< ScVbaSheetObjectBase > createVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException); + ::rtl::Reference< ScVbaSheetObjectBase > createVbaObject( const uno::Reference< drawing::XShape >& rxShape ); /** Creates and returns a new VBA implementation object for the passed shape in an Any. @throws uno::RuntimeException */ - uno::Any createCollectionObject( const uno::Any& rSource ) throw (uno::RuntimeException); + uno::Any createCollectionObject( const uno::Any& rSource ); /** Returns the VBA implementation object with the specified name. @throws uno::RuntimeException */ - uno::Any getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException); + uno::Any getItemByStringIndex( const OUString& rIndex ); // 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; // 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; protected: /** Derived classes return true, if the passed shape is supported by the instance. */ @@ -136,7 +136,7 @@ protected: @throws uno::RuntimeException */ - virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) = 0; + virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) = 0; /** Derived classes return the service name of the UNO shape. */ virtual OUString implGetShapeServiceName() const = 0; @@ -144,12 +144,12 @@ protected: @throws uno::RuntimeException */ - virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException); + virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const; /** Is called when a new UNO shape has been created but not yet inserted into the drawing page. @throws uno::RuntimeException */ - virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException); + virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ); protected: uno::Reference< XHelperInterface > mxParent; @@ -169,7 +169,7 @@ ScVbaObjectContainer::ScVbaObjectContainer( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, const uno::Reference< sheet::XSpreadsheet >& rxSheet, - const uno::Type& rVbaType ) throw (uno::RuntimeException) : + const uno::Type& rVbaType ) : mxParent( rxParent ), mxContext( rxContext ), mxModel( rxModel, uno::UNO_SET_THROW ), @@ -180,7 +180,7 @@ ScVbaObjectContainer::ScVbaObjectContainer( mxShapes.set( xDrawPageSupp->getDrawPage(), uno::UNO_QUERY_THROW ); } -void ScVbaObjectContainer::collectShapes() throw (uno::RuntimeException) +void ScVbaObjectContainer::collectShapes() { maShapes.clear(); for( sal_Int32 nIndex = 0, nCount = mxShapes->getCount(); nIndex < nCount; ++nIndex ) @@ -191,7 +191,7 @@ void ScVbaObjectContainer::collectShapes() throw (uno::RuntimeException) } } -uno::Reference< drawing::XShape > ScVbaObjectContainer::createShape( const awt::Point& rPos, const awt::Size& rSize ) throw (uno::RuntimeException) +uno::Reference< drawing::XShape > ScVbaObjectContainer::createShape( const awt::Point& rPos, const awt::Size& rSize ) { uno::Reference< drawing::XShape > xShape( mxFactory->createInstance( implGetShapeServiceName() ), uno::UNO_QUERY_THROW ); xShape->setPosition( rPos ); @@ -200,7 +200,7 @@ uno::Reference< drawing::XShape > ScVbaObjectContainer::createShape( const awt:: return xShape; } -sal_Int32 ScVbaObjectContainer::insertShape( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) +sal_Int32 ScVbaObjectContainer::insertShape( const uno::Reference< drawing::XShape >& rxShape ) { mxShapes->add( rxShape ); maShapes.push_back( rxShape ); @@ -208,19 +208,19 @@ sal_Int32 ScVbaObjectContainer::insertShape( const uno::Reference< drawing::XSha } ::rtl::Reference< ScVbaSheetObjectBase > ScVbaObjectContainer::createVbaObject( - const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) + const uno::Reference< drawing::XShape >& rxShape ) { return implCreateVbaObject( rxShape ); } -uno::Any ScVbaObjectContainer::createCollectionObject( const uno::Any& rSource ) throw (uno::RuntimeException) +uno::Any ScVbaObjectContainer::createCollectionObject( const uno::Any& rSource ) { uno::Reference< drawing::XShape > xShape( rSource, uno::UNO_QUERY_THROW ); uno::Reference< excel::XSheetObject > xSheetObject( implCreateVbaObject( xShape ) ); return uno::Any( xSheetObject ); } -uno::Any ScVbaObjectContainer::getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException) +uno::Any ScVbaObjectContainer::getItemByStringIndex( const OUString& rIndex ) { for( ShapeVector::iterator aIt = maShapes.begin(), aEnd = maShapes.end(); aIt != aEnd; ++aIt ) if( rIndex == implGetShapeName( *aIt ) ) @@ -230,13 +230,12 @@ uno::Any ScVbaObjectContainer::getItemByStringIndex( const OUString& rIndex ) th // XIndexAccess -sal_Int32 SAL_CALL ScVbaObjectContainer::getCount() throw (uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScVbaObjectContainer::getCount() { return static_cast< sal_Int32 >( maShapes.size() ); } uno::Any SAL_CALL ScVbaObjectContainer::getByIndex( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( (0 <= nIndex) && (nIndex < getCount()) ) return uno::Any( maShapes[ static_cast< size_t >( nIndex ) ] ); @@ -245,25 +244,25 @@ uno::Any SAL_CALL ScVbaObjectContainer::getByIndex( sal_Int32 nIndex ) // XElementAccess -uno::Type SAL_CALL ScVbaObjectContainer::getElementType() throw (uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScVbaObjectContainer::getElementType() { return cppu::UnoType<drawing::XShape>::get(); } -sal_Bool SAL_CALL ScVbaObjectContainer::hasElements() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaObjectContainer::hasElements() { return !maShapes.empty(); } // private -OUString ScVbaObjectContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException) +OUString ScVbaObjectContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const { uno::Reference< beans::XPropertySet > xPropSet( rxShape, uno::UNO_QUERY_THROW ); return xPropSet->getPropertyValue( "Name" ).get< OUString >(); } -void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& /*rxShape*/ ) throw (uno::RuntimeException) +void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& /*rxShape*/ ) { } @@ -288,7 +287,7 @@ uno::Any ScVbaObjectEnumeration::createCollectionObject( const uno::Any& rSource return mxContainer->createCollectionObject( rSource ); } -ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException) : +ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) : ScVbaSheetObjects_BASE( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), mxContainer( rxContainer ) { @@ -299,21 +298,21 @@ ScVbaSheetObjectsBase::~ScVbaSheetObjectsBase() { } -void ScVbaSheetObjectsBase::collectShapes() throw (uno::RuntimeException) +void ScVbaSheetObjectsBase::collectShapes() { mxContainer->collectShapes(); } // XEnumerationAccess -uno::Reference< container::XEnumeration > SAL_CALL ScVbaSheetObjectsBase::createEnumeration() throw (uno::RuntimeException) +uno::Reference< container::XEnumeration > SAL_CALL ScVbaSheetObjectsBase::createEnumeration() { return new ScVbaObjectEnumeration( mxContainer ); } // XElementAccess -uno::Type SAL_CALL ScVbaSheetObjectsBase::getElementType() throw (uno::RuntimeException) +uno::Type SAL_CALL ScVbaSheetObjectsBase::getElementType() { return mxContainer->getVbaType(); } @@ -325,21 +324,21 @@ uno::Any ScVbaSheetObjectsBase::createCollectionObject( const uno::Any& rSource return mxContainer->createCollectionObject( rSource ); } -uno::Any ScVbaSheetObjectsBase::getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException) +uno::Any ScVbaSheetObjectsBase::getItemByStringIndex( const OUString& rIndex ) { return mxContainer->getItemByStringIndex( rIndex ); } // Graphic object containers supporting ooo.vba.excel.XGraphicObject -ScVbaGraphicObjectsBase::ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (uno::RuntimeException) : +ScVbaGraphicObjectsBase::ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) : ScVbaGraphicObjects_BASE( rxContainer ) { } // XGraphicObjects -uno::Any SAL_CALL ScVbaGraphicObjectsBase::Add( const uno::Any& rLeft, const uno::Any& rTop, const uno::Any& rWidth, const uno::Any& rHeight ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScVbaGraphicObjectsBase::Add( const uno::Any& rLeft, const uno::Any& rTop, const uno::Any& rWidth, const uno::Any& rHeight ) { /* Extract double values from passed Anys (the lclPointsToHmm() helper function will throw a RuntimeException on any error), and convert from @@ -372,17 +371,17 @@ public: const uno::Reference< frame::XModel >& rxModel, const uno::Reference< sheet::XSpreadsheet >& rxSheet, const uno::Type& rVbaType, - const OUString& rModelServiceName ) throw (uno::RuntimeException); + const OUString& rModelServiceName ); protected: /// @throws uno::RuntimeException - uno::Reference< container::XIndexContainer > const & createForm() throw (uno::RuntimeException); + uno::Reference< container::XIndexContainer > const & createForm(); virtual bool implPickShape( const uno::Reference< drawing::XShape >& rxShape ) const override; virtual OUString implGetShapeServiceName() const override; virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const; - virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException) override; - virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) override; + virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const override; + virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) override; protected: uno::Reference< container::XIndexContainer > mxFormIC; @@ -395,13 +394,13 @@ ScVbaControlContainer::ScVbaControlContainer( const uno::Reference< frame::XModel >& rxModel, const uno::Reference< sheet::XSpreadsheet >& rxSheet, const uno::Type& rVbaType, - const OUString& rModelServiceName ) throw (uno::RuntimeException) : + const OUString& rModelServiceName ) : ScVbaObjectContainer( rxParent, rxContext, rxModel, rxSheet, rVbaType ), maModelServiceName( rModelServiceName ) { } -uno::Reference< container::XIndexContainer > const & ScVbaControlContainer::createForm() throw (uno::RuntimeException) +uno::Reference< container::XIndexContainer > const & ScVbaControlContainer::createForm() { if( !mxFormIC.is() ) { @@ -448,13 +447,13 @@ bool ScVbaControlContainer::implCheckProperties( const uno::Reference< beans::XP return true; } -OUString ScVbaControlContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException) +OUString ScVbaControlContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const { uno::Reference< drawing::XControlShape > xControlShape( rxShape, uno::UNO_QUERY_THROW ); return uno::Reference< container::XNamed >( xControlShape->getControl(), uno::UNO_QUERY_THROW )->getName(); } -void ScVbaControlContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) +void ScVbaControlContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) { // passed shape must be a control shape uno::Reference< drawing::XControlShape > xControlShape( rxShape, uno::UNO_QUERY_THROW ); @@ -479,10 +478,10 @@ public: const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, - const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException); + const uno::Reference< sheet::XSpreadsheet >& rxSheet ); protected: - virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) override; + virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) override; virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const override; }; @@ -490,7 +489,7 @@ ScVbaButtonContainer::ScVbaButtonContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, - const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException) : + const uno::Reference< sheet::XSpreadsheet >& rxSheet ) : ScVbaControlContainer( rxParent, rxContext, rxModel, rxSheet, cppu::UnoType<excel::XButton>::get(), @@ -498,7 +497,7 @@ ScVbaButtonContainer::ScVbaButtonContainer( { } -ScVbaSheetObjectBase* ScVbaButtonContainer::implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) +ScVbaSheetObjectBase* ScVbaButtonContainer::implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) { uno::Reference< drawing::XControlShape > xControlShape( rxShape, uno::UNO_QUERY_THROW ); return new ScVbaButton( mxParent, mxContext, mxModel, createForm(), xControlShape ); @@ -515,7 +514,7 @@ ScVbaButtons::ScVbaButtons( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< frame::XModel >& rxModel, - const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException) : + const uno::Reference< sheet::XSpreadsheet >& rxSheet ) : ScVbaGraphicObjectsBase( new ScVbaButtonContainer( rxParent, rxContext, rxModel, rxSheet ) ) { } diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index b0fc53521d7b..ca9872e4f9f4 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -43,24 +43,24 @@ class ScVbaSheetObjectsBase : public ScVbaSheetObjects_BASE { public: /// @throws css::uno::RuntimeException - explicit ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException); + explicit ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ); virtual ~ScVbaSheetObjectsBase() override; /** Updates the collection by fetching all shapes from the draw page. @throws css::uno::RuntimeException */ - void collectShapes() throw (css::uno::RuntimeException); + void collectShapes(); // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Type SAL_CALL getElementType() override; // ScVbaCollectionBase virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) override; - virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) throw (css::uno::RuntimeException) override; + virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) override; protected: ScVbaObjectContainerRef mxContainer; @@ -75,14 +75,14 @@ class ScVbaGraphicObjectsBase : public ScVbaGraphicObjects_BASE { public: /// @throws css::uno::RuntimeException - explicit ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException); + explicit ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ); // XGraphicObjects virtual css::uno::Any SAL_CALL Add( const css::uno::Any& rLeft, const css::uno::Any& rTop, const css::uno::Any& rWidth, - const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rHeight ) override; }; /** Collection containing all button controls from a sheet (not ActiveX controls). */ @@ -94,7 +94,7 @@ public: const css::uno::Reference< ov::XHelperInterface >& rxParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XModel >& rxModel, - const css::uno::Reference< css::sheet::XSpreadsheet >& rxSheet ) throw (css::uno::RuntimeException); + const css::uno::Reference< css::sheet::XSpreadsheet >& rxSheet ); VBAHELPER_DECL_XHELPERINTERFACE }; diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 243a49a687d4..4c82b44629c7 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; static const char DISPLAYNAME[] = "DisplayName"; uno::Reference< container::XNameAccess > -ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) +ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) { uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName("CellStyles"), uno::UNO_QUERY_THROW ); @@ -37,14 +37,14 @@ ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xMode /// @throws script::BasicErrorException /// @throws uno::RuntimeException static uno::Reference< beans::XPropertySet > -lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) +lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) { uno::Reference< beans::XPropertySet > xStyleProps( ScVbaStyle::getStylesNameContainer( xModel )->getByName( sStyleName ), uno::UNO_QUERY_THROW ); return xStyleProps; } -void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorException ) +void ScVbaStyle::initialise() { if (!mxModel.is() ) DebugHelper::basicexception(ERRCODE_BASIC_METHOD_FAILED, "XModel Interface could not be retrieved" ); @@ -63,7 +63,6 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorE ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) - throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ) { try @@ -80,7 +79,6 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) - throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false ) { try @@ -94,25 +92,25 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, } sal_Bool SAL_CALL -ScVbaStyle::BuiltIn() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::BuiltIn() { return !mxStyle->isUserDefined(); } void SAL_CALL -ScVbaStyle::setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::setName( const OUString& Name ) { mxStyle->setName(Name); } OUString SAL_CALL -ScVbaStyle::getName() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::getName() { return mxStyle->getName(); } void SAL_CALL -ScVbaStyle::setNameLocal( const OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::setNameLocal( const OUString& NameLocal ) { try { @@ -125,7 +123,7 @@ ScVbaStyle::setNameLocal( const OUString& NameLocal ) throw (script::BasicErrorE } OUString SAL_CALL -ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::getNameLocal() { OUString sName; try @@ -140,7 +138,7 @@ ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeExcep } void SAL_CALL -ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyle::Delete() { try { @@ -153,13 +151,13 @@ ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException, } void SAL_CALL -ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); } uno::Any SAL_CALL -ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyle::getMergeCells( ) { DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString()); return uno::Any(); diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index fd8521ccb618..c21a55f6638d 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -35,27 +35,27 @@ protected: css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer; /// @throws css::uno::RuntimeException /// @throws css::script::BasicErrorException - void initialise() throw ( css::uno::RuntimeException, css::script::BasicErrorException ); + void initialise(); public: /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ); /// @throws css::script::BasicErrorException /// @throws css::uno::RuntimeException - ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel ); /// @throws css::uno::RuntimeException - static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException ); + static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel ); virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() override { return this; }; // XStyle Methods - virtual sal_Bool SAL_CALL BuiltIn() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNameLocal() 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 sal_Bool SAL_CALL BuiltIn() override; + virtual void SAL_CALL setName( const OUString& Name ) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) override; + virtual OUString SAL_CALL getNameLocal() override; + virtual void SAL_CALL Delete() override; // XFormat - virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override; + virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) override; + virtual css::uno::Any SAL_CALL getMergeCells( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index a4a1457882b7..2b8da076c2ba 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -33,7 +33,7 @@ lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Referenc return uno::makeAny( xStyle ); } -ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent ) +ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent ) { try { @@ -47,7 +47,7 @@ ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, con } uno::Sequence< OUString > -ScVbaStyles::getStyleNames() throw ( uno::RuntimeException ) +ScVbaStyles::getStyleNames() { return mxNameContainerCellStyles->getElementNames(); } @@ -59,7 +59,7 @@ ScVbaStyles::createCollectionObject(const uno::Any& aObject) } uno::Type SAL_CALL -ScVbaStyles::getElementType() throw (uno::RuntimeException) +ScVbaStyles::getElementType() { return cppu::UnoType<excel::XStyle>::get(); } @@ -76,11 +76,11 @@ class EnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference<XHelperInterface >& xParent, const uno::Reference<uno::XComponentContext >& xContext, const uno::Reference<frame::XModel >& xModel ) : m_xIndexAccess( xIndexAccess ), m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel ), 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 { try { @@ -113,13 +113,13 @@ public: } uno::Reference< container::XEnumeration > SAL_CALL -ScVbaStyles::createEnumeration() throw (uno::RuntimeException) +ScVbaStyles::createEnumeration() { return new EnumWrapper( m_xIndexAccess, mxParent, mxContext, mxModel ); } uno::Reference< excel::XStyle > SAL_CALL -ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) { uno::Reference< excel::XStyle > aRet; try @@ -166,7 +166,7 @@ ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (scr } void -ScVbaStyles::Delete(const OUString& _sStyleName) throw ( script::BasicErrorException ) +ScVbaStyles::Delete(const OUString& _sStyleName) { try { diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx index d724492eef00..82f60d3a8cda 100644 --- a/sc/source/ui/vba/vbastyles.hxx +++ b/sc/source/ui/vba/vbastyles.hxx @@ -34,16 +34,16 @@ class ScVbaStyles: public ScVbaStyles_BASE css::uno::Reference< css::container::XNameContainer > mxNameContainerCellStyles; public: /// @throws css::script::BasicErrorException - ScVbaStyles( 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 ); + ScVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > getStyleNames() throw ( css::uno::RuntimeException ); + css::uno::Sequence< OUString > getStyleNames(); /// @throws css::script::BasicErrorException - void Delete(const OUString& _sStyleName) throw ( css::script::BasicErrorException ); + void Delete(const OUString& _sStyleName); // XStyles - virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) 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/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx index f0e84e716ed1..1e141f4ffab0 100644 --- a/sc/source/ui/vba/vbatextboxshape.cxx +++ b/sc/source/ui/vba/vbatextboxshape.cxx @@ -31,19 +31,19 @@ ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentConte } OUString SAL_CALL -ScVbaTextBoxShape::getText() throw (css::uno::RuntimeException, std::exception) +ScVbaTextBoxShape::getText() { return m_xTextRange->getString(); } void SAL_CALL -ScVbaTextBoxShape::setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) +ScVbaTextBoxShape::setText( const OUString& _text ) { m_xTextRange->setString( _text ); } uno::Reference< excel::XCharacters > SAL_CALL -ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException, std::exception) +ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) { ScDocShell* pDocShell = excel::getDocShell( m_xModel ); ScDocument* pDoc = pDocShell ? &pDocShell->GetDocument() : nullptr; diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx index 2e762429ac76..3c71ee87032c 100644 --- a/sc/source/ui/vba/vbatextboxshape.hxx +++ b/sc/source/ui/vba/vbatextboxshape.hxx @@ -34,9 +34,9 @@ public: ScVbaTextBoxShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); // 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::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) 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::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBATEXTBOXSHAPE_HXX diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index 3c270d175219..c6aa6dd328c5 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -27,13 +27,13 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -ScVbaTextFrame::ScVbaTextFrame( uno::Sequence< uno::Any> const & args, uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException ) : ScVbaTextFrame_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< drawing::XShape >( args, 1, false ) ) +ScVbaTextFrame::ScVbaTextFrame( uno::Sequence< uno::Any> const & args, uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaTextFrame_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< drawing::XShape >( args, 1, false ) ) { } // Methods uno::Any SAL_CALL -ScVbaTextFrame::Characters() throw (uno::RuntimeException, std::exception) +ScVbaTextFrame::Characters() { uno::Reference< text::XSimpleText > xSimpleText( m_xShape, uno::UNO_QUERY_THROW ); ScVbaPalette aPalette( SfxObjectShell::Current() ); diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx index ff223c822144..9bac1c531e81 100644 --- a/sc/source/ui/vba/vbatextframe.hxx +++ b/sc/source/ui/vba/vbatextframe.hxx @@ -30,9 +30,9 @@ class ScVbaTextFrame : public ScVbaTextFrame_BASE { public: /// @throws css::lang::IllegalArgumentException - ScVbaTextFrame( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext ) throw ( css::lang::IllegalArgumentException ); + ScVbaTextFrame( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext ); // Methods - virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Characters( ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index fa85c2de0712..a4da150287c7 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -47,7 +47,7 @@ public: xShapePropertySet.set( xTitleShape, css::uno::UNO_QUERY_THROW ); oShapeHelper.reset( new ov::ShapeHelper(xTitleShape) ); } - css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) SAL_OVERRIDE { // #TODO find out what the proper parent should be // leaving as set by the helperapi for the moment @@ -55,14 +55,14 @@ public: // otherwise attempts to access the palette will fail return new ScVbaInterior( BaseClass::mxParent, BaseClass::mxContext, xShapePropertySet ); } - css::uno::Reference< ov::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + css::uno::Reference< ov::excel::XFont > SAL_CALL Font( ) SAL_OVERRIDE { // #TODO find out what the proper parent should be // leaving as set by the helperapi for the moment return new ScVbaFont( BaseClass::mxParent, BaseClass::mxContext, m_Palette, xShapePropertySet ); } - void SAL_CALL setText( const OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + void SAL_CALL setText( const OUString& Text ) SAL_OVERRIDE { try { @@ -73,7 +73,7 @@ public: throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() ); } } - OUString SAL_CALL getText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + OUString SAL_CALL getText( ) SAL_OVERRIDE { OUString sText; try @@ -87,23 +87,23 @@ public: return sText; } - void SAL_CALL setTop( double Top ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + void SAL_CALL setTop( double Top ) SAL_OVERRIDE { oShapeHelper->setTop( Top ); } - double SAL_CALL getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + double SAL_CALL getTop( ) SAL_OVERRIDE { return oShapeHelper->getTop(); } - void SAL_CALL setLeft( double Left ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + void SAL_CALL setLeft( double Left ) SAL_OVERRIDE { oShapeHelper->setLeft( Left ); } - double SAL_CALL getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + double SAL_CALL getLeft( ) SAL_OVERRIDE { return oShapeHelper->getLeft(); } - void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) SAL_OVERRIDE { try { @@ -114,7 +114,7 @@ public: throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() ); } } - ::sal_Int32 SAL_CALL getOrientation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE + ::sal_Int32 SAL_CALL getOrientation( ) SAL_OVERRIDE { sal_Int32 nSOOrientation = 0; try diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 82fbcdf3e224..e2e75009a35d 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -52,7 +52,7 @@ lcl_getValidationProps( const uno::Reference< table::XCellRange >& xRange ) } sal_Bool SAL_CALL -ScVbaValidation::getIgnoreBlank() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getIgnoreBlank() { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); bool bBlank = false; @@ -61,7 +61,7 @@ ScVbaValidation::getIgnoreBlank() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation::setIgnoreBlank( sal_Bool _ignoreblank ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setIgnoreBlank( sal_Bool _ignoreblank ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_IGNOREBL, uno::makeAny( _ignoreblank ) ); @@ -69,7 +69,7 @@ ScVbaValidation::setIgnoreBlank( sal_Bool _ignoreblank ) throw (uno::RuntimeExce } sal_Bool SAL_CALL -ScVbaValidation::getInCellDropdown() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getInCellDropdown() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); sal_Int32 nShowList = 0; @@ -78,7 +78,7 @@ ScVbaValidation::getInCellDropdown() throw (uno::RuntimeException, std::exceptio } void SAL_CALL -ScVbaValidation::setInCellDropdown( sal_Bool _incelldropdown ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setInCellDropdown( sal_Bool _incelldropdown ) { sal_Int32 nDropDown = 0; if ( _incelldropdown ) @@ -89,7 +89,7 @@ ScVbaValidation::setInCellDropdown( sal_Bool _incelldropdown ) throw (uno::Run } sal_Bool SAL_CALL -ScVbaValidation::getShowInput() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getShowInput() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); bool bShowInput = false; @@ -98,7 +98,7 @@ ScVbaValidation::getShowInput() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation:: setShowInput( sal_Bool _showinput ) throw (uno::RuntimeException, std::exception) +ScVbaValidation:: setShowInput( sal_Bool _showinput ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps(m_xRange) ); xProps->setPropertyValue( SC_UNONAME_IGNOREBL, uno::makeAny( _showinput ) ); @@ -106,7 +106,7 @@ ScVbaValidation:: setShowInput( sal_Bool _showinput ) throw (uno::RuntimeExcepti } sal_Bool SAL_CALL -ScVbaValidation::getShowError() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getShowError() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); bool bShowError = false; @@ -115,7 +115,7 @@ ScVbaValidation::getShowError() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation::setShowError( sal_Bool _showerror ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setShowError( sal_Bool _showerror ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_SHOWERR, uno::makeAny( _showerror ) ); @@ -123,7 +123,7 @@ ScVbaValidation::setShowError( sal_Bool _showerror ) throw (uno::RuntimeExceptio } OUString SAL_CALL -ScVbaValidation::getErrorTitle() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getErrorTitle() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); OUString sErrorTitle; @@ -132,7 +132,7 @@ ScVbaValidation::getErrorTitle() throw (uno::RuntimeException, std::exception) } void -ScVbaValidation::setErrorTitle( const OUString& _errormessage ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setErrorTitle( const OUString& _errormessage ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_ERRTITLE, uno::makeAny( _errormessage ) ); @@ -140,7 +140,7 @@ ScVbaValidation::setErrorTitle( const OUString& _errormessage ) throw (uno::Runt } OUString SAL_CALL -ScVbaValidation::getInputMessage() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getInputMessage() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); OUString sMsg; @@ -149,7 +149,7 @@ ScVbaValidation::getInputMessage() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation::setInputMessage( const OUString& _inputmessage ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setInputMessage( const OUString& _inputmessage ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_INPMESS, uno::makeAny( _inputmessage ) ); @@ -157,7 +157,7 @@ ScVbaValidation::setInputMessage( const OUString& _inputmessage ) throw (uno::Ru } OUString SAL_CALL -ScVbaValidation::getInputTitle() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getInputTitle() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); OUString sString; @@ -166,7 +166,7 @@ ScVbaValidation::getInputTitle() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation::setInputTitle( const OUString& _inputtitle ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setInputTitle( const OUString& _inputtitle ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_INPTITLE, uno::makeAny( _inputtitle ) ); @@ -174,7 +174,7 @@ ScVbaValidation::setInputTitle( const OUString& _inputtitle ) throw (uno::Runtim } OUString SAL_CALL -ScVbaValidation::getErrorMessage() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getErrorMessage() { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); OUString sString; @@ -183,7 +183,7 @@ ScVbaValidation::getErrorMessage() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::setErrorMessage( const OUString& _errormessage ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( SC_UNONAME_ERRMESS, uno::makeAny( _errormessage ) ); @@ -191,7 +191,7 @@ ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::Ru } void SAL_CALL -ScVbaValidation::Delete( ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::Delete( ) { OUString sBlank; uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); @@ -212,7 +212,7 @@ ScVbaValidation::Delete( ) throw (uno::RuntimeException, std::exception) // Fix the defect that validatation cannot work when the input should be limited between a lower bound and an upper bound void SAL_CALL -ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const uno::Any& Operator, const uno::Any& Formula1, const uno::Any& Formula2 ) throw (uno::RuntimeException, std::exception) +ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const uno::Any& Operator, const uno::Any& Formula1, const uno::Any& Formula2 ) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); uno::Reference< sheet::XSheetCondition > xCond( xProps, uno::UNO_QUERY_THROW ); @@ -294,7 +294,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un } OUString SAL_CALL -ScVbaValidation::getFormula1() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getFormula1() { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); OUString sString = xCond->getFormula1(); @@ -315,14 +315,14 @@ ScVbaValidation::getFormula1() throw (uno::RuntimeException, std::exception) } OUString SAL_CALL -ScVbaValidation::getFormula2() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getFormula2() { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); return xCond->getFormula2(); } sal_Int32 SAL_CALL -ScVbaValidation::getType() throw (uno::RuntimeException, std::exception) +ScVbaValidation::getType() { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); sheet::ValidationType nValType = sheet::ValidationType_ANY; diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx index 14e7c430f2d8..b253386dfdca 100644 --- a/sc/source/ui/vba/vbavalidation.hxx +++ b/sc/source/ui/vba/vbavalidation.hxx @@ -32,28 +32,28 @@ class ScVbaValidation : public ValidationImpl_BASE public: ScVbaValidation( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange ) : ValidationImpl_BASE( xParent, xContext ), m_xRange( xRange) {} // Attributes - virtual sal_Bool SAL_CALL getIgnoreBlank() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setIgnoreBlank( sal_Bool _ignoreblank ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getInCellDropdown() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInCellDropdown( sal_Bool _incelldropdown ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getShowInput() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShowInput( sal_Bool _showinput ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getShowError() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShowError( sal_Bool _showerror ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException, std::exception) override ; - virtual OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIgnoreBlank() override; + virtual void SAL_CALL setIgnoreBlank( sal_Bool _ignoreblank ) override; + virtual sal_Bool SAL_CALL getInCellDropdown() override; + virtual void SAL_CALL setInCellDropdown( sal_Bool _incelldropdown ) override; + virtual sal_Bool SAL_CALL getShowInput() override; + virtual void SAL_CALL setShowInput( sal_Bool _showinput ) override; + virtual sal_Bool SAL_CALL getShowError() override; + virtual void SAL_CALL setShowError( sal_Bool _showerror ) override; + virtual OUString SAL_CALL getInputTitle() override; + virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) override; + virtual OUString SAL_CALL getErrorTitle() override; + virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) override; + virtual OUString SAL_CALL getInputMessage() override; + virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) override; + virtual OUString SAL_CALL getErrorMessage() override; + virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) override; + virtual OUString SAL_CALL getFormula1() override ; + virtual OUString SAL_CALL getFormula2() override; + virtual sal_Int32 SAL_CALL getType() override; // Methods - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 2a7ef9c729d9..fae68abba1b3 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -70,16 +70,16 @@ public: Sheets::const_iterator m_it; /// @throws uno::RuntimeException - SelectedSheetsEnum( const uno::Reference< uno::XComponentContext >& xContext, const Sheets& sheets, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : m_xContext( xContext ), m_sheets( sheets ), m_xModel( xModel ) + SelectedSheetsEnum( const uno::Reference< uno::XComponentContext >& xContext, const Sheets& sheets, const uno::Reference< frame::XModel >& xModel ) : m_xContext( xContext ), m_sheets( sheets ), m_xModel( xModel ) { m_it = m_sheets.begin(); } // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return m_it != m_sheets.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() ) { @@ -128,16 +128,16 @@ public: } //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 SelectedSheetsEnum( m_xContext, sheets, m_xModel ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return sheets.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 || static_cast< Sheets::size_type >( Index ) >= sheets.size() ) @@ -147,18 +147,18 @@ public: } //XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<excel::XWorksheet>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return ( !sheets.empty() ); } //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 { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -167,12 +167,12 @@ public: } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { return comphelper::mapKeysToSequence( namesToIndices ); } - 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 { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); @@ -184,7 +184,7 @@ ScVbaWindow::ScVbaWindow( 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 ) { init(); @@ -192,7 +192,7 @@ ScVbaWindow::ScVbaWindow( ScVbaWindow::ScVbaWindow( const uno::Sequence< uno::Any >& args, - const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException) : + const uno::Reference< uno::XComponentContext >& xContext ) : WindowImpl_BASE( args, xContext ) { init(); @@ -219,25 +219,25 @@ ScVbaWindow::init() } uno::Reference< beans::XPropertySet > -ScVbaWindow::getControllerProps() throw (uno::RuntimeException) +ScVbaWindow::getControllerProps() { return uno::Reference< beans::XPropertySet >( getController(), uno::UNO_QUERY_THROW ); } uno::Reference< beans::XPropertySet > -ScVbaWindow::getFrameProps() throw (uno::RuntimeException) +ScVbaWindow::getFrameProps() { return uno::Reference< beans::XPropertySet >( getController()->getFrame(), uno::UNO_QUERY_THROW ); } uno::Reference< awt::XDevice > -ScVbaWindow::getDevice() throw (uno::RuntimeException) +ScVbaWindow::getDevice() { return uno::Reference< awt::XDevice >( getWindow(), uno::UNO_QUERY_THROW ); } void -ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft, bool bLargeScroll ) throw (uno::RuntimeException) +ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft, bool bLargeScroll ) { if( !m_xPane.is() ) throw uno::RuntimeException(); @@ -248,19 +248,19 @@ ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& T } void SAL_CALL -ScVbaWindow::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) { Scroll( Down, Up, ToRight, ToLeft, false ); } void SAL_CALL -ScVbaWindow::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) { Scroll( Down, Up, ToRight, ToLeft, true ); } uno::Any SAL_CALL -ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) { uno::Reference< container::XEnumerationAccess > xEnumAccess( new SelectedSheetsEnumAccess( mxContext, m_xModel ) ); // #FIXME needs a workbook as a parent @@ -274,7 +274,7 @@ ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeExcepti } void SAL_CALL -ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*Position*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*Position*/ ) { // #TODO #FIXME need some implementation to scroll through the tabs // but where is this done? @@ -294,7 +294,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P } uno::Any SAL_CALL -ScVbaWindow::getCaption() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getCaption() { static const char sCrud[] = " - OpenOffice.org Calc"; static const sal_Int32 nCrudLen = strlen(sCrud); @@ -333,13 +333,13 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setCaption( const uno::Any& _caption ) { getFrameProps()->setPropertyValue( SC_UNONAME_TITLE, _caption ); } uno::Any SAL_CALL -ScVbaWindow::getScrollRow() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getScrollRow() { sal_Int32 nValue = 0; // !! TODO !! get view shell from controller @@ -354,7 +354,7 @@ ScVbaWindow::getScrollRow() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) { // !! TODO !! get view shell from controller ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); @@ -369,7 +369,7 @@ ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeExcep } uno::Any SAL_CALL -ScVbaWindow::getScrollColumn() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getScrollColumn() { sal_Int32 nValue = 0; // !! TODO !! get view shell from controller @@ -384,7 +384,7 @@ ScVbaWindow::getScrollColumn() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) { // !! TODO !! get view shell from controller ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); @@ -399,7 +399,7 @@ ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::Runtim } uno::Any SAL_CALL -ScVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getWindowState() { sal_Int32 nwindowState = xlNormal; // !! TODO !! get view shell from controller @@ -417,7 +417,7 @@ ScVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setWindowState( const uno::Any& _windowstate ) { sal_Int32 nwindowState = xlMaximized; _windowstate >>= nwindowState; @@ -439,7 +439,7 @@ ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE } void -ScVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception) +ScVbaWindow::Activate() { rtl::Reference<ScVbaWorkbook> workbook( new ScVbaWorkbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel ) ); @@ -447,35 +447,35 @@ ScVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception) } void -ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) { rtl::Reference< ScVbaWorkbook > workbook( new ScVbaWorkbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel ) ); workbook->Close(SaveChanges, FileName, RouteWorkBook ); } uno::Reference< excel::XPane > SAL_CALL -ScVbaWindow::ActivePane() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWindow::ActivePane() { uno::Reference< sheet::XViewPane > xViewPane( getController(), uno::UNO_QUERY_THROW ); return new ScVbaPane( this, mxContext, m_xModel, xViewPane ); } uno::Reference< excel::XRange > SAL_CALL -ScVbaWindow::ActiveCell( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWindow::ActiveCell( ) { uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); return xApplication->getActiveCell(); } uno::Any SAL_CALL -ScVbaWindow::Selection( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWindow::Selection( ) { uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); return xApplication->getSelection(); } uno::Reference< excel::XRange > SAL_CALL -ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWindow::RangeSelection() { /* TODO / FIXME: According to documentation, this method returns the range selection even if shapes are selected. */ @@ -483,7 +483,7 @@ ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeEx } sal_Bool SAL_CALL -ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayGridlines() { OUString sName( SC_UNO_SHOWGRID ); bool bGrid = true; @@ -492,14 +492,14 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setDisplayGridlines( sal_Bool _displaygridlines ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayGridlines( sal_Bool _displaygridlines ) { OUString sName( SC_UNO_SHOWGRID ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _displaygridlines )); } sal_Bool SAL_CALL -ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayHeadings() { OUString sName( SC_UNO_COLROWHDR ); bool bHeading = true; @@ -508,14 +508,14 @@ ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setDisplayHeadings( sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayHeadings( sal_Bool _bDisplayHeadings ) { OUString sName( SC_UNO_COLROWHDR ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings )); } sal_Bool SAL_CALL -ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayHorizontalScrollBar() { OUString sName( SC_UNO_HORSCROLL ); bool bHorizontalScrollBar = true; @@ -524,14 +524,14 @@ ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException, std:: } void SAL_CALL -ScVbaWindow::setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) { OUString sName( SC_UNO_HORSCROLL ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar )); } sal_Bool SAL_CALL -ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayOutline() { OUString sName( SC_UNO_OUTLSYMB ); bool bOutline = true; @@ -540,14 +540,14 @@ ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setDisplayOutline( sal_Bool _bDisplayOutline ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayOutline( sal_Bool _bDisplayOutline ) { OUString sName( SC_UNO_OUTLSYMB ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayOutline )); } sal_Bool SAL_CALL -ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayVerticalScrollBar() { OUString sName( SC_UNO_VERTSCROLL ); bool bVerticalScrollBar = true; @@ -556,14 +556,14 @@ ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException, std::ex } void SAL_CALL -ScVbaWindow::setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) { OUString sName( SC_UNO_VERTSCROLL ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar )); } sal_Bool SAL_CALL -ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getDisplayWorkbookTabs() { OUString sName( SC_UNO_SHEETTABS ); bool bWorkbookTabs = true; @@ -572,21 +572,21 @@ ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException, std::excepti } void SAL_CALL -ScVbaWindow::setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) { OUString sName( SC_UNO_SHEETTABS ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs )); } sal_Bool SAL_CALL -ScVbaWindow::getFreezePanes() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getFreezePanes() { uno::Reference< sheet::XViewFreezable > xViewFreezable( getController(), uno::UNO_QUERY_THROW ); return xViewFreezable->hasFrozenPanes(); } void SAL_CALL -ScVbaWindow::setFreezePanes( sal_Bool _bFreezePanes ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setFreezePanes( sal_Bool _bFreezePanes ) { uno::Reference< sheet::XViewPane > xViewPane( getController(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XViewSplitable > xViewSplitable( xViewPane, uno::UNO_QUERY_THROW ); @@ -617,14 +617,14 @@ ScVbaWindow::setFreezePanes( sal_Bool _bFreezePanes ) throw (uno::RuntimeExcepti } sal_Bool SAL_CALL -ScVbaWindow::getSplit() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getSplit() { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); return xViewSplitable->getIsWindowSplit(); } void SAL_CALL -ScVbaWindow::setSplit( sal_Bool _bSplit ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setSplit( sal_Bool _bSplit ) { if( !_bSplit ) { @@ -642,14 +642,14 @@ ScVbaWindow::setSplit( sal_Bool _bSplit ) throw (uno::RuntimeException, std::exc } sal_Int32 SAL_CALL -ScVbaWindow::getSplitColumn() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getSplitColumn() { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); return xViewSplitable->getSplitColumn(); } void SAL_CALL -ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) { if( getSplitColumn() != _splitcolumn ) { @@ -660,14 +660,14 @@ ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeExcepti } double SAL_CALL -ScVbaWindow::getSplitHorizontal() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getSplitHorizontal() { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); return PixelsToPoints( getDevice(), xViewSplitable->getSplitHorizontal(), true ); } void SAL_CALL -ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setSplitHorizontal( double _splithorizontal ) { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); double fHoriPixels = PointsToPixels( getDevice(), _splithorizontal, true ); @@ -675,14 +675,14 @@ ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeEx } sal_Int32 SAL_CALL -ScVbaWindow::getSplitRow() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getSplitRow() { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); return xViewSplitable->getSplitRow(); } void SAL_CALL -ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) { if( getSplitRow() != _splitrow ) { @@ -693,14 +693,14 @@ ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException, st } double SAL_CALL -ScVbaWindow::getSplitVertical() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getSplitVertical() { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); return PixelsToPoints( getDevice(), xViewSplitable->getSplitVertical(), false ); } void SAL_CALL -ScVbaWindow::setSplitVertical(double _splitvertical ) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setSplitVertical(double _splitvertical ) { uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW ); double fVertiPixels = PointsToPixels( getDevice(), _splitvertical, false ); @@ -734,7 +734,7 @@ void ScVbaWindow::SplitAtDefinedPosition( sal_Int32 nColumns, sal_Int32 nRows ) } uno::Any SAL_CALL -ScVbaWindow::getZoom() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getZoom() { uno::Reference< beans::XPropertySet > xProps = getControllerProps(); OUString sName( SC_UNO_ZOOMTYPE ); @@ -755,7 +755,6 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException, std::exception) } void SAL_CALL ScVbaWindow::setZoom(const uno::Any& _zoom) - throw (uno::RuntimeException, std::exception) { sal_Int16 nZoom = 100; _zoom >>= nZoom; @@ -770,14 +769,14 @@ void SAL_CALL ScVbaWindow::setZoom(const uno::Any& _zoom) } uno::Reference< excel::XWorksheet > SAL_CALL -ScVbaWindow::ActiveSheet( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWindow::ActiveSheet( ) { uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); return xApplication->getActiveSheet(); } uno::Any SAL_CALL -ScVbaWindow::getView() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getView() { bool bPageBreak = false; sal_Int32 nWindowView = excel::XlWindowView::xlNormalView; @@ -795,7 +794,7 @@ ScVbaWindow::getView() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException, std::exception) +ScVbaWindow::setView( const uno::Any& _view) { sal_Int32 nWindowView = excel::XlWindowView::xlNormalView; _view >>= nWindowView; @@ -818,7 +817,7 @@ ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException, std:: } uno::Reference< excel::XRange > SAL_CALL -ScVbaWindow::getVisibleRange() throw (uno::RuntimeException, std::exception) +ScVbaWindow::getVisibleRange() { uno::Reference< container::XIndexAccess > xPanesIA( getController(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XViewPane > xTopLeftPane( xPanesIA->getByIndex( 0 ), uno::UNO_QUERY_THROW ); @@ -827,7 +826,7 @@ ScVbaWindow::getVisibleRange() throw (uno::RuntimeException, std::exception) } sal_Int32 SAL_CALL -ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) { sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points ); double fConvertFactor = (getDevice()->getInfo().PixelPerMeterX/100000); @@ -835,7 +834,7 @@ ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicE } sal_Int32 SAL_CALL -ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) { sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points ); double fConvertFactor = (getDevice()->getInfo().PixelPerMeterY/100000); @@ -843,7 +842,7 @@ ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicE } void SAL_CALL -ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) { // need test, print current active sheet // !! TODO !! get view shell from controller @@ -851,14 +850,14 @@ ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const } void SAL_CALL -ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) { // need test, print preview current active sheet // !! TODO !! get view shell from controller PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) ); } -double SAL_CALL ScVbaWindow::getTabRatio() throw (css::uno::RuntimeException, std::exception) +double SAL_CALL ScVbaWindow::getTabRatio() { ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( pViewShell && pViewShell->GetViewData().GetView() ) @@ -870,7 +869,7 @@ double SAL_CALL ScVbaWindow::getTabRatio() throw (css::uno::RuntimeException, st return 0.0; } -void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) { ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( pViewShell && pViewShell->GetViewData().GetView() ) diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index 3cdfe56e9ee5..ee70854f6c79 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.hxx @@ -42,18 +42,18 @@ private: void init(); /// @throws css::uno::RuntimeException - css::uno::Reference< css::beans::XPropertySet > getControllerProps() throw (css::uno::RuntimeException); + css::uno::Reference< css::beans::XPropertySet > getControllerProps(); /// @throws css::uno::RuntimeException - css::uno::Reference< css::beans::XPropertySet > getFrameProps() throw (css::uno::RuntimeException); + css::uno::Reference< css::beans::XPropertySet > getFrameProps(); /// @throws css::uno::RuntimeException - css::uno::Reference< css::awt::XDevice > getDevice() throw (css::uno::RuntimeException); + css::uno::Reference< css::awt::XDevice > getDevice(); protected: void SplitAtDefinedPosition( sal_Int32 nColumns, sal_Int32 nRows ); public: /// @throws css::uno::RuntimeException - void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll ) throw (css::uno::RuntimeException); + void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll ); public: /// @throws css::uno::RuntimeException @@ -61,71 +61,69 @@ 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 ); /// @throws css::uno::RuntimeException ScVbaWindow( const css::uno::Sequence< css::uno::Any >& aArgs, - const css::uno::Reference< css::uno::XComponentContext >& xContext ) - throw (css::uno::RuntimeException); + const css::uno::Reference< css::uno::XComponentContext >& xContext ); // XWindow - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayGridlines() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayGridlines( sal_Bool _displaygridlines ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayHeadings() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayHeadings( sal_Bool _bDisplayHeadings ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayHorizontalScrollBar() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayOutline() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayOutline( sal_Bool _bDisplayOutline ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayVerticalScrollBar() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDisplayWorkbookTabs() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getFreezePanes() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFreezePanes( sal_Bool _bFreezePanes ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getSplit() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSplit( sal_Bool _bSplit ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSplitColumn() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setSplitColumn( sal_Int32 _splitcolumn ) throw (css::uno::RuntimeException, std::exception) override ; - virtual double SAL_CALL getSplitHorizontal() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setSplitHorizontal( double _splithorizontal ) throw (css::uno::RuntimeException, std::exception) override ; - virtual sal_Int32 SAL_CALL getSplitRow() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setSplitRow( sal_Int32 _splitrow ) throw (css::uno::RuntimeException, std::exception) override ; - virtual double SAL_CALL getSplitVertical() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setSplitVertical( double _splitvertical ) throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) override ; - 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::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() 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 getZoom() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setZoom(const css::uno::Any& _zoom) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getTabRatio() throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setTabRatio( double _tabratio ) throw (css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) override; + virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) override; + virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) override; + virtual css::uno::Any SAL_CALL getCaption() override; + virtual sal_Bool SAL_CALL getDisplayGridlines() override; + virtual void SAL_CALL setDisplayGridlines( sal_Bool _displaygridlines ) override; + virtual sal_Bool SAL_CALL getDisplayHeadings() override; + virtual void SAL_CALL setDisplayHeadings( sal_Bool _bDisplayHeadings ) override; + virtual sal_Bool SAL_CALL getDisplayHorizontalScrollBar() override; + virtual void SAL_CALL setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) override; + virtual sal_Bool SAL_CALL getDisplayOutline() override; + virtual void SAL_CALL setDisplayOutline( sal_Bool _bDisplayOutline ) override; + virtual sal_Bool SAL_CALL getDisplayVerticalScrollBar() override; + virtual void SAL_CALL setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) override; + virtual sal_Bool SAL_CALL getDisplayWorkbookTabs() override; + virtual void SAL_CALL setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) override; + virtual sal_Bool SAL_CALL getFreezePanes() override; + virtual void SAL_CALL setFreezePanes( sal_Bool _bFreezePanes ) override; + virtual sal_Bool SAL_CALL getSplit() override; + virtual void SAL_CALL setSplit( sal_Bool _bSplit ) override; + virtual sal_Int32 SAL_CALL getSplitColumn() override ; + virtual void SAL_CALL setSplitColumn( sal_Int32 _splitcolumn ) override ; + virtual double SAL_CALL getSplitHorizontal() override ; + virtual void SAL_CALL setSplitHorizontal( double _splithorizontal ) override ; + virtual sal_Int32 SAL_CALL getSplitRow() override ; + virtual void SAL_CALL setSplitRow( sal_Int32 _splitrow ) override ; + virtual double SAL_CALL getSplitVertical() override ; + virtual void SAL_CALL setSplitVertical( double _splitvertical ) override ; + virtual css::uno::Any SAL_CALL getScrollRow() override ; + virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) override ; + virtual css::uno::Any SAL_CALL getScrollColumn() override ; + virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) override ; + virtual css::uno::Any SAL_CALL getView() override; + virtual void SAL_CALL setView( const css::uno::Any& _view ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() override; + virtual css::uno::Any SAL_CALL getWindowState() override; + virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) override; + virtual css::uno::Any SAL_CALL getZoom() override; + virtual void SAL_CALL setZoom(const css::uno::Any& _zoom) override; + virtual double SAL_CALL getTabRatio() override ; + virtual void SAL_CALL setTabRatio( double _tabratio ) override ; // Methods - virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) throw (css::uno::RuntimeException, std::exception) override; - 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& FileName, const css::uno::Any& RouteWorkBook ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Selection( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL RangeSelection() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override; + virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override; + virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) override; + virtual void SAL_CALL Activate( ) override; + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& FileName, const css::uno::Any& RouteWorkBook ) override; + virtual css::uno::Any SAL_CALL Selection( ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL RangeSelection() override; + virtual sal_Int32 SAL_CALL PointsToScreenPixelsX(sal_Int32 _points) override; + virtual sal_Int32 SAL_CALL PointsToScreenPixelsY(sal_Int32 _points) override; + virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) override; + virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index d7202344c12e..324df72297ee 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -60,13 +60,13 @@ protected: public: /// @throws uno::RuntimeException - WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Components& components ) throw ( uno::RuntimeException ) : m_xContext( xContext ), m_components( components ) + WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Components& components ) : m_xContext( xContext ), m_components( components ) { m_it = m_components.begin(); } /// @throws uno::RuntimeException - explicit WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) : m_xContext( xContext ) + explicit WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) : m_xContext( xContext ) { uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(m_xContext); uno::Reference< container::XEnumeration > xComponents = xDesktop->getComponents()->createEnumeration(); @@ -79,12 +79,12 @@ public: m_it = m_components.begin(); } // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return m_it != m_components.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() ) { @@ -99,7 +99,7 @@ class WindowEnumImpl : public WindowComponentEnumImpl uno::Any m_aApplication; public: WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ): WindowComponentEnumImpl( xContext ), 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 { return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext, m_aApplication ); } @@ -140,16 +140,16 @@ public: } //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 WindowComponentEnumImpl( m_xContext, m_windows ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount( ) override { return m_windows.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 || static_cast< Components::size_type >( Index ) >= m_windows.size() ) @@ -158,18 +158,18 @@ public: } //XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<sheet::XSpreadsheetDocument>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return ( !m_windows.empty() ); } //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 { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -178,12 +178,12 @@ public: } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override { return comphelper::mapKeysToSequence( namesToIndices ); } - 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 { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); @@ -195,7 +195,7 @@ ScVbaWindows::ScVbaWindows( const uno::Reference< ov::XHelperInterface >& xParen { } uno::Reference< container::XEnumeration > -ScVbaWindows::createEnumeration() throw (uno::RuntimeException) +ScVbaWindows::createEnumeration() { return new WindowEnumImpl( mxContext, Application() ); } @@ -207,13 +207,13 @@ ScVbaWindows::createCollectionObject( const css::uno::Any& aSource ) } uno::Type -ScVbaWindows::getElementType() throw (uno::RuntimeException) +ScVbaWindows::getElementType() { return cppu::UnoType<excel::XWindows>::get(); } void SAL_CALL -ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) { //#TODO #FIXME see what can be done for an implementation here } diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 262287b2b778..3e9867db4006 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -34,11 +34,11 @@ public: ScVbaWindows( 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; // XWindows - virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index a732f0f87858..3c2bdda52ccd 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -66,7 +66,7 @@ void ScVbaWorkbook::initColorData( const uno::Sequence< sal_Int32 >& sColors ) } void SAL_CALL -ScVbaWorkbook::ResetColors( ) throw (::script::BasicErrorException, ::uno::RuntimeException, std::exception) +ScVbaWorkbook::ResetColors( ) { uno::Reference< container::XIndexAccess > xIndexAccess( ScVbaPalette::getDefaultPalette(), uno::UNO_QUERY_THROW ); sal_Int32 nLen = xIndexAccess->getCount(); @@ -80,7 +80,7 @@ ScVbaWorkbook::ResetColors( ) throw (::script::BasicErrorException, ::uno::Runt } ::uno::Any SAL_CALL -ScVbaWorkbook::Colors( const ::uno::Any& Index ) throw (::script::BasicErrorException, ::uno::RuntimeException, std::exception) +ScVbaWorkbook::Colors( const ::uno::Any& Index ) { uno::Any aRet; if ( Index.hasValue() ) @@ -137,7 +137,7 @@ bool ScVbaWorkbook::setFilterPropsFromFormat( sal_Int32 nFormat, uno::Sequence< } ::sal_Int32 SAL_CALL -ScVbaWorkbook::getFileFormat( ) throw (::uno::RuntimeException, std::exception) +ScVbaWorkbook::getFileFormat( ) { sal_Int32 aFileFormat = 0; OUString aFilterName; @@ -216,7 +216,7 @@ ScVbaWorkbook::ScVbaWorkbook( uno::Sequence< uno::Any> const & args, } uno::Reference< excel::XWorksheet > -ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::getActiveSheet() { uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ), uno::UNO_SET_THROW ); uno::Reference< sheet::XSpreadsheetView > xView( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -229,13 +229,13 @@ ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaWorkbook::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::Sheets( const uno::Any& aIndex ) { return Worksheets( aIndex ); } uno::Any SAL_CALL -ScVbaWorkbook::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::Worksheets( const uno::Any& aIndex ) { uno::Reference< frame::XModel > xModel( getModel() ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xModel, uno::UNO_QUERY_THROW ); @@ -249,7 +249,7 @@ ScVbaWorkbook::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeException return uno::Any( xWorkSheets->Item( aIndex, uno::Any() ) ); } uno::Any SAL_CALL -ScVbaWorkbook::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::Windows( const uno::Any& aIndex ) { uno::Reference< excel::XWindows > xWindows( new ScVbaWindows( getParent(), mxContext ) ); @@ -259,32 +259,32 @@ ScVbaWorkbook::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, s } void SAL_CALL -ScVbaWorkbook::Activate() throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::Activate() { VbaDocumentBase::Activate(); } void -ScVbaWorkbook::Protect( const uno::Any &aPassword ) throw (uno::RuntimeException) +ScVbaWorkbook::Protect( const uno::Any &aPassword ) { VbaDocumentBase::Protect( aPassword ); } sal_Bool -ScVbaWorkbook::getProtectStructure() throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::getProtectStructure() { uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW ); return xProt->isProtected(); } -sal_Bool SAL_CALL ScVbaWorkbook::getPrecisionAsDisplayed() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaWorkbook::getPrecisionAsDisplayed() { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument(); return rDoc.GetDocOptions().IsCalcAsShown(); } -void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument(); @@ -294,7 +294,7 @@ void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDispl } void -ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeException, std::exception) +ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) { OUString aURL; osl::FileBase::getFileURLFromSystemPath( sFileName, aURL ); @@ -306,7 +306,7 @@ ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeExcep } void SAL_CALL -ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*CreateBackup*/, const uno::Any& /*AccessMode*/, const uno::Any& /*ConflictResolution*/, const uno::Any& /*AddToMru*/, const uno::Any& /*TextCodepage*/, const uno::Any& /*TextVisualLayout*/, const uno::Any& /*Local*/ ) throw (css::uno::RuntimeException, std::exception) +ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*CreateBackup*/, const uno::Any& /*AccessMode*/, const uno::Any& /*ConflictResolution*/, const uno::Any& /*AddToMru*/, const uno::Any& /*TextCodepage*/, const uno::Any& /*TextVisualLayout*/, const uno::Any& /*Local*/ ) { OUString sFileName; FileName >>= sFileName; @@ -355,7 +355,7 @@ ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, con } css::uno::Any SAL_CALL -ScVbaWorkbook::Styles( const uno::Any& Item ) throw (::script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWorkbook::Styles( const uno::Any& Item ) { // quick look and Styles object doesn't seem to have a valid parent // or a least the object browser just shows an object that has no @@ -367,7 +367,7 @@ ScVbaWorkbook::Styles( const uno::Any& Item ) throw (::script::BasicErrorExcepti } uno::Any SAL_CALL -ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbook::Names( const uno::Any& aIndex ) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW ); @@ -397,14 +397,14 @@ ScVbaWorkbook::getServiceNames() } OUString SAL_CALL -ScVbaWorkbook::getCodeName() throw (css::uno::RuntimeException, std::exception) +ScVbaWorkbook::getCodeName() { uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY_THROW ); return xModelProp->getPropertyValue("CodeName").get< OUString >(); } sal_Int64 -ScVbaWorkbook::getSomething(const uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) +ScVbaWorkbook::getSomething(const uno::Sequence<sal_Int8 >& rId ) { if (rId.getLength() == 16 && 0 == memcmp( ScVbaWorksheet::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 )) diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 647641e1d6e8..25c4b188017c 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -40,35 +40,35 @@ public: ScVbaWorkbook( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); // Attributes - virtual sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getPrecisionAsDisplayed() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getProtectStructure() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() override; + virtual sal_Bool SAL_CALL getPrecisionAsDisplayed() override; + virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) override; // Methods - virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Windows( 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 void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) override; + virtual void SAL_CALL Activate() override; + virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) override; + virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) override; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override; - virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ResetColors( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getFileFormat( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) throw ( css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) override; + virtual void SAL_CALL ResetColors( ) override; + virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) override; + virtual ::sal_Int32 SAL_CALL getFileFormat( ) override; + virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) override; // code name - virtual OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCodeName() override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; // 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; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOK_HXX diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 0eb690c9fc18..c26088c42f1a 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -79,9 +79,9 @@ class WorkBookEnumImpl : public EnumerationHelperImpl { public: /// @throws uno::RuntimeException - WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} + WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} - 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< sheet::XSpreadsheetDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return getWorkbook( m_xContext, xDoc, m_xParent ); @@ -94,12 +94,12 @@ ScVbaWorkbooks::ScVbaWorkbooks( const uno::Reference< XHelperInterface >& xParen } // XEnumerationAccess uno::Type -ScVbaWorkbooks::getElementType() throw (uno::RuntimeException) +ScVbaWorkbooks::getElementType() { return cppu::UnoType<excel::XWorkbook>::get(); } uno::Reference< container::XEnumeration > -ScVbaWorkbooks::createEnumeration() throw (uno::RuntimeException) +ScVbaWorkbooks::createEnumeration() { // #FIXME its possible the WorkBookEnumImpl here doesn't reflect // the state of this object ( although it should ) would be @@ -117,7 +117,7 @@ ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource ) } uno::Any SAL_CALL -ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbooks::Add( const uno::Any& Template ) { uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc; sal_Int32 nWorkbookType = 0; @@ -161,7 +161,7 @@ ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException, st } void SAL_CALL -ScVbaWorkbooks::Close() throw (uno::RuntimeException, std::exception) +ScVbaWorkbooks::Close() { } @@ -200,7 +200,7 @@ ScVbaWorkbooks::getFileFilterType( const OUString& rFileName ) // #TODO# #FIXME# can any of the unused params below be used? uno::Any SAL_CALL -ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) { // we need to detect if this is a URL, if not then assume it's a file path OUString aURL; diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index a30359be3c69..c9825d51e039 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -39,8 +39,8 @@ public: ScVbaWorkbooks( 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; // ScVbaWorkbooks_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; @@ -48,9 +48,9 @@ public: virtual css::uno::Sequence<OUString> getServiceNames() override; // XWorkbooks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) 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 Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) override; + virtual void SAL_CALL Close( ) override; + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index ff021a8c8eec..30e9fdb3828b 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -181,12 +181,12 @@ openNewDoc(const OUString& aSheetName ) ScVbaWorksheet::ScVbaWorksheet(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheet >& xSheet, - const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : WorksheetImpl_BASE( xParent, xContext ), mxSheet( xSheet ), mxModel(xModel), mbVeryHidden( false ) + const uno::Reference< frame::XModel >& xModel ) : WorksheetImpl_BASE( xParent, xContext ), mxSheet( xSheet ), mxModel(xModel), mbVeryHidden( false ) { } ScVbaWorksheet::ScVbaWorksheet( uno::Sequence< uno::Any> const & args, - uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) : WorksheetImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ), mbVeryHidden( false ) + uno::Reference< uno::XComponentContext> const & xContext ) : WorksheetImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ), mbVeryHidden( false ) { if ( args.getLength() < 3 ) throw lang::IllegalArgumentException(); @@ -283,21 +283,21 @@ ScVbaWorksheet::createSheetCopy(uno::Reference<excel::XWorksheet> const & xSheet } OUString -ScVbaWorksheet::getName() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getName() { uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW ); return xNamed->getName(); } void -ScVbaWorksheet::setName(const OUString &rName ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::setName(const OUString &rName ) { uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW ); xNamed->setName( rName ); } sal_Int32 -ScVbaWorksheet::getVisible() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getVisible() { uno::Reference< beans::XPropertySet > xProps( getSheet(), uno::UNO_QUERY_THROW ); bool bVisible = false; @@ -307,7 +307,7 @@ ScVbaWorksheet::getVisible() throw (uno::RuntimeException, std::exception) } void -ScVbaWorksheet::setVisible( sal_Int32 nVisible ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::setVisible( sal_Int32 nVisible ) { using namespace ::ooo::vba::excel::XlSheetVisibility; bool bVisible = true; @@ -333,13 +333,13 @@ ScVbaWorksheet::setVisible( sal_Int32 nVisible ) throw (uno::RuntimeException, s } sal_Int16 -ScVbaWorksheet::getIndex() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getIndex() { return getSheetID() + 1; } sal_Int32 -ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getEnableSelection() { uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); SCTAB nTab = 0; @@ -366,7 +366,7 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException, std::exceptio } void -ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) { if( (nSelection != excel::XlEnableSelection::xlNoRestrictions) && (nSelection != excel::XlEnableSelection::xlUnlockedCells) && @@ -405,7 +405,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx } -sal_Bool SAL_CALL ScVbaWorksheet::getAutoFilterMode() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaWorksheet::getAutoFilterMode() { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument(); @@ -415,7 +415,7 @@ sal_Bool SAL_CALL ScVbaWorksheet::getAutoFilterMode() throw (uno::RuntimeExcepti return false; } -void SAL_CALL ScVbaWorksheet::setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaWorksheet::setAutoFilterMode( sal_Bool bAutoFilterMode ) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScDocShell* pDocShell = excel::getDocShell( xModel ); @@ -441,7 +441,7 @@ void SAL_CALL ScVbaWorksheet::setAutoFilterMode( sal_Bool bAutoFilterMode ) thro } uno::Reference< excel::XRange > -ScVbaWorksheet::getUsedRange() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getUsedRange() { uno::Reference< sheet::XSheetCellRange > xSheetCellRange(getSheet(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor( getSheet()->createCursorByRange( xSheetCellRange ), uno::UNO_QUERY_THROW ); @@ -453,20 +453,20 @@ ScVbaWorksheet::getUsedRange() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XOutline > -ScVbaWorksheet::Outline( ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Outline( ) { uno::Reference<sheet::XSheetOutline> xOutline(getSheet(),uno::UNO_QUERY_THROW); return new ScVbaOutline( this, mxContext, xOutline); } uno::Reference< excel::XPageSetup > -ScVbaWorksheet::PageSetup( ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::PageSetup( ) { return new ScVbaPageSetup( this, mxContext, getSheet(), getModel() ); } uno::Any -ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex ) { uno::Reference< sheet::XSheetPageBreak > xSheetPageBreak(getSheet(),uno::UNO_QUERY_THROW); uno::Reference< excel::XHPageBreaks > xHPageBreaks( new ScVbaHPageBreaks( this, mxContext, xSheetPageBreak)); @@ -476,7 +476,7 @@ ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex ) throw (uno::RuntimeExcepti } uno::Any -ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) throw ( uno::RuntimeException, std::exception ) +ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) { uno::Reference< sheet::XSheetPageBreak > xSheetPageBreak( getSheet(), uno::UNO_QUERY_THROW ); uno::Reference< excel::XVPageBreaks > xVPageBreaks( new ScVbaVPageBreaks( this, mxContext, xSheetPageBreak ) ); @@ -486,32 +486,32 @@ ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) throw ( uno::RuntimeExcept } sal_Int32 -ScVbaWorksheet::getStandardWidth() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getStandardWidth() { return STANDARDWIDTH ; } sal_Int32 -ScVbaWorksheet::getStandardHeight() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getStandardHeight() { return STANDARDHEIGHT; } sal_Bool -ScVbaWorksheet::getProtectionMode() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getProtectionMode() { return false; } sal_Bool -ScVbaWorksheet::getProtectContents()throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getProtectContents() { uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW); return xProtectable->isProtected(); } sal_Bool -ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getProtectDrawingObjects() { SCTAB nTab = 0; OUString aSheetName = getName(); @@ -529,13 +529,13 @@ ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException, std::ex } sal_Bool -ScVbaWorksheet::getProtectScenarios() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getProtectScenarios() { return false; } void -ScVbaWorksheet::Activate() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Activate() { uno::Reference< sheet::XSpreadsheetView > xSpreadsheet( getModel()->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -543,13 +543,13 @@ ScVbaWorksheet::Activate() throw (uno::RuntimeException, std::exception) } void -ScVbaWorksheet::Select() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Select() { Activate(); } void -ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) { uno::Reference<excel::XWorksheet> xSheet; OUString aCurrSheetName = getName(); @@ -586,7 +586,7 @@ ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno } void -ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) { uno::Reference<excel::XWorksheet> xSheet; if (!(Before >>= xSheet) && !(After >>=xSheet)&& !(Before.hasValue()) && !(After.hasValue())) @@ -600,7 +600,7 @@ ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno } void -ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) { // #TODO# #FIXME# Link is not used uno::Reference<excel::XRange> xRange( Destination, uno::UNO_QUERY ); @@ -610,7 +610,7 @@ ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) t } void -ScVbaWorksheet::Delete() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Delete() { uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); OUString aSheetName = getName(); @@ -629,7 +629,7 @@ ScVbaWorksheet::Delete() throw (uno::RuntimeException, std::exception) } uno::Reference< excel::XWorksheet > -ScVbaWorksheet::getSheetAtOffset(SCTAB offset) throw (uno::RuntimeException) +ScVbaWorksheet::getSheetAtOffset(SCTAB offset) { uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); uno::Reference <sheet::XSpreadsheets> xSheets( xSpreadDoc->getSheets(), uno::UNO_QUERY_THROW ); @@ -645,19 +645,19 @@ ScVbaWorksheet::getSheetAtOffset(SCTAB offset) throw (uno::RuntimeException) } uno::Reference< excel::XWorksheet > -ScVbaWorksheet::getNext() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getNext() { return getSheetAtOffset(static_cast<SCTAB>(1)); } uno::Reference< excel::XWorksheet > -ScVbaWorksheet::getPrevious() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getPrevious() { return getSheetAtOffset(-1); } void -ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObjects*/, const uno::Any& /*Contents*/, const uno::Any& /*Scenarios*/, const uno::Any& /*UserInterfaceOnly*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObjects*/, const uno::Any& /*Contents*/, const uno::Any& /*Scenarios*/, const uno::Any& /*UserInterfaceOnly*/ ) { // #TODO# #FIXME# is there anything we can do with the unused param // can the implementation use anything else here @@ -668,7 +668,7 @@ ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObje } void -ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Unprotect( const uno::Any& Password ) { uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW); OUString aPasswd; @@ -677,14 +677,14 @@ ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeExcepti } void -ScVbaWorksheet::Calculate() throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Calculate() { uno::Reference <sheet::XCalculatable> xReCalculate(getModel(), uno::UNO_QUERY_THROW); xReCalculate->calculate(); } uno::Reference< excel::XRange > -ScVbaWorksheet::Range( const ::uno::Any& Cell1, const ::uno::Any& Cell2 ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Range( const ::uno::Any& Cell1, const ::uno::Any& Cell2 ) { uno::Reference< excel::XRange > xSheetRange( new ScVbaRange( this, mxContext , uno::Reference< table::XCellRange >( getSheet(), uno::UNO_QUERY_THROW ) ) ); @@ -692,7 +692,7 @@ ScVbaWorksheet::Range( const ::uno::Any& Cell1, const ::uno::Any& Cell2 ) throw } void -ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) { // #TODO# #FIXME# unused params above, can we do anything with those OUString url = ".uno:SpellDialog"; @@ -701,7 +701,7 @@ ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::A } uno::Reference< excel::XRange > -ScVbaWorksheet::getSheetRange() throw (uno::RuntimeException) +ScVbaWorksheet::getSheetRange() { uno::Reference< table::XCellRange > xRange( getSheet(),uno::UNO_QUERY_THROW ); return uno::Reference< excel::XRange >( new ScVbaRange( this, mxContext, xRange ) ); @@ -711,7 +711,6 @@ ScVbaWorksheet::getSheetRange() throw (uno::RuntimeException) // the vbarange functionality here ... uno::Reference< excel::XRange > ScVbaWorksheet::Cells( const ::uno::Any &nRow, const ::uno::Any &nCol ) - throw (uno::RuntimeException, std::exception) { // Performance optimization for often-called Cells method: // Use a common helper method instead of creating a new ScVbaRange object @@ -720,19 +719,19 @@ ScVbaWorksheet::Cells( const ::uno::Any &nRow, const ::uno::Any &nCol ) } uno::Reference< excel::XRange > -ScVbaWorksheet::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Rows(const uno::Any& aIndex ) { return getSheetRange()->Rows( aIndex ); } uno::Reference< excel::XRange > -ScVbaWorksheet::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Columns( const uno::Any& aIndex ) { return getSheetRange()->Columns( aIndex ); } uno::Any SAL_CALL -ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::ChartObjects( const uno::Any& Index ) { if ( !mxCharts.is() ) { @@ -753,7 +752,7 @@ ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeExcepti } uno::Any SAL_CALL -ScVbaWorksheet::PivotTables( const uno::Any& Index ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::PivotTables( const uno::Any& Index ) { uno::Reference< css::sheet::XSpreadsheet > xSheet = getSheet(); uno::Reference< sheet::XDataPilotTablesSupplier > xTables(xSheet, uno::UNO_QUERY_THROW ) ; @@ -766,7 +765,7 @@ ScVbaWorksheet::PivotTables( const uno::Any& Index ) throw (uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaWorksheet::Comments( const uno::Any& Index ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Comments( const uno::Any& Index ) { uno::Reference< css::sheet::XSpreadsheet > xSheet = getSheet(); uno::Reference< sheet::XSheetAnnotationsSupplier > xAnnosSupp( xSheet, uno::UNO_QUERY_THROW ); @@ -779,7 +778,7 @@ ScVbaWorksheet::Comments( const uno::Any& Index ) throw (uno::RuntimeException, } uno::Any SAL_CALL -ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex ) { /* The worksheet always returns the same Hyperlinks object. See vbahyperlinks.hxx for more details. */ @@ -791,7 +790,7 @@ ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Names( const css::uno::Any& aIndex ) { // fake sheet-local names by returning all global names // #163498# initialize Names object with correct parent (this worksheet) @@ -805,7 +804,7 @@ ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaWorksheet::OLEObjects( const uno::Any& Index ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::OLEObjects( const uno::Any& Index ) { uno::Reference< sheet::XSpreadsheet > xSpreadsheet( getSheet(), uno::UNO_QUERY_THROW ); uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( xSpreadsheet, uno::UNO_QUERY_THROW ); @@ -819,7 +818,7 @@ ScVbaWorksheet::OLEObjects( const uno::Any& Index ) throw (uno::RuntimeException } uno::Any SAL_CALL -ScVbaWorksheet::Shapes( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Shapes( const uno::Any& aIndex ) { uno::Reference< sheet::XSpreadsheet > xSpreadsheet( getSheet(), uno::UNO_QUERY_THROW ); uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( xSpreadsheet, uno::UNO_QUERY_THROW ); @@ -833,7 +832,7 @@ ScVbaWorksheet::Shapes( const uno::Any& aIndex ) throw (uno::RuntimeException, s } uno::Any SAL_CALL -ScVbaWorksheet::Buttons( const uno::Any& rIndex ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Buttons( const uno::Any& rIndex ) { if( !mxButtons.is() ) mxButtons.set( new ScVbaButtons( this, mxContext, mxModel, mxSheet ) ); @@ -845,55 +844,55 @@ ScVbaWorksheet::Buttons( const uno::Any& rIndex ) throw (uno::RuntimeException, } uno::Any SAL_CALL -ScVbaWorksheet::CheckBoxes( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::CheckBoxes( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::DropDowns( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::DropDowns( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::GroupBoxes( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::GroupBoxes( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::Labels( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Labels( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::ListBoxes( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::ListBoxes( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::OptionButtons( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::OptionButtons( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::ScrollBars( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::ScrollBars( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } uno::Any SAL_CALL -ScVbaWorksheet::Spinners( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Spinners( const uno::Any& /*rIndex*/ ) { throw uno::RuntimeException(); } void SAL_CALL -ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::ShowDataForm( ) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScTabViewShell* pTabViewShell = excel::getBestViewShell( xModel ); @@ -909,7 +908,7 @@ ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException, std::exception) } uno::Any SAL_CALL -ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::Evaluate( const OUString& Name ) { // #TODO Evaluate allows other things to be evaluated, e.g. functions // I think ( like SIN(3) etc. ) need to investigate that @@ -919,24 +918,24 @@ ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException, s } uno::Reference< beans::XIntrospectionAccess > SAL_CALL -ScVbaWorksheet::getIntrospection( ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::getIntrospection( ) { return uno::Reference< beans::XIntrospectionAccess >(); } uno::Any SAL_CALL -ScVbaWorksheet::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) +ScVbaWorksheet::invoke( const OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) { throw uno::RuntimeException("Unsupported"); // unsupported operation } void SAL_CALL -ScVbaWorksheet::setValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaWorksheet::setValue( const OUString& aPropertyName, const uno::Any& aValue ) { setDefaultPropByIntrospection( getValue( aPropertyName ), aValue ); } uno::Any SAL_CALL -ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) +ScVbaWorksheet::getValue( const OUString& aPropertyName ) { uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); @@ -947,7 +946,7 @@ ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownP } sal_Bool SAL_CALL -ScVbaWorksheet::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::hasMethod( const OUString& /*aName*/ ) { return false; } @@ -976,7 +975,7 @@ ScVbaWorksheet::getFormControls() } sal_Bool SAL_CALL -ScVbaWorksheet::hasProperty( const OUString& aName ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::hasProperty( const OUString& aName ) { uno::Reference< container::XNameAccess > xFormControls( getFormControls() ); if ( xFormControls.is() ) @@ -1024,13 +1023,13 @@ ScVbaWorksheet::getServiceImplName() } void SAL_CALL -ScVbaWorksheet::setEnableCalculation( sal_Bool bEnableCalculation ) throw ( script::BasicErrorException, uno::RuntimeException, std::exception) +ScVbaWorksheet::setEnableCalculation( sal_Bool bEnableCalculation ) { uno::Reference <sheet::XCalculatable> xCalculatable(getModel(), uno::UNO_QUERY_THROW); xCalculatable->enableAutomaticCalculation( bEnableCalculation); } sal_Bool SAL_CALL -ScVbaWorksheet::getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) +ScVbaWorksheet::getEnableCalculation( ) { uno::Reference <sheet::XCalculatable> xCalculatable(getModel(), uno::UNO_QUERY_THROW); return xCalculatable->isAutomaticCalculationEnabled(); @@ -1049,21 +1048,21 @@ ScVbaWorksheet::getServiceNames() } OUString SAL_CALL -ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException, std::exception) +ScVbaWorksheet::getCodeName() { uno::Reference< beans::XPropertySet > xSheetProp( mxSheet, uno::UNO_QUERY_THROW ); return xSheetProp->getPropertyValue("CodeName").get< OUString >(); } sal_Int16 -ScVbaWorksheet::getSheetID() throw (uno::RuntimeException) +ScVbaWorksheet::getSheetID() { uno::Reference< sheet::XCellRangeAddressable > xAddressable( mxSheet, uno::UNO_QUERY_THROW ); // if ActiveSheet, mxSheet is null. return xAddressable->getRangeAddress().Sheet; } void SAL_CALL -ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName, const uno::Any& IgnorePrintAreas ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName, const uno::Any& IgnorePrintAreas ) { sal_Int32 nTo = 0; sal_Int32 nFrom = 0; @@ -1086,7 +1085,7 @@ ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::A } sal_Int64 SAL_CALL -ScVbaWorksheet::getSomething(const uno::Sequence<sal_Int8 > & rId) throw(uno::RuntimeException, std::exception) +ScVbaWorksheet::getSomething(const uno::Sequence<sal_Int8 > & rId) { if (rId.getLength() == 16 && 0 == memcmp( ScVbaWorksheet::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 )) diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 207b60355895..a1d8fa11f9ec 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -58,9 +58,9 @@ class ScVbaWorksheet : public WorksheetImpl_BASE bool mbVeryHidden; /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XWorksheet > getSheetAtOffset(SCTAB offset) throw (css::uno::RuntimeException); + css::uno::Reference< ov::excel::XWorksheet > getSheetAtOffset(SCTAB offset); /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XRange > getSheetRange() throw (css::uno::RuntimeException); + css::uno::Reference< ov::excel::XRange > getSheetRange(); css::uno::Reference< css::container::XNameAccess > getFormControls(); css::uno::Any getControlShape( const OUString& sName ); @@ -70,10 +70,10 @@ public: ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet, - const css::uno::Reference< css::frame::XModel >& xModel )throw (css::uno::RuntimeException) ; + const css::uno::Reference< css::frame::XModel >& xModel ) ; /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - ScVbaWorksheet( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + ScVbaWorksheet( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); virtual ~ScVbaWorksheet() override; @@ -86,88 +86,88 @@ public: css::uno::Reference< ov::excel::XWorksheet > createSheetCopy(css::uno::Reference< ov::excel::XWorksheet> const & xSheet, bool bAfter); // Attributes - 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 sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Int32 nVisible ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getStandardHeight() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProtectionMode() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProtectContents() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProtectDrawingObjects() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProtectScenarios() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getUsedRange() throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL ChartObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getEnableSelection() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoFilterMode() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString &rName ) override; + virtual sal_Int32 SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( sal_Int32 nVisible ) override; + virtual ::sal_Int32 SAL_CALL getStandardWidth() override; + virtual ::sal_Int32 SAL_CALL getStandardHeight() override; + virtual sal_Bool SAL_CALL getProtectionMode() override; + virtual sal_Bool SAL_CALL getProtectContents() override; + virtual sal_Bool SAL_CALL getProtectDrawingObjects() override; + virtual sal_Bool SAL_CALL getProtectScenarios() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getUsedRange() override ; + virtual css::uno::Any SAL_CALL ChartObjects( const css::uno::Any& Index ) override; + virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) override; + virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) override; + virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() override; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() override; + virtual sal_Int16 SAL_CALL getIndex() override; + virtual sal_Int32 SAL_CALL getEnableSelection() override; + virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) override; + virtual sal_Bool SAL_CALL getAutoFilterMode() override; + virtual void SAL_CALL setAutoFilterMode( sal_Bool bAutoFilterMode ) override; // Methods - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Paste( const css::uno::Any& Destination, const css::uno::Any& Link ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Protect( const css::uno::Any& Password, const css::uno::Any& DrawingObjects, const css::uno::Any& Contents, const css::uno::Any& Scenarios, const css::uno::Any& UserInterfaceOnly ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Unprotect( const css::uno::Any& Password ) throw (css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL Calculate( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL CheckSpelling( const css::uno::Any& CustomDictionary,const css::uno::Any& IgnoreUppercase,const css::uno::Any& AlwaysSuggest, const css::uno::Any& SpellingLang ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Activate() override; + virtual void SAL_CALL Select() override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) override; + virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) override ; + virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) override; + virtual void SAL_CALL Paste( const css::uno::Any& Destination, const css::uno::Any& Link ) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL Protect( const css::uno::Any& Password, const css::uno::Any& DrawingObjects, const css::uno::Any& Contents, const css::uno::Any& Scenarios, const css::uno::Any& UserInterfaceOnly ) override; + virtual void SAL_CALL Unprotect( const css::uno::Any& Password ) override; + + virtual void SAL_CALL Calculate( ) override; + virtual void SAL_CALL CheckSpelling( const css::uno::Any& CustomDictionary,const css::uno::Any& IgnoreUppercase,const css::uno::Any& AlwaysSuggest, const css::uno::Any& SpellingLang ) override; // Hacks (?) - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Any SAL_CALL OLEObjects( const css::uno::Any& Index ) 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 Buttons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL CheckBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL DropDowns( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL GroupBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Labels( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL ListBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL OptionButtons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL ScrollBars( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL setEnableCalculation( sal_Bool EnableCalculation ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ShowDataForm( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) override; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) override; + + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) override; + virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) override; + virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) override; + virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) override; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override; + + virtual css::uno::Any SAL_CALL OLEObjects( const css::uno::Any& Index ) override; + virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) override; + + virtual css::uno::Any SAL_CALL Buttons( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL CheckBoxes( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL DropDowns( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL GroupBoxes( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL Labels( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL ListBoxes( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL OptionButtons( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL ScrollBars( const css::uno::Any& rIndex ) override; + virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) override; + + virtual void SAL_CALL setEnableCalculation( sal_Bool EnableCalculation ) override; + virtual sal_Bool SAL_CALL getEnableCalculation( ) override; + virtual void SAL_CALL ShowDataForm( ) 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; // CodeName - virtual OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCodeName() override; /// @throws css::uno::RuntimeException - sal_Int16 getSheetID() throw (css::uno::RuntimeException); + sal_Int16 getSheetID(); - virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; // 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; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEET_HXX diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 0592ca1e0f77..e4accbffbab9 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -66,11 +66,11 @@ class WorkSheetsEnumeration : public ::cppu::WeakImplHelper< container::XEnumera SheetMap::iterator mIt; public: explicit WorkSheetsEnumeration( const SheetMap& sMap ) : mSheetMap( sMap ), mIt( mSheetMap.begin() ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( mIt != mSheetMap.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(); @@ -88,16 +88,16 @@ class SheetCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAcc public: explicit SheetCollectionHelper( const SheetMap& sMap ) : mSheetMap( sMap ), cachePos(mSheetMap.begin()) {} // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<sheet::XSpreadsheet>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return ( !mSheetMap.empty() ); } + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<sheet::XSpreadsheet>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) override { return ( !mSheetMap.empty() ); } // 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 uno::makeAny( *cachePos ); } - 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( mSheetMap.size() ); OUString* pString = sNames.getArray(); @@ -111,7 +111,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 = mSheetMap.begin(); SheetMap::iterator it_end = mSheetMap.end(); @@ -125,8 +125,8 @@ public: } // XElementAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { return mSheetMap.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 mSheetMap.size(); } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -135,7 +135,7 @@ public: } // 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 WorkSheetsEnumeration( mSheetMap ); } @@ -146,9 +146,9 @@ class SheetsEnumeration : public EnumerationHelperImpl uno::Reference< frame::XModel > m_xModel; public: /// @throws uno::RuntimeException - SheetsEnumeration( 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 ) {} + SheetsEnumeration( 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< sheet::XSpreadsheet > xSheet( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); uno::Reference< XHelperInterface > xIf = excel::getUnoSheetModuleObj( xSheet ); @@ -177,13 +177,13 @@ ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xPar // XEnumerationAccess uno::Type -ScVbaWorksheets::getElementType() throw (uno::RuntimeException) +ScVbaWorksheets::getElementType() { return cppu::UnoType<excel::XWorksheet>::get(); } uno::Reference< container::XEnumeration > -ScVbaWorksheets::createEnumeration() throw (uno::RuntimeException) +ScVbaWorksheets::createEnumeration() { if ( !m_xSheets.is() ) { @@ -215,7 +215,7 @@ ScVbaWorksheets::createCollectionObject( const uno::Any& aSource ) // XWorksheets uno::Any ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, - const uno::Any& Count, const uno::Any& Type ) throw (uno::RuntimeException, std::exception) + const uno::Any& Count, const uno::Any& Type ) { if ( isSelectedSheets() ) return uno::Any(); // or should we throw? @@ -288,7 +288,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, } void -ScVbaWorksheets::Delete() throw (uno::RuntimeException, std::exception) +ScVbaWorksheets::Delete() { // #TODO #INVESTIGATE // mmm this method could be trouble if the underlying @@ -309,7 +309,7 @@ ScVbaWorksheets::isSelectedSheets() } void SAL_CALL -ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) { sal_Int32 nTo = 0; sal_Int32 nFrom = 0; @@ -330,7 +330,7 @@ ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno:: } uno::Any SAL_CALL -ScVbaWorksheets::getVisible() throw (uno::RuntimeException, std::exception) +ScVbaWorksheets::getVisible() { bool bVisible = true; uno::Reference< container::XEnumeration > xEnum( createEnumeration(), uno::UNO_QUERY_THROW ); @@ -347,7 +347,7 @@ ScVbaWorksheets::getVisible() throw (uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheets::setVisible( const uno::Any& _visible ) { bool bState = false; if ( _visible >>= bState ) @@ -364,7 +364,7 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep } void SAL_CALL -ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException, std::exception) +ScVbaWorksheets::Select( const uno::Any& Replace ) { ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel ); if ( !pViewShell ) @@ -394,7 +394,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException, } void SAL_CALL -ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After) throw (css::uno::RuntimeException, std::exception) +ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After) { uno::Reference<excel::XWorksheet> xSheet; sal_Int32 nElems = getCount(); @@ -437,7 +437,6 @@ ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After) throw (cs //ScVbaCollectionBaseImpl uno::Any SAL_CALL ScVbaWorksheets::Item(const uno::Any& Index, const uno::Any& Index2) - throw (lang::IndexOutOfBoundsException, script::BasicErrorException, uno::RuntimeException) { if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE ) { @@ -481,7 +480,7 @@ ScVbaWorksheets::getServiceNames() return sNames; } -bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) +bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) { if (!xSpreadDoc.is()) throw lang::IllegalArgumentException( "nameExists() xSpreadDoc is null", uno::Reference< uno::XInterface >(), 1 ); @@ -502,7 +501,7 @@ bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& return false; } -void ScVbaWorksheets::PrintPreview( const css::uno::Any& /*EnableChanges*/ ) throw (css::uno::RuntimeException, std::exception) +void ScVbaWorksheets::PrintPreview( const css::uno::Any& /*EnableChanges*/ ) { // need test, print preview current active sheet // !! TODO !! get view shell from controller diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index 82c3e7aeb500..26e8d227df67 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -42,28 +42,27 @@ public: bool isSelectedSheets(); // 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; // XWorksheets - virtual css::uno::Any SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( const css::uno::Any& _visible ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before, const css::uno::Any& After, const css::uno::Any& Count, const css::uno::Any& Type ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getVisible() override; + virtual void SAL_CALL setVisible( const css::uno::Any& _visible ) override; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before, const css::uno::Any& After, const css::uno::Any& Count, const css::uno::Any& Type ) override; + virtual void SAL_CALL Delete( ) override; + virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) override; virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; - virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Copy ( const css::uno::Any& Before, const css::uno::Any& After) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Select( const css::uno::Any& Replace ) override; + virtual void SAL_CALL Copy ( const css::uno::Any& Before, const css::uno::Any& After) override; + virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) override; // ScVbaWorksheets_BASE - 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; virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); + static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ); }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEETS_HXX diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 4b70c34d3fe2..5e319fe7173b 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -72,13 +72,13 @@ ScVbaWSFunction::ScVbaWSFunction( const uno::Reference< XHelperInterface >& xPar } uno::Reference< beans::XIntrospectionAccess > -ScVbaWSFunction::getIntrospection() throw(uno::RuntimeException, std::exception) +ScVbaWSFunction::getIntrospection() { return uno::Reference<beans::XIntrospectionAccess>(); } uno::Any SAL_CALL -ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) { // create copy of parameters, replace Excel range objects with UNO range objects uno::Sequence< uno::Any > aParamTemp( Params ); @@ -244,19 +244,19 @@ ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno:: } void SAL_CALL -ScVbaWSFunction::setValue(const OUString& /*PropertyName*/, const uno::Any& /*Value*/) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) +ScVbaWSFunction::setValue(const OUString& /*PropertyName*/, const uno::Any& /*Value*/) { throw beans::UnknownPropertyException(); } uno::Any SAL_CALL -ScVbaWSFunction::getValue(const OUString& /*PropertyName*/) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) +ScVbaWSFunction::getValue(const OUString& /*PropertyName*/) { throw beans::UnknownPropertyException(); } sal_Bool SAL_CALL -ScVbaWSFunction::hasMethod(const OUString& Name) throw(uno::RuntimeException, std::exception) +ScVbaWSFunction::hasMethod(const OUString& Name) { bool bIsFound = false; try @@ -276,13 +276,13 @@ ScVbaWSFunction::hasMethod(const OUString& Name) throw(uno::RuntimeException, s } sal_Bool SAL_CALL -ScVbaWSFunction::hasProperty(const OUString& /*Name*/) throw(uno::RuntimeException, std::exception) +ScVbaWSFunction::hasProperty(const OUString& /*Name*/) { return false; } OUString SAL_CALL -ScVbaWSFunction::getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) +ScVbaWSFunction::getExactName( const OUString& aApproximateName ) { OUString sName = aApproximateName.toAsciiUpperCase(); if ( !hasMethod( sName ) ) diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index 058794d748cc..eaedf551fdf5 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.hxx @@ -33,13 +33,13 @@ class ScVbaWSFunction : public ScVbaWSFunction_BASE public: ScVbaWSFunction( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); - 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& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) 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& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) 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& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) override; + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) override; + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) override; + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) override; + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) override; + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) override; // XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; |