diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /sc | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sc')
559 files changed, 7861 insertions, 7861 deletions
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx index 2fa0a383fd22..f7d3de4ba7ff 100644 --- a/sc/inc/AccessibleFilterMenu.hxx +++ b/sc/inc/AccessibleFilterMenu.hxx @@ -54,94 +54,94 @@ public: virtual ~ScAccessibleFilterMenu(); virtual bool SAL_CALL isVisible() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// XAccessibleComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// XAccessibleContext virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /// Remove an existing event listener. virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /// XAccessibleSelection virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected(sal_Int32 nChildIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearAccessibleSelection() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL selectAllAccessibleChildren() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(sal_Int32 nChildIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; /// XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; /// XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// non-UNO methods @@ -154,10 +154,10 @@ protected: sal_Int32 getMenuItemCount() const; virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: bool isSelected() const; diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx index 7eb2e8a74efb..4758864be76e 100644 --- a/sc/inc/AccessibleFilterMenuItem.hxx +++ b/sc/inc/AccessibleFilterMenuItem.hxx @@ -45,45 +45,45 @@ public: /// XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild(sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// XAccessibleAction virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding(sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; /// XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; /// Non-UNO Methods @@ -92,10 +92,10 @@ public: protected: virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: bool isSelected() const; diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx index 2f7cfd1152b2..b010bc69dc49 100644 --- a/sc/inc/AccessibleFilterTopWindow.hxx +++ b/sc/inc/AccessibleFilterTopWindow.hxx @@ -36,14 +36,14 @@ public: // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // Non-UNO Methods diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx index 9b6e9ff2280e..93c2b7e0ae54 100644 --- a/sc/inc/AccessibleGlobal.hxx +++ b/sc/inc/AccessibleGlobal.hxx @@ -35,17 +35,17 @@ public: // XAccessibleStateSet virtual sal_Bool SAL_CALL isEmpty() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL contains(sal_Int16 nState) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL containsAll( const ::com::sun::star::uno::Sequence<sal_Int16>& aStateSet) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence<sal_Int16> SAL_CALL getStates() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // Non-UNO Methods diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx index f99c8ed01f3e..6cbe8b91d477 100644 --- a/sc/inc/addincfg.hxx +++ b/sc/inc/addincfg.hxx @@ -25,12 +25,12 @@ class ScAddInCfg : public utl::ConfigItem { private: - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: ScAddInCfg(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) override; com::sun::star::uno::Sequence< com::sun::star::uno::Any> GetProperties(const com::sun::star::uno::Sequence< OUString >& rNames) diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index 2661b4ea22f7..71c21ffe295d 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -45,56 +45,56 @@ public: ScAddressConversionObj(ScDocShell* pDocSh, bool bIsRange); virtual ~ScAddressConversionObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index 0ea6db177085..55b4c5b997f1 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -63,11 +63,11 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, @@ -75,41 +75,41 @@ public: throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScAutoFormatObj : public ::cppu::WeakImplHelper< @@ -131,87 +131,87 @@ public: ScAutoFormatObj(sal_uInt16 nIndex); virtual ~ScAutoFormatObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // per getImplementation gerufen: bool IsInserted() const { return nFormatIndex != SC_AFMTOBJ_INVALID; } void InitFormat( sal_uInt16 nNewIndex ); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScAutoFormatObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); @@ -231,56 +231,56 @@ public: ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField); virtual ~ScAutoFormatFieldObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index 56aa88bf84cd..edfc3b2894c9 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -96,88 +96,88 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XGlobalSheetSettings - virtual sal_Bool SAL_CALL getMoveSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getMoveSelection() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("MoveSelection"); } - virtual void SAL_CALL setMoveSelection(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setMoveSelection(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("MoveSelection", (bool)p1); } - virtual sal_Int16 SAL_CALL getMoveDirection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int16 SAL_CALL getMoveDirection() throw (css::uno::RuntimeException, std::exception) override { return getPropertyInt16("MoveDirection"); } - virtual void SAL_CALL setMoveDirection(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setMoveDirection(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("MoveDirection", p1); } - virtual sal_Bool SAL_CALL getEnterEdit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getEnterEdit() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("EnterEdit"); } - virtual void SAL_CALL setEnterEdit(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setEnterEdit(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("EnterEdit", (bool)p1); } - virtual sal_Bool SAL_CALL getExtendFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getExtendFormat() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("ExtendFormat"); } - virtual void SAL_CALL setExtendFormat(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setExtendFormat(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("ExtendFormat", (bool)p1); } - virtual sal_Bool SAL_CALL getRangeFinder() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getRangeFinder() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("RangeFinder"); } - virtual void SAL_CALL setRangeFinder(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setRangeFinder(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("RangeFinder", (bool)p1); } - virtual sal_Bool SAL_CALL getExpandReferences() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getExpandReferences() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("ExpandReferences"); } - virtual void SAL_CALL setExpandReferences(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setExpandReferences(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("ExpandReferences", (bool)p1); } - virtual sal_Bool SAL_CALL getMarkHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getMarkHeader() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("MarkHeader"); } - virtual void SAL_CALL setMarkHeader(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setMarkHeader(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("MarkHeader", (bool)p1); } - virtual sal_Bool SAL_CALL getUseTabCol() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getUseTabCol() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("UseTabCol"); } - virtual void SAL_CALL setUseTabCol(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setUseTabCol(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("UseTabCol", (bool)p1); } - virtual sal_Int16 SAL_CALL getMetric() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int16 SAL_CALL getMetric() throw (css::uno::RuntimeException, std::exception) override { return getPropertyInt16("Metric"); } - virtual void SAL_CALL setMetric(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setMetric(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("Metric", p1); } - virtual sal_Int16 SAL_CALL getScale() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int16 SAL_CALL getScale() throw (css::uno::RuntimeException, std::exception) override { return getPropertyInt16("Scale"); } - virtual void SAL_CALL setScale(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setScale(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("Scale", p1); } - virtual sal_Bool SAL_CALL getDoAutoComplete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getDoAutoComplete() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("DoAutoComplete"); } - virtual void SAL_CALL setDoAutoComplete(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setDoAutoComplete(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("DoAutoComplete", (bool)p1); } - virtual sal_Int16 SAL_CALL getStatusBarFunction() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int16 SAL_CALL getStatusBarFunction() throw (css::uno::RuntimeException, std::exception) override { return getPropertyInt16("StatusBarFunction"); } - virtual void SAL_CALL setStatusBarFunction(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setStatusBarFunction(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("StatusBarFunction", p1); } - virtual css::uno::Sequence<OUString> SAL_CALL getUserLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence<OUString> SAL_CALL getUserLists() throw (css::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE + virtual void SAL_CALL setUserLists(const css::uno::Sequence<OUString>& p1) throw (css::uno::RuntimeException, std::exception) override { setPropertyValue( "UserLists", css::uno::Any(p1) ); } - virtual sal_Int16 SAL_CALL getLinkUpdateMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int16 SAL_CALL getLinkUpdateMode() throw (css::uno::RuntimeException, std::exception) override { return getPropertyInt16("LinkUpdateMode"); } - virtual void SAL_CALL setLinkUpdateMode(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setLinkUpdateMode(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("LinkUpdateMode", p1); } - virtual sal_Bool SAL_CALL getPrintAllSheets() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getPrintAllSheets() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("PrintAllSheets"); } - virtual void SAL_CALL setPrintAllSheets(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setPrintAllSheets(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("PrintAllSheets", (bool)p1); } - virtual sal_Bool SAL_CALL getPrintEmptyPages() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getPrintEmptyPages() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("PrintEmptyPages"); } - virtual void SAL_CALL setPrintEmptyPages(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setPrintEmptyPages(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("PrintEmptyPages", (bool)p1); } - virtual sal_Bool SAL_CALL getUsePrinterMetrics() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getUsePrinterMetrics() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("UsePrinterMetrics"); } - virtual void SAL_CALL setUsePrinterMetrics(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setUsePrinterMetrics(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("UsePrinterMetrics", (bool)p1); } - virtual sal_Bool SAL_CALL getReplaceCellsWarning() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL getReplaceCellsWarning() throw (css::uno::RuntimeException, std::exception) override { return getPropertyBool("ReplaceCellsWarning"); } - virtual void SAL_CALL setReplaceCellsWarning(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL setReplaceCellsWarning(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override { setProperty("ReplaceCellsWarning", (bool)p1); } // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, @@ -185,45 +185,45 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScRecentFunctionsObj : public cppu::WeakImplHelper< @@ -236,20 +236,20 @@ public: // XRecentFunctions virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getRecentFunctionIds() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setRecentFunctionIds( const ::com::sun::star::uno::Sequence< sal_Int32 >& aRecentFunctionIds ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getMaxRecentFunctions() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScFunctionListObj : public cppu::WeakImplHelper< @@ -266,41 +266,41 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getById( sal_Int32 nId ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index 97b238845286..0eed8a8370e1 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -50,11 +50,11 @@ public: const OUString& rArea, const ScRange& rDest, sal_uLong nRefresh ); virtual ~ScAreaLink(); - virtual void Closed() SAL_OVERRIDE; + virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; + const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; - virtual void Edit( vcl::Window*, const Link<SvBaseLink&,void>& rEndEditHdl ) SAL_OVERRIDE; + virtual void Edit( vcl::Window*, const Link<SvBaseLink&,void>& rEndEditHdl ) override; bool Refresh( const OUString& rNewFile, const OUString& rNewFilter, const OUString& rNewArea, sal_uLong nNewRefresh ); diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 385db7dbe7e9..2d25408f2964 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -56,9 +56,9 @@ public: ScMergeAttr( const ScMergeAttr& ); virtual ~ScMergeAttr(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; SCsCOL GetColMerge() const {return nColMerge; } SCsROW GetRowMerge() const {return nRowMerge; } @@ -80,7 +80,7 @@ public: ScMergeFlagAttr(sal_Int16 nFlags); virtual ~ScMergeFlagAttr(); - SfxPoolItem * Clone(SfxItemPool * pPool) const SAL_OVERRIDE; + SfxPoolItem * Clone(SfxItemPool * pPool) const override; bool IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) != 0; } bool IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) != 0; } @@ -116,14 +116,14 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, - const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + const IntlWrapper* pIntl = 0 ) const override; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; bool GetProtection() const { return bProtection; } bool SetProtection( bool bProtect); @@ -161,13 +161,13 @@ public: inline ScRangeItem& operator=( const ScRangeItem &rCpy ); // "pure virtual methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + const IntlWrapper* pIntl = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; private: ScRange aRange; @@ -210,13 +210,13 @@ public: ScTableListItem& operator=( const ScTableListItem &rCpy ); // "pure virtual Methoden" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + const IntlWrapper* pIntl = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; public: sal_uInt16 nCount; @@ -245,13 +245,13 @@ public: ScPageHFItem( const ScPageHFItem& rItem ); virtual ~ScPageHFItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; const EditTextObject* GetLeftArea() const { return pLeftArea; } const EditTextObject* GetCenterArea() const { return pCenterArea; } @@ -276,15 +276,15 @@ public: ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode ); virtual ~ScViewObjectModeItem(); - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, - const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + const IntlWrapper* pIntl = 0 ) const override; }; class ScDoubleItem : public SfxPoolItem @@ -295,10 +295,10 @@ public: ScDoubleItem( const ScDoubleItem& rItem ); virtual ~ScDoubleItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; private: double nValue; @@ -321,9 +321,9 @@ public: virtual ~ScPageScaleToItem(); - virtual ScPageScaleToItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE; + virtual ScPageScaleToItem* Clone( SfxItemPool* = 0 ) const override; - virtual bool operator==( const SfxPoolItem& rCmp ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& rCmp ) const override; inline sal_uInt16 GetWidth() const { return mnWidth; } inline sal_uInt16 GetHeight() const { return mnHeight; } @@ -338,10 +338,10 @@ public: SfxItemPresentation ePresentation, SfxMapUnit, SfxMapUnit, OUString& rText, - const IntlWrapper* = 0 ) const SAL_OVERRIDE; + const IntlWrapper* = 0 ) const override; - virtual bool QueryValue( ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId ) SAL_OVERRIDE; + virtual bool QueryValue( ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId ) override; private: sal_uInt16 mnWidth; @@ -358,8 +358,8 @@ public: virtual ~ScCondFormatItem(); - virtual bool operator==(const SfxPoolItem& rCmp ) const SAL_OVERRIDE; - virtual ScCondFormatItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE; + virtual bool operator==(const SfxPoolItem& rCmp ) const override; + virtual ScCondFormatItem* Clone( SfxItemPool* = 0 ) const override; const std::vector<sal_uInt32>& GetCondFormatData() const { return maIndex;} void AddCondFormatData( sal_uInt32 nIndex ); diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 24f699d31e5d..93c0e3d730ed 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -113,7 +113,7 @@ class ScLinkListener : public SvtListener public: ScLinkListener(const Link<const SfxHint&,void>& rL) : aLink(rL) {} virtual ~ScLinkListener(); - virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( const SfxHint& rHint ) override; }; typedef ::com::sun::star::uno::Reference< @@ -236,11 +236,11 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; virtual void RefChanged(); // from derived classes and by getImplementation @@ -262,50 +262,50 @@ public: virtual double SAL_CALL computeFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL clearContents( sal_Int32 nContentFlags ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, @@ -313,190 +313,190 @@ public: throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XTolerantMultiPropertySet virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XIndent - virtual void SAL_CALL decrementIndent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL incrementIndent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL decrementIndent() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL incrementIndent() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XChartData virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getNotANumber() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual double SAL_CALL getNotANumber() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XChartDataArray virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XCellRangesQuery virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL queryVisibleCells() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL queryEmptyCells() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL queryContentCells( sal_Int16 nContentFlags ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL queryFormulaCells( sal_Int32 nResultFlags ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL queryColumnDifferences( const ::com::sun::star::table::CellAddress& aCompare ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL queryRowDifferences( const ::com::sun::star::table::CellAddress& aCompare ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL queryIntersection( const ::com::sun::star::table::CellRangeAddress& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XFormulaQuery virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL queryDependents( sal_Bool bRecursive ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > SAL_CALL queryPrecedents( sal_Bool bRecursive ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XSearchable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL createSearchDescriptor() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findFirst( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findNext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XReplaceable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL - createReplaceDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createReplaceDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL replaceAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScCellRangesBase* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class SC_DLLPUBLIC ScCellRangesObj : public ScCellRangesBase, @@ -516,35 +516,35 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; - virtual void RefChanged() SAL_OVERRIDE; + virtual void RefChanged() override; // XSheetCellRanges virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL - getCells() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getCells() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getRangeAddressesAsString() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL - getRangeAddresses() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getRangeAddresses() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetCellRangeContainer virtual void SAL_CALL addRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange, sal_Bool bMergeRanges ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange ) throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRangeAddresses( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRanges, sal_Bool bMergeRanges ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRangeAddresses( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRanges ) throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, @@ -553,11 +553,11 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, @@ -565,47 +565,47 @@ public: throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class SC_DLLPUBLIC ScCellRangeObj : public ScCellRangesBase, @@ -633,16 +633,16 @@ private: protected: const ScRange& GetRange() const { return aRange; } - virtual const SfxItemPropertyMap& GetItemPropertyMap() SAL_OVERRIDE; + virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, ::com::sun::star::uno::Any& ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > GetCellByPosition_Impl( sal_Int32 nColumn, sal_Int32 nRow ) @@ -664,49 +664,49 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; - virtual void RefChanged() SAL_OVERRIDE; + virtual void RefChanged() override; // XCellRangeAddressable virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getRangeAddress() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > SAL_CALL - getSpreadsheet() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSpreadsheet() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XArrayFormulaRange - virtual OUString SAL_CALL getArrayFormula() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getArrayFormula() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setArrayFormula( const OUString& aFormula ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XArrayFormulaTokens virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getArrayTokens() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setArrayTokens( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XCellRangeData virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCellRangeFormula virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getFormulaArray() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormulaArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aArray ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XMultipleOperation virtual void SAL_CALL setTableOperation( @@ -714,94 +714,94 @@ public: ::com::sun::star::sheet::TableOperationMode nMode, const ::com::sun::star::table::CellAddress& aColumnCell, const ::com::sun::star::table::CellAddress& aRowCell ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XMergeable - virtual void SAL_CALL merge( sal_Bool bMerge ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsMerged() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL merge( sal_Bool bMerge ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsMerged() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCellSeries virtual void SAL_CALL fillSeries( ::com::sun::star::sheet::FillDirection nFillDirection, ::com::sun::star::sheet::FillMode nFillMode, ::com::sun::star::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL fillAuto( ::com::sun::star::sheet::FillDirection nFillDirection, sal_Int32 nSourceCount ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XAutoFormattable virtual void SAL_CALL autoFormat( const OUString& aName ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XSortable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - createSortDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createSortDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL sort( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetFilterableEx virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor > SAL_CALL createFilterDescriptorByObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterable >& xObject ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetFilterable virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor > SAL_CALL createFilterDescriptor( sal_Bool bEmpty ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL filter( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor >& xDescriptor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSubTotalCalculatable virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSubTotalDescriptor > SAL_CALL createSubTotalDescriptor( sal_Bool bEmpty ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL applySubTotals(const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSubTotalDescriptor >& xDescriptor, sal_Bool bReplace) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeSubTotals() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual void SAL_CALL removeSubTotals() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XImportable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createImportDescriptor( sal_Bool bEmpty ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL doImport( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCellFormatRangesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getCellFormatRanges() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getCellFormatRanges() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUniqueCellFormatRangesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getUniqueCellFormatRanges() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getUniqueCellFormatRanges() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XColumnRowRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableColumns > SAL_CALL - getColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableRows > SAL_CALL - getRows() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getRows() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > getCellRangeByName( const OUString& aRange, const ScAddress::Details& rDetails ) throw(::com::sun::star::uno::RuntimeException); @@ -809,21 +809,21 @@ public: // XPropertySet override due to Range-Properties virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; //! really derive cell from range? @@ -853,15 +853,15 @@ private: com::sun::star::table::CellContentType GetResultType_Impl(); protected: - virtual const SfxItemPropertyMap& GetItemPropertyMap() SAL_OVERRIDE; + virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, ::com::sun::star::uno::Any& ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; public: static const SvxItemPropertySet* GetEditPropertySet(); @@ -872,11 +872,11 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; - virtual void RefChanged() SAL_OVERRIDE; + virtual void RefChanged() override; SvxUnoText& GetUnoText(); @@ -893,111 +893,111 @@ public: ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCell - virtual OUString SAL_CALL getFormula() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getFormula() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula( const OUString& aFormula ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormulaResult( double nValue ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormulaString( const OUString& aFormula ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::table::CellContentType SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getError() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getError() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XFormulaTokens virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getTokens() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setTokens( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XCellAddressable virtual ::com::sun::star::table::CellAddress SAL_CALL getCellAddress() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetAnnotationAnchor virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetAnnotation > SAL_CALL - getAnnotation() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAnnotation() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTextFieldsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL - getTextFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getTextFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getTextFieldMasters() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getTextFieldMasters() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet override due to cell properties virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XActionLockable - virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScTableSheetObj : public ScCellRangeObj, @@ -1029,16 +1029,16 @@ private: void PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges ); protected: - virtual const SfxItemPropertyMap& GetItemPropertyMap() SAL_OVERRIDE; + virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, ::com::sun::star::uno::Any& ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; public: ScTableSheetObj(ScDocShell* pDocSh, SCTAB nTab); @@ -1048,221 +1048,221 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; // XSpreadsheet virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellCursor > - SAL_CALL createCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL createCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellCursor > SAL_CALL createCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRange >& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > SAL_CALL - getSpreadsheet() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSpreadsheet() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; using ScCellRangeObj::getCellRangeByName; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetPageBreak virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TablePageBreakData > SAL_CALL - getColumnPageBreaks() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getColumnPageBreaks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TablePageBreakData > SAL_CALL - getRowPageBreaks() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeAllManualPageBreaks() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getRowPageBreaks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAllManualPageBreaks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCellRangeMovement virtual void SAL_CALL insertCells( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::sheet::CellInsertMode nMode ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRange( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::sheet::CellDeleteMode nMode ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveRange( const ::com::sun::star::table::CellAddress& aDestination, const ::com::sun::star::table::CellRangeAddress& aSource ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL copyRange( const ::com::sun::star::table::CellAddress& aDestination, const ::com::sun::star::table::CellRangeAddress& aSource ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTableChartsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableCharts > SAL_CALL - getCharts() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getCharts() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDataPilotTablesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotTables > SAL_CALL - getDataPilotTables() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getDataPilotTables() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XScenariosSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XScenarios > SAL_CALL - getScenarios() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getScenarios() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetAnnotationsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetAnnotations > SAL_CALL - getAnnotations() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAnnotations() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDrawPageSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL - getDrawPage() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getDrawPage() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPrintAreas virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL - getPrintAreas() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getPrintAreas() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPrintAreas( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aPrintAreas ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getPrintTitleColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getPrintTitleColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPrintTitleColumns( sal_Bool bPrintTitleColumns ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getTitleColumns() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTitleColumns( const ::com::sun::star::table::CellRangeAddress& aTitleColumns ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getPrintTitleRows() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getPrintTitleRows() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPrintTitleRows( sal_Bool bPrintTitleRows ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getTitleRows() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTitleRows( const ::com::sun::star::table::CellRangeAddress& aTitleRows ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetLinkable virtual ::com::sun::star::sheet::SheetLinkMode SAL_CALL getLinkMode() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLinkMode( ::com::sun::star::sheet::SheetLinkMode nLinkMode ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getLinkUrl() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkUrl() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLinkUrl( const OUString& aLinkUrl ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getLinkSheetName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkSheetName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLinkSheetName( const OUString& aLinkSheetName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL link( const OUString& aUrl, const OUString& aSheetName, const OUString& aFilterName, const OUString& aFilterOptions, ::com::sun::star::sheet::SheetLinkMode nMode ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetAuditing virtual sal_Bool SAL_CALL hideDependents( const ::com::sun::star::table::CellAddress& aPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hidePrecedents( const ::com::sun::star::table::CellAddress& aPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL showDependents( const ::com::sun::star::table::CellAddress& aPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL showPrecedents( const ::com::sun::star::table::CellAddress& aPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL showErrors( const ::com::sun::star::table::CellAddress& aPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL showInvalid() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clearArrows() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL showInvalid() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearArrows() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetOutline virtual void SAL_CALL group( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::table::TableOrientation nOrientation ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL ungroup( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::table::TableOrientation nOrientation ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL autoOutline( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL clearOutline() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL hideDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL showDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL showLevel( sal_Int16 nLevel, ::com::sun::star::table::TableOrientation nOrientation ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XProtectable virtual void SAL_CALL protect( const OUString& aPassword ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL unprotect( const OUString& aPassword ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XScenario - virtual sal_Bool SAL_CALL getIsScenario() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getScenarioComment() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getIsScenario() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getScenarioComment() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setScenarioComment( const OUString& aScenarioComment ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRanges( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL apply() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL apply() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XScenarioEnhanced virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL getRanges( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XExternalSheetName virtual void SAL_CALL setExternalName( const OUString& aUrl, const OUString& aSheetName ) throw (::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet override due to sheet properties virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTableSheetObj* getImplementation(const css::uno::Reference< com::sun::star::uno::XInterface>& rObj); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScTableColumnObj : public ScCellRangeObj, @@ -1272,16 +1272,16 @@ private: const SfxItemPropertySet* pColPropSet; protected: - virtual const SfxItemPropertyMap& GetItemPropertyMap() SAL_OVERRIDE; + virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, ::com::sun::star::uno::Any& ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; public: ScTableColumnObj(ScDocShell* pDocSh, SCCOL nCol, SCTAB nTab); @@ -1289,33 +1289,33 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet override due to column properties virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScTableRowObj : public ScCellRangeObj @@ -1324,16 +1324,16 @@ private: const SfxItemPropertySet* pRowPropSet; protected: - virtual const SfxItemPropertyMap& GetItemPropertyMap() SAL_OVERRIDE; + virtual const SfxItemPropertyMap& GetItemPropertyMap() override; virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, ::com::sun::star::uno::Any& ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; public: ScTableRowObj(ScDocShell* pDocSh, SCROW nRow, SCTAB nTab); @@ -1342,15 +1342,15 @@ public: // XPropertySet override due to row properties virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScCellsObj : public cppu::WeakImplHelper< @@ -1366,24 +1366,24 @@ public: ScCellsObj(ScDocShell* pDocSh, const ScRangeList& rR); virtual ~ScCellsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScCellsEnumeration : public cppu::WeakImplHelper< @@ -1406,22 +1406,22 @@ public: ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR); virtual ~ScCellsEnumeration(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScCellFormatsObj : public cppu::WeakImplHelper< @@ -1441,31 +1441,31 @@ public: ScCellFormatsObj(ScDocShell* pDocSh, const ScRange& rR); virtual ~ScCellFormatsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScCellFormatsEnumeration : public cppu::WeakImplHelper< @@ -1489,22 +1489,22 @@ public: ScCellFormatsEnumeration(ScDocShell* pDocSh, const ScRange& rR); virtual ~ScCellFormatsEnumeration(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; typedef std::vector< ScRangeList > ScMyRangeLists; @@ -1527,31 +1527,31 @@ public: ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange& rR); virtual ~ScUniqueCellFormatsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScUniqueCellFormatsEnumeration : public cppu::WeakImplHelper< @@ -1568,22 +1568,22 @@ public: ScUniqueCellFormatsEnumeration(ScDocShell* pDocShell, const ScMyRangeLists& rRangeLists); virtual ~ScUniqueCellFormatsEnumeration(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 2f72a6ea4be5..f360005906b7 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -68,60 +68,60 @@ public: explicit ScChart2DataProvider( ScDocument* pDoc ); virtual ~ScChart2DataProvider(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XDataProvider virtual sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetDataProvider virtual sal_Bool SAL_CALL createDataSequenceByFormulaTokensPossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByFormulaTokens( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XRangeXMLConversion virtual OUString SAL_CALL convertRangeToXML( const OUString& sRangeRepresentation ) - throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; + throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) override; virtual OUString SAL_CALL convertRangeFromXML( const OUString& sXMLRange ) - throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; + throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL - getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, @@ -130,13 +130,13 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, @@ -144,7 +144,7 @@ public: ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, @@ -152,7 +152,7 @@ public: ::com::sun::star::beans::XPropertyChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, @@ -160,7 +160,7 @@ public: ::com::sun::star::beans::XVetoableChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, @@ -168,18 +168,18 @@ public: ::com::sun::star::beans::XVetoableChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& - rServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + rServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; private: @@ -199,23 +199,23 @@ public: explicit ScChart2DataSource( ScDocument* pDoc); virtual ~ScChart2DataSource(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XDataSource virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL - getDataSequences() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getDataSequences() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& - rServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + rServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // implementation @@ -249,18 +249,18 @@ public: ::std::vector<ScTokenRef>&& rTokens, bool bIncludeHiddenCells ); virtual ~ScChart2DataSequence(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XDataSequence virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel(::com::sun::star::chart2::data::LabelOrigin nOrigin) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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 @@ -268,30 +268,30 @@ public: virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XNumericalDataSequence virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XTextualDataSequence virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XTimeBased - virtual sal_Bool SAL_CALL switchToNext(sal_Bool bWrap) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setToPointInTime(sal_Int32 nPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL switchToNext(sal_Bool bWrap) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setToPointInTime(sal_Int32 nPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRange(sal_Int32 nStart, sal_Int32 nEnd) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRange(sal_Int32 nStart, sal_Int32 nEnd) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL - getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, @@ -300,14 +300,14 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, @@ -315,7 +315,7 @@ public: ::com::sun::star::beans::XPropertyChangeListener>& xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, @@ -323,7 +323,7 @@ public: ::com::sun::star::beans::XPropertyChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, @@ -331,7 +331,7 @@ public: ::com::sun::star::beans::XVetoableChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, @@ -339,31 +339,31 @@ public: ::com::sun::star::beans::XVetoableChangeListener>& rListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& - rServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + rServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; private: void setDataChangedHint(bool b); @@ -380,7 +380,7 @@ private: public: ExternalRefListener(ScChart2DataSequence& rParent, ScDocument* pDoc); virtual ~ExternalRefListener(); - virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) SAL_OVERRIDE; + virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) override; void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); const std::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;} @@ -429,7 +429,7 @@ private: HiddenRangeListener(ScChart2DataSequence& rParent); virtual ~HiddenRangeListener(); - virtual void notify() SAL_OVERRIDE; + virtual void notify() override; private: ScChart2DataSequence& mrParent; diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index c42385ed1acc..56a368fa5dbb 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -46,7 +46,7 @@ public: public: ExternalRefListener(ScChartListener& rParent, ScDocument* pDoc); virtual ~ExternalRefListener(); - virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) SAL_OVERRIDE; + virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) override; void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); std::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;} @@ -90,7 +90,7 @@ public: bool IsUno() const { return (pUnoData != NULL); } - virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( const SfxHint& rHint ) override; void StartListeningTo(); void EndListeningTo(); void ChangeListening( const ScRangeListRef& rRangeListRef, diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index 57475815326a..dccf365d6b34 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -57,7 +57,7 @@ public: ScChartsObj(ScDocShell* pDocSh, SCTAB nT); virtual ~ScChartsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XTableCharts virtual void SAL_CALL addNewByName( const OUString& aName, @@ -66,43 +66,43 @@ public: ::com::sun::star::table::CellRangeAddress >& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; typedef ::cppu::WeakComponentImplHelper< @@ -130,21 +130,21 @@ private: protected: // ::comphelper::OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, - std::exception) SAL_OVERRIDE; + std::exception) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const override; // ::comphelper::OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; public: ScChartObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN); virtual ~ScChartObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XInterface DECLARE_XINTERFACE() @@ -153,44 +153,44 @@ public: DECLARE_XTYPEPROVIDER() // XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XTableChart - virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setHasColumnHeaders( sal_Bool bHasColumnHeaders ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getHasRowHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual sal_Bool SAL_CALL getHasRowHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL - getRanges( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getRanges( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setRanges( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XEmbeddedObjectSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL - getEmbeddedObject() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getEmbeddedObject() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 34941bc06197..bb91165613f9 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -408,12 +408,12 @@ class ScChangeActionIns : public ScChangeAction ScChangeActionIns( const ScRange& rRange, bool bEndOfList = false ); virtual ~ScChangeActionIns(); - virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE {} - virtual void DeleteCellEntries() SAL_OVERRIDE {} + virtual void AddContent( ScChangeActionContent* ) override {} + virtual void DeleteCellEntries() override {} - virtual bool Reject(ScDocument* pDoc) SAL_OVERRIDE; + virtual bool Reject(ScDocument* pDoc) override; - virtual const ScChangeTrack* GetChangeTrack() const SAL_OVERRIDE { return 0; } + virtual const ScChangeTrack* GetChangeTrack() const override { return 0; } public: ScChangeActionIns( @@ -428,7 +428,7 @@ public: bool bEndOfList = false ); virtual void GetDescription( - OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true) const SAL_OVERRIDE; + OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true) const override; SC_DLLPUBLIC bool IsEndOfList() const; }; @@ -478,19 +478,19 @@ class ScChangeActionDel : public ScChangeAction ScChangeActionDel( const ScRange& rRange, SCsCOL nDx, SCsROW nDy, ScChangeTrack* ); virtual ~ScChangeActionDel(); - virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE; - virtual void DeleteCellEntries() SAL_OVERRIDE; + virtual void AddContent( ScChangeActionContent* ) override; + virtual void DeleteCellEntries() override; void UndoCutOffMoves(); void UndoCutOffInsert(); virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, - sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) SAL_OVERRIDE; + sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) override; - virtual bool Reject(ScDocument* pDoc) SAL_OVERRIDE; + virtual bool Reject(ScDocument* pDoc) override; - virtual const ScChangeTrack* GetChangeTrack() const SAL_OVERRIDE { return pTrack; } + virtual const ScChangeTrack* GetChangeTrack() const override { return pTrack; } public: ScChangeActionDel( @@ -523,7 +523,7 @@ public: short GetCutOffCount() const { return nCutOff; } virtual void GetDescription( - OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const SAL_OVERRIDE; + OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const override; void SetCutOffInsert( ScChangeActionIns* p, short n ) { pCutOff = p; nCutOff = n; } // only to use in the XML import @@ -558,8 +558,8 @@ class ScChangeActionMove : public ScChangeAction {} virtual ~ScChangeActionMove(); - virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE; - virtual void DeleteCellEntries() SAL_OVERRIDE; + virtual void AddContent( ScChangeActionContent* ) override; + virtual void DeleteCellEntries() override; ScBigRange& GetFromRange() { return aFromRange; } @@ -570,11 +570,11 @@ class ScChangeActionMove : public ScChangeAction virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, - sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) SAL_OVERRIDE; + sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) override; - virtual bool Reject(ScDocument* pDoc) SAL_OVERRIDE; + virtual bool Reject(ScDocument* pDoc) override; - virtual const ScChangeTrack* GetChangeTrack() const SAL_OVERRIDE { return pTrack; } + virtual const ScChangeTrack* GetChangeTrack() const override { return pTrack; } protected: using ScChangeAction::GetRefString; @@ -595,10 +595,10 @@ public: virtual void GetDescription( OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, - bool bWarning = true ) const SAL_OVERRIDE; + bool bWarning = true ) const override; virtual void GetRefString( - OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const SAL_OVERRIDE; + OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const override; }; ScChangeActionDelMoveEntry::ScChangeActionDelMoveEntry( @@ -697,16 +697,16 @@ class ScChangeActionContent : public ScChangeAction void GetFormulaString( OUString& rStr, const ScFormulaCell* pCell ) const; - virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE {} - virtual void DeleteCellEntries() SAL_OVERRIDE {} + virtual void AddContent( ScChangeActionContent* ) override {} + virtual void DeleteCellEntries() override {} virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, - sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) SAL_OVERRIDE; + sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) override; - virtual bool Reject(ScDocument* pDoc) SAL_OVERRIDE; + virtual bool Reject(ScDocument* pDoc) override; - virtual const ScChangeTrack* GetChangeTrack() const SAL_OVERRIDE { return 0; } + virtual const ScChangeTrack* GetChangeTrack() const override { return 0; } // pRejectActions!=NULL: reject actions get // stacked, no SetNewValue, no Append @@ -744,8 +744,8 @@ public: ScChangeActionContent* GetTopContent() const; bool IsTopContent() const { return pNextContent == NULL; } - virtual ScChangeActionLinkEntry* GetDeletedIn() const SAL_OVERRIDE; - virtual ScChangeActionLinkEntry** GetDeletedInAddress() SAL_OVERRIDE; + virtual ScChangeActionLinkEntry* GetDeletedIn() const override; + virtual ScChangeActionLinkEntry** GetDeletedInAddress() override; void PutOldValueToDoc( ScDocument*, SCsCOL nDx, SCsROW nDy ) const; @@ -784,10 +784,10 @@ public: const ScCellValue& GetOldCell() const { return maOldCell;} const ScCellValue& GetNewCell() const { return maNewCell;} virtual void GetDescription( - OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const SAL_OVERRIDE; + OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const override; virtual void GetRefString( - OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const SAL_OVERRIDE; + OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const override; static ScChangeActionContentCellType GetContentCellType( const ScCellValue& rCell ); static ScChangeActionContentCellType GetContentCellType( const ScRefCellValue& rIter ); @@ -811,12 +811,12 @@ class ScChangeActionReject : public ScChangeAction SetState( SC_CAS_ACCEPTED ); } - virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE {} - virtual void DeleteCellEntries() SAL_OVERRIDE {} + virtual void AddContent( ScChangeActionContent* ) override {} + virtual void DeleteCellEntries() override {} - virtual bool Reject(ScDocument* pDoc) SAL_OVERRIDE; + virtual bool Reject(ScDocument* pDoc) override; - virtual const ScChangeTrack* GetChangeTrack() const SAL_OVERRIDE { return 0; } + virtual const ScChangeTrack* GetChangeTrack() const override { return 0; } public: ScChangeActionReject(const sal_uLong nActionNumber, @@ -992,7 +992,7 @@ class ScChangeTrack : public utl::ConfigurationListener bool IsLastAction( sal_uLong nNum ) const; void ClearMsgQueue(); - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override; public: diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index e0884c757b6d..43a19982981d 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -221,10 +221,10 @@ public: const ScRangeList& GetRange() const; - virtual void SetParent(ScConditionalFormat* pParent) SAL_OVERRIDE; + virtual void SetParent(ScConditionalFormat* pParent) override; - virtual void startRendering() SAL_OVERRIDE; - virtual void endRendering() SAL_OVERRIDE; + virtual void startRendering() override; + virtual void endRendering() override; virtual bool NeedsRepaint() const = 0; @@ -261,19 +261,19 @@ public: ScColorScaleFormat(ScDocument* pDoc); ScColorScaleFormat(ScDocument* pDoc, const ScColorScaleFormat& rFormat); virtual ~ScColorScaleFormat(); - virtual ScColorFormat* Clone(ScDocument* pDoc = NULL) const SAL_OVERRIDE; + virtual ScColorFormat* Clone(ScDocument* pDoc = NULL) const override; Color* GetColor(const ScAddress& rAddr) const; void AddEntry(ScColorScaleEntry* pEntry); - virtual void UpdateReference( sc::RefUpdateContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) SAL_OVERRIDE; + virtual void UpdateReference( sc::RefUpdateContext& rCxt ) override; + virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) override; + virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) override; + virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) override; - virtual bool NeedsRepaint() const SAL_OVERRIDE; + virtual bool NeedsRepaint() const override; - virtual condformat::ScFormatEntryType GetType() const SAL_OVERRIDE; + virtual condformat::ScFormatEntryType GetType() const override; ScColorScaleEntries::iterator begin(); ScColorScaleEntries::const_iterator begin() const; ScColorScaleEntries::iterator end(); @@ -296,7 +296,7 @@ class SC_DLLPUBLIC ScDataBarFormat : public ScColorFormat public: ScDataBarFormat(ScDocument* pDoc); ScDataBarFormat(ScDocument* pDoc, const ScDataBarFormat& rFormat); - virtual ScColorFormat* Clone(ScDocument* pDoc = NULL) const SAL_OVERRIDE; + virtual ScColorFormat* Clone(ScDocument* pDoc = NULL) const override; ScDataBarInfo* GetDataBarInfo(const ScAddress& rAddr) const; @@ -304,14 +304,14 @@ public: const ScDataBarFormatData* GetDataBarData() const; ScDataBarFormatData* GetDataBarData(); - virtual void UpdateReference( sc::RefUpdateContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) SAL_OVERRIDE; + virtual void UpdateReference( sc::RefUpdateContext& rCxt ) override; + virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) override; + virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) override; + virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) override; - virtual bool NeedsRepaint() const SAL_OVERRIDE; + virtual bool NeedsRepaint() const override; - virtual condformat::ScFormatEntryType GetType() const SAL_OVERRIDE; + virtual condformat::ScFormatEntryType GetType() const override; /** * Makes sure that the mpFormatData does not contain valid entries. @@ -354,7 +354,7 @@ public: ScIconSetFormat(ScDocument* pDoc); ScIconSetFormat(ScDocument* pDoc, const ScIconSetFormat& rFormat); - virtual ScColorFormat* Clone(ScDocument* pDoc = NULL) const SAL_OVERRIDE; + virtual ScColorFormat* Clone(ScDocument* pDoc = NULL) const override; ScIconSetInfo* GetIconSetInfo(const ScAddress& rAddr) const; @@ -362,14 +362,14 @@ public: const ScIconSetFormatData* GetIconSetData() const; ScIconSetFormatData* GetIconSetData(); - virtual void UpdateReference( sc::RefUpdateContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) SAL_OVERRIDE; + virtual void UpdateReference( sc::RefUpdateContext& rCxt ) override; + virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) override; + virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) override; + virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) override; - virtual bool NeedsRepaint() const SAL_OVERRIDE; + virtual bool NeedsRepaint() const override; - virtual condformat::ScFormatEntryType GetType() const SAL_OVERRIDE; + virtual condformat::ScFormatEntryType GetType() const override; static ScIconSetMap* getIconSetMap(); static BitmapEx& getBitmap( ScIconSetType eType, sal_Int32 nIndex ); diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index f6267a493aeb..56cfe5971549 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -318,7 +318,7 @@ private: bool NextNewToken(bool bInArray = false); - virtual void SetError(sal_uInt16 nError) SAL_OVERRIDE; + virtual void SetError(sal_uInt16 nError) override; sal_Int32 NextSymbol(bool bInArray); bool IsValue( const OUString& ); bool IsOpCode( const OUString&, bool bInArray ); @@ -456,25 +456,25 @@ public: private: // FormulaCompiler - virtual OUString FindAddInFunction( const OUString& rUpperName, bool bLocalFirst ) const SAL_OVERRIDE; - virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const SAL_OVERRIDE; - virtual void fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap ) const SAL_OVERRIDE; - virtual void fillFromAddInMap( NonConstOpCodeMapPtr xMap, formula::FormulaGrammar::Grammar _eGrammar ) const SAL_OVERRIDE; - virtual void fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const SAL_OVERRIDE; - - virtual bool HandleExternalReference(const formula::FormulaToken& _aToken) SAL_OVERRIDE; - virtual bool HandleRange() SAL_OVERRIDE; - virtual bool HandleColRowName() SAL_OVERRIDE; - virtual bool HandleDbData() SAL_OVERRIDE; - virtual bool HandleTableRef() SAL_OVERRIDE; - - virtual formula::FormulaTokenRef ExtendRangeReference( formula::FormulaToken & rTok1, formula::FormulaToken & rTok2, bool bReuseDoubleRef ) SAL_OVERRIDE; - virtual void CreateStringFromExternal( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const SAL_OVERRIDE; - virtual void CreateStringFromSingleRef( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const SAL_OVERRIDE; - virtual void CreateStringFromDoubleRef( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const SAL_OVERRIDE; - virtual void CreateStringFromMatrix( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const SAL_OVERRIDE; - virtual void CreateStringFromIndex( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const SAL_OVERRIDE; - virtual void LocalizeString( OUString& rName ) const SAL_OVERRIDE; // modify rName - input: exact name + virtual OUString FindAddInFunction( const OUString& rUpperName, bool bLocalFirst ) const override; + virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const override; + virtual void fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap ) const override; + virtual void fillFromAddInMap( NonConstOpCodeMapPtr xMap, formula::FormulaGrammar::Grammar _eGrammar ) const override; + virtual void fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const override; + + virtual bool HandleExternalReference(const formula::FormulaToken& _aToken) override; + virtual bool HandleRange() override; + virtual bool HandleColRowName() override; + virtual bool HandleDbData() override; + virtual bool HandleTableRef() override; + + virtual formula::FormulaTokenRef ExtendRangeReference( formula::FormulaToken & rTok1, formula::FormulaToken & rTok2, bool bReuseDoubleRef ) override; + virtual void CreateStringFromExternal( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const override; + virtual void CreateStringFromSingleRef( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const override; + virtual void CreateStringFromDoubleRef( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const override; + virtual void CreateStringFromMatrix( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const override; + virtual void CreateStringFromIndex( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const override; + virtual void LocalizeString( OUString& rName ) const override; // modify rName - input: exact name /// Access the CharTable flags inline sal_uLong GetCharTableFlags( sal_Unicode c, sal_Unicode cLast ) diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index a5ed2927728b..026efb171981 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -205,7 +205,7 @@ public: bool operator== ( const ScConditionEntry& r ) const; - virtual void SetParent( ScConditionalFormat* pNew ) SAL_OVERRIDE { pCondFormat = pNew; } + virtual void SetParent( ScConditionalFormat* pNew ) override { pCondFormat = pNew; } bool IsCellValid( ScRefCellValue& rCell, const ScAddress& rPos ) const; @@ -229,23 +229,23 @@ public: void CompileAll(); void CompileXML(); - virtual void UpdateReference( sc::RefUpdateContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) SAL_OVERRIDE; - virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) SAL_OVERRIDE; + virtual void UpdateReference( sc::RefUpdateContext& rCxt ) override; + virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) override; + virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) override; + virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) override; void SourceChanged( const ScAddress& rChanged ); bool MarkUsedExternalReferences() const; - virtual condformat::ScFormatEntryType GetType() const SAL_OVERRIDE { return condformat::CONDITION; } + virtual condformat::ScFormatEntryType GetType() const override { return condformat::CONDITION; } - virtual ScFormatEntry* Clone(ScDocument* pDoc = NULL) const SAL_OVERRIDE; + virtual ScFormatEntry* Clone(ScDocument* pDoc = NULL) const override; static ScConditionMode GetModeFromApi(sal_Int32 nOperator); - virtual void endRendering() SAL_OVERRIDE; - virtual void startRendering() SAL_OVERRIDE; + virtual void endRendering() override; + virtual void startRendering() override; protected: virtual void DataChanged( const ScRange* pModified ) const; @@ -311,10 +311,10 @@ public: const OUString& GetStyle() const { return aStyleName; } void UpdateStyleName(const OUString& rNew) { aStyleName=rNew; } - virtual ScFormatEntry* Clone(ScDocument* pDoc) const SAL_OVERRIDE; + virtual ScFormatEntry* Clone(ScDocument* pDoc) const override; protected: - virtual void DataChanged( const ScRange* pModified ) const SAL_OVERRIDE; + virtual void DataChanged( const ScRange* pModified ) const override; }; namespace condformat { @@ -352,20 +352,20 @@ public: const OUString& GetStyleName() const { return maStyleName;} void SetStyleName( const OUString& rStyleName ); - virtual condformat::ScFormatEntryType GetType() const SAL_OVERRIDE { return condformat::DATE; } - virtual void UpdateReference( sc::RefUpdateContext& ) SAL_OVERRIDE {} - virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& ) SAL_OVERRIDE {} - virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& ) SAL_OVERRIDE {} - virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& ) SAL_OVERRIDE {} + virtual condformat::ScFormatEntryType GetType() const override { return condformat::DATE; } + virtual void UpdateReference( sc::RefUpdateContext& ) override {} + virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& ) override {} + virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& ) override {} + virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& ) override {} - virtual ScFormatEntry* Clone( ScDocument* pDoc = NULL ) const SAL_OVERRIDE; + virtual ScFormatEntry* Clone( ScDocument* pDoc = NULL ) const override; - virtual void SetParent( ScConditionalFormat* ) SAL_OVERRIDE {} + virtual void SetParent( ScConditionalFormat* ) override {} bool operator==( const ScFormatEntry& ) const; - virtual void startRendering() SAL_OVERRIDE; - virtual void endRendering() SAL_OVERRIDE; + virtual void startRendering() override; + virtual void endRendering() override; private: condformat::ScCondFormatDateType meType; diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx index 1252f59acf7c..7a80b0291d0c 100644 --- a/sc/inc/confuno.hxx +++ b/sc/inc/confuno.hxx @@ -42,56 +42,56 @@ public: virtual ~ScDocumentConfiguration(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx index 343b9d305ba3..2a2fbe0ea838 100644 --- a/sc/inc/cursuno.hxx +++ b/sc/inc/cursuno.hxx @@ -36,67 +36,67 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; // XSheetCellCursor - virtual void SAL_CALL collapseToCurrentRegion() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL collapseToCurrentRegion() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL collapseToCurrentArray() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual void SAL_CALL collapseToMergedArea() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL expandToEntireColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL expandToEntireRows() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual void SAL_CALL collapseToMergedArea() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL expandToEntireColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL expandToEntireRows() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUsedAreaCursor virtual void SAL_CALL gotoStartOfUsedArea( sal_Bool bExpand ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL gotoEndOfUsedArea( sal_Bool bExpand ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCellCursor - virtual void SAL_CALL gotoStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL gotoEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL gotoNext() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL gotoPrevious() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL gotoStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoNext() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoPrevious() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > SAL_CALL - getSpreadsheet() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSpreadsheet() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCellRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw(::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; using ScCellRangeObj::getCellRangeByName; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index a6e5bd362776..2e63d3c365a5 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -97,53 +97,53 @@ public: ScDataPilotTablesObj(ScDocShell* pDocSh, SCTAB nT); virtual ~ScDataPilotTablesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XDataPilotTables virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor > SAL_CALL - createDataPilotDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createDataPilotDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertNewByName( const OUString& aName, const ::com::sun::star::table::CellAddress& aOutputAddress, const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor >& xDescriptor ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; // ScDataPilotDescriptorBase is never instantiated directly @@ -166,11 +166,11 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ScDocShell* GetDocShell() const { return pDocShell; } @@ -182,85 +182,85 @@ public: // getName, setName, getTag, setTag in derived classes virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getSourceRange() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSourceRange( const ::com::sun::star::table::CellRangeAddress& aSourceRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor > SAL_CALL - getFilterDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getFilterDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getDataPilotFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getDataPilotFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getColumnFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getColumnFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getRowFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getRowFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getPageFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getPageFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getDataFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getDataFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getHiddenFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getHiddenFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XDataPilotDataLayoutFieldSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotField > SAL_CALL getDataLayoutField() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); SC_DLLPUBLIC static ScDataPilotDescriptorBase* getImplementation(const css::uno::Reference<css::sheet::XDataPilotDescriptor>& rObj); // XTypeProvider (override in ScDataPilotTableObj) virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo is in derived classes }; @@ -274,24 +274,24 @@ public: ScDataPilotDescriptor(ScDocShell* pDocSh); virtual ~ScDataPilotDescriptor(); - virtual ScDPObject* GetDPObject() const SAL_OVERRIDE; - virtual void SetDPObject(ScDPObject* pDPObj) SAL_OVERRIDE; + virtual ScDPObject* GetDPObject() const override; + virtual void SetDPObject(ScDPObject* pDPObj) override; // rest of XDataPilotDescriptor (incl. XNamed) - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTag( const OUString& aTag ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScDataPilotTableObj : public ScDataPilotDescriptorBase, @@ -311,66 +311,66 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual ScDPObject* GetDPObject() const SAL_OVERRIDE; - virtual void SetDPObject(ScDPObject* pDPObj) SAL_OVERRIDE; + virtual ScDPObject* GetDPObject() const override; + virtual void SetDPObject(ScDPObject* pDPObj) override; // rest of XDataPilotDescriptor (incl. XNamed) - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTag( const OUString& aTag ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDataPilotTable virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getOutputRange() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDataPilotTable2 virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDrillDownData(const ::com::sun::star::table::CellAddress& aAddr) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::sheet::DataPilotTablePositionData SAL_CALL getPositionData(const ::com::sun::star::table::CellAddress& aAddr) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertDrillDownSheet(const ::com::sun::star::table::CellAddress& aAddr) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getOutputRangeByType( sal_Int32 nType ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XTypeProvider (override) virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; struct ScFieldIdentifier @@ -444,35 +444,35 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: ScDataPilotFieldObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; @@ -510,15 +510,15 @@ public: // XNamed virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setName(const OUString& aName) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, @@ -526,41 +526,41 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XDatePilotField virtual com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> SAL_CALL - getItems() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getItems() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // only called from property-functions: com::sun::star::sheet::DataPilotFieldOrientation getOrientation() const; @@ -595,20 +595,20 @@ public: createNameGroup(const com::sun::star::uno::Sequence< OUString >& aItems) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual com::sun::star::uno::Reference < com::sun::star::sheet::XDataPilotField > SAL_CALL createDateGroup(const com::sun::star::sheet::DataPilotFieldGroupInfo& rInfo) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > @@ -652,11 +652,11 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, @@ -664,7 +664,7 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, @@ -672,35 +672,35 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // implementation ScFieldGroup& getFieldGroup( const OUString& rName ) throw(::com::sun::star::uno::RuntimeException); @@ -733,11 +733,11 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, @@ -745,7 +745,7 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, @@ -753,40 +753,40 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: ScDataPilotFieldGroupsObj& mrParent; @@ -807,17 +807,17 @@ public: virtual ~ScDataPilotFieldGroupItemObj(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: ScDataPilotFieldGroupObj& mrParent; @@ -843,35 +843,35 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: ScDataPilotItemObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; @@ -896,14 +896,14 @@ public: virtual ~ScDataPilotItemObj(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, @@ -911,45 +911,45 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: SfxItemPropertySet maPropSet; diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 72c69e25d0c8..5210624a02d9 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -130,81 +130,81 @@ public: virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SubTotalColumn >& aSubTotalColumns, sal_Int32 nGroupColumn ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScSubTotalDescriptorBase* getImplementation(const css::uno::Reference<css::sheet::XSubTotalDescriptor>& rObj); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; // ScSubTotalDescriptor - dummy container to use with XImportTarget @@ -219,8 +219,8 @@ public: virtual ~ScSubTotalDescriptor(); // from ScSubTotalDescriptorBase: - virtual void GetData( ScSubTotalParam& rParam ) const SAL_OVERRIDE; - virtual void PutData( const ScSubTotalParam& rParam ) SAL_OVERRIDE; + virtual void GetData( ScSubTotalParam& rParam ) const override; + virtual void PutData( const ScSubTotalParam& rParam ) override; // external access: void SetParam( const ScSubTotalParam& rNew ); @@ -238,8 +238,8 @@ public: virtual ~ScRangeSubTotalDescriptor(); // from ScSubTotalDescriptorBase: - virtual void GetData( ScSubTotalParam& rParam ) const SAL_OVERRIDE; - virtual void PutData( const ScSubTotalParam& rParam ) SAL_OVERRIDE; + virtual void GetData( ScSubTotalParam& rParam ) const override; + virtual void PutData( const ScSubTotalParam& rParam ) override; }; class ScSubTotalFieldObj : public cppu::WeakImplHelper< @@ -256,22 +256,22 @@ public: virtual ~ScSubTotalFieldObj(); // XSubTotalField - virtual sal_Int32 SAL_CALL getGroupColumn() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getGroupColumn() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setGroupColumn( sal_Int32 nGroupColumn ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SubTotalColumn > SAL_CALL - getSubTotalColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSubTotalColumns() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSubTotalColumns( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SubTotalColumn >& aSubTotalColumns ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScConsolidationDescriptor : public cppu::WeakImplHelper< @@ -290,36 +290,36 @@ public: // XConsolidationDescriptor virtual ::com::sun::star::sheet::GeneralFunction SAL_CALL getFunction() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL - getSources( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSources( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSources( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aSources ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::table::CellAddress SAL_CALL getStartOutputPosition() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setStartOutputPosition( const ::com::sun::star::table::CellAddress& aStartOutputPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getUseColumnHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getUseColumnHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setUseColumnHeaders( sal_Bool bUseColumnHeaders ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getUseRowHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getUseRowHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setUseRowHeaders( sal_Bool bUseRowHeaders ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getInsertLinks() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getInsertLinks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setInsertLinks( sal_Bool bInsertLinks ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; // ScFilterDescriptorBase - base class for FilterDescriptor @@ -343,7 +343,7 @@ public: ScFilterDescriptorBase(ScDocShell* pDocShell); virtual ~ScFilterDescriptorBase(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // in the derived classes(?): // (nField[] here within the area) @@ -352,73 +352,73 @@ public: // XSheetFilterDescriptor virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField > SAL_CALL - getFilterFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getFilterFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFilterFields( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField >& aFilterFields ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetFilterDescriptor2 virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField2 > SAL_CALL - getFilterFields2() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getFilterFields2() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFilterFields2( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField2 >& aFilterFields ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetFilterDescriptor3 virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField3 > SAL_CALL - getFilterFields3() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getFilterFields3() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFilterFields3( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField3 >& aFilterFields ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; // ScFilterDescriptor - dummy container to use with XFilterable @@ -433,8 +433,8 @@ public: virtual ~ScFilterDescriptor(); // from ScFilterDescriptorBase: - virtual void GetData( ScQueryParam& rParam ) const SAL_OVERRIDE; - virtual void PutData( const ScQueryParam& rParam ) SAL_OVERRIDE; + virtual void GetData( ScQueryParam& rParam ) const override; + virtual void PutData( const ScQueryParam& rParam ) override; // external access: void SetParam( const ScQueryParam& rNew ); @@ -453,8 +453,8 @@ public: virtual ~ScRangeFilterDescriptor(); // from ScFilterDescriptorBase: - virtual void GetData( ScQueryParam& rParam ) const SAL_OVERRIDE; - virtual void PutData( const ScQueryParam& rParam ) SAL_OVERRIDE; + virtual void GetData( ScQueryParam& rParam ) const override; + virtual void PutData( const ScQueryParam& rParam ) override; }; // ScDataPilotFilterDescriptor - FilterDescriptor of a DataPilotDescriptors @@ -469,8 +469,8 @@ public: virtual ~ScDataPilotFilterDescriptor(); // from ScFilterDescriptorBase: - virtual void GetData( ScQueryParam& rParam ) const SAL_OVERRIDE; - virtual void PutData( const ScQueryParam& rParam ) SAL_OVERRIDE; + virtual void GetData( ScQueryParam& rParam ) const override; + virtual void PutData( const ScQueryParam& rParam ) override; }; class ScDatabaseRangeObj : public cppu::WeakImplHelper< @@ -499,7 +499,7 @@ public: SC_DLLPUBLIC ScDatabaseRangeObj(ScDocShell* pDocSh, const SCTAB nTab); virtual ~ScDatabaseRangeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // nField[] here within the area: void GetQueryParam(ScQueryParam& rQueryParam) const; @@ -508,85 +508,85 @@ public: void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDatabaseRange virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDataArea() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getSortDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSortDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor > SAL_CALL - getFilterDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getFilterDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSubTotalDescriptor > SAL_CALL - getSubTotalDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSubTotalDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getImportDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getImportDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCellRangeReferrer virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL - getReferredCells() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getReferredCells() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScDatabaseRangesObj : public cppu::WeakImplHelper< @@ -606,48 +606,48 @@ public: ScDatabaseRangesObj(ScDocShell* pDocSh); virtual ~ScDatabaseRangesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XDatabaseRanges virtual void SAL_CALL addNewByName( const OUString& aName, const ::com::sun::star::table::CellRangeAddress& aRange ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScUnnamedDatabaseRangesObj : public cppu::WeakImplHelper< @@ -661,19 +661,19 @@ public: ScUnnamedDatabaseRangesObj(ScDocShell* pDocSh); virtual ~ScUnnamedDatabaseRangesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XUnnamedDatabaseRanges virtual void SAL_CALL setByTable( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL getByTable( sal_Int32 nTab ) throw(::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::container::NoSuchElementException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::container::NoSuchElementException, std::exception ) override; virtual sal_Bool SAL_CALL hasByTable( sal_Int32 nTab ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; }; #endif diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 8d136411dfe5..bab06085d50c 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -114,7 +114,7 @@ public: ScDBData(const OUString& rName, const ScDBData& rData); virtual ~ScDBData(); - virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( const SfxHint& rHint ) override; ScDBData& operator= (const ScDBData& rData) ; diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 3624c04740da..949d40070d96 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -51,8 +51,8 @@ public: ScTpDefaultsItem( const ScTpDefaultsItem& rItem ); virtual ~ScTpDefaultsItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const ScDefaultsOptions& GetDefaultsOptions() const { return theOptions; } @@ -66,14 +66,14 @@ class ScDefaultsCfg : public ScDefaultsOptions, public utl::ConfigItem { private: static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: ScDefaultsCfg(); void SetOptions( const ScDefaultsOptions& rNew ); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; }; #endif diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx index a0e04f0ebe85..10d9e7a44f17 100644 --- a/sc/inc/defltuno.hxx +++ b/sc/inc/defltuno.hxx @@ -45,75 +45,75 @@ public: ScDocDefaultsObj(ScDocShell* pDocSh); virtual ~ScDocDefaultsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index 3b57717461ad..b2b73d68b621 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -62,35 +62,35 @@ public: ScDispatchProviderInterceptor(ScTabViewShell* pViewSh); virtual ~ScDispatchProviderInterceptor(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - getSlaveDispatchProvider() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSlaveDispatchProvider() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - getMasterDispatchProvider() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getMasterDispatchProvider() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScDispatch : public cppu::WeakImplHelper< @@ -108,31 +108,31 @@ public: ScDispatch(ScTabViewShell* pViewSh); virtual ~ScDispatch(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XDispatch virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XSelectionChangeListener virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 013a6e290956..858c204be7bb 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -130,9 +130,9 @@ private: public: DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc); virtual ~DataAccessInternal(); - virtual bool getCurrent(Value& rValue) SAL_OVERRIDE; - virtual bool getFirst(Value& rValue) SAL_OVERRIDE; - virtual bool getNext(Value& rValue) SAL_OVERRIDE; + virtual bool getCurrent(Value& rValue) override; + virtual bool getFirst(Value& rValue) override; + virtual bool getNext(Value& rValue) override; private: void incBlock(); @@ -158,9 +158,9 @@ private: public: DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam); virtual ~DataAccessMatrix(); - virtual bool getCurrent(Value& rValue) SAL_OVERRIDE; - virtual bool getFirst(Value& rValue) SAL_OVERRIDE; - virtual bool getNext(Value& rValue) SAL_OVERRIDE; + virtual bool getCurrent(Value& rValue) override; + virtual bool getFirst(Value& rValue) override; + virtual bool getNext(Value& rValue) override; private: bool isValidQuery(SCROW mnRow, const ScMatrix& rMat) const; diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 904f64112331..1a54a3e585c5 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -151,8 +151,8 @@ public: ScTpCalcItem( const ScTpCalcItem& rItem ); virtual ~ScTpCalcItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const ScDocOptions& GetDocOptions() const { return theOptions; } diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index b7334863fe88..bd1cba625838 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -50,11 +50,11 @@ protected: virtual ~ScDocumentPool(); public: - virtual SfxItemPool* Clone() const SAL_OVERRIDE; - virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual SfxItemPool* Clone() const override; + virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const override; - virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ) SAL_OVERRIDE; - virtual void Remove( const SfxPoolItem& ) SAL_OVERRIDE; + virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ) override; + virtual void Remove( const SfxPoolItem& ) override; static void CheckRef( const SfxPoolItem& ); void StyleDeleted( ScStyleSheet* pStyle ); // delete templates(?) in organizer @@ -63,7 +63,7 @@ public: const SfxPoolItem& rItem, SfxMapUnit ePresentationMetric, OUString& rText, - const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; + const IntlWrapper* pIntl = 0 ) const override; static void InitVersionMaps(); static void DeleteVersionMaps(); diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 821ef95a7d3c..f155888c80e0 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -144,19 +144,19 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XSpreadsheetDocument virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheets > SAL_CALL - getSheets() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSheets() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XStyleFamiliesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getStyleFamilies() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getStyleFamilies() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XRenderable virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, @@ -164,55 +164,55 @@ public: ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// XLinkTargetSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getLinks() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getLinks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XActionLockable - virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL lockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unlockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL lockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// XCalculatable - virtual void SAL_CALL calculate() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL calculateAll() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL calculate() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL calculateAll() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAutomaticCalculationEnabled() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableAutomaticCalculation( sal_Bool bEnabled ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XProtectable virtual void SAL_CALL protect( const OUString& aPassword ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL unprotect( const OUString& aPassword ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XDrawPagesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL - getDrawPages() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getDrawPages() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XGoalSeek virtual ::com::sun::star::sheet::GoalResult SAL_CALL seekGoal( @@ -220,28 +220,28 @@ public: const ::com::sun::star::table::CellAddress& aVariablePosition, const OUString& aGoalValue ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// XConsolidatable virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XConsolidationDescriptor > SAL_CALL createConsolidationDescriptor( sal_Bool bEmpty ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL consolidate( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XConsolidationDescriptor >& xDescriptor ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// XDocumentAuditing - virtual void SAL_CALL refreshArrows() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL refreshArrows() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XViewDataSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -249,121 +249,121 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XMultiServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScModelObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); /// XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XChangesNotifier virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XOpenCLSelection virtual sal_Bool SAL_CALL isOpenCLEnabled() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableOpenCL(sal_Bool bEnable) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableAutomaticDeviceSelection(sal_Bool bForce) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disableAutomaticDeviceSelection() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL selectOpenCLDevice( sal_Int32 platform, sal_Int32 device ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getPlatformID() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getDeviceID() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< com::sun::star::sheet::opencl::OpenCLPlatform > SAL_CALL getOpenCLPlatforms() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableOpcodeSubsetTest() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disableOpcodeSubsetTest() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isOpcodeSubsetTested() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormulaCellNumberLimit( sal_Int32 number ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getFormulaCellNumberLimit() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// @see vcl::ITiledRenderable::paintTile(). virtual void paintTile( VirtualDevice& rDevice, @@ -372,46 +372,46 @@ public: int nTilePosX, int nTilePosY, long nTileWidth, - long nTileHeight ) SAL_OVERRIDE; + long nTileHeight ) override; /// @see vcl::ITiledRenderable::getDocumentSize(). - virtual Size getDocumentSize() SAL_OVERRIDE; + virtual Size getDocumentSize() override; /// @see vcl::ITiledRenderable::setPart(). - virtual void setPart(int nPart) SAL_OVERRIDE; + virtual void setPart(int nPart) override; /// @see vcl::ITiledRenderable::getPart(). - virtual int getPart() SAL_OVERRIDE; + virtual int getPart() override; /// @see vcl::ITiledRenderable::getParts(). - virtual int getParts() SAL_OVERRIDE; + virtual int getParts() override; /// @see vcl::ITiledRenderable::getPartName(). - virtual OUString getPartName(int nPart) SAL_OVERRIDE; + virtual OUString getPartName(int nPart) override; /// @see vcl::ITiledRenderable::initializeForTiledRendering(). - virtual void initializeForTiledRendering() SAL_OVERRIDE; + virtual void initializeForTiledRendering() override; /// @see vcl::ITiledRenderable::registerCallback(). - virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) SAL_OVERRIDE; + virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) override; /// @see vcl::ITiledRenderable::postKeyEvent(). - virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) SAL_OVERRIDE; + virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override; /// @see vcl::ITiledRenderable::postMouseEvent(). - virtual void postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons = MOUSE_LEFT, int nModifier = 0) SAL_OVERRIDE; + virtual void postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons = MOUSE_LEFT, int nModifier = 0) override; /// @see vcl::ITiledRenderable::setTextSelection(). - virtual void setTextSelection(int nType, int nX, int nY) SAL_OVERRIDE; + virtual void setTextSelection(int nType, int nX, int nY) override; /// @see vcl::ITiledRenderable::getTextSelection(). - virtual OString getTextSelection(const char* pMimeType, OString& rUsedMimeType) SAL_OVERRIDE; + virtual OString getTextSelection(const char* pMimeType, OString& rUsedMimeType) override; /// @see vcl::ITiledRenderable::setGraphicSelection(). - virtual void setGraphicSelection(int nType, int nX, int nY) SAL_OVERRIDE; + virtual void setGraphicSelection(int nType, int nX, int nY) override; /// @see lok::Document::resetSelection(). - virtual void resetSelection() SAL_OVERRIDE; + virtual void resetSelection() override; }; class ScDrawPagesObj : public cppu::WeakImplHelper< @@ -429,35 +429,35 @@ public: ScDrawPagesObj(ScDocShell* pDocSh); virtual ~ScDrawPagesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XDrawPages virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScTableSheetsObj : public cppu::WeakImplHelper< @@ -478,18 +478,18 @@ public: ScTableSheetsObj(ScDocShell* pDocSh); virtual ~ScTableSheetsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XSpreadsheets virtual void SAL_CALL insertNewByName( const OUString& aName, sal_Int16 nPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL moveByName( const OUString& aName, sal_Int16 nDestination ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL copyByName( const OUString& aName, const OUString& aCopy, sal_Int16 nDestination ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// XSpreadsheets2 virtual sal_Int32 SAL_CALL importSheet( @@ -499,21 +499,21 @@ public: sal_Int32 nDestPosition) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XCellRangesAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow, sal_Int32 nSheet ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom, sal_Int32 nSheet ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence < ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > > SAL_CALL getCellRangesByName( const OUString& aRange ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; /// XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, @@ -521,11 +521,11 @@ public: throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, @@ -533,41 +533,41 @@ public: throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScTableColumnsObj : public cppu::WeakImplHelper< @@ -592,89 +592,89 @@ public: SCCOL nSC, SCCOL nEC); virtual ~ScTableColumnsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XTableColumns virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScTableRowsObj : public cppu::WeakImplHelper< @@ -697,79 +697,79 @@ public: SCROW nSR, SCROW nER); virtual ~ScTableRowsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XTableRows virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper< @@ -783,56 +783,56 @@ private: public: virtual ~ScSpreadsheetSettingsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScAnnotationsObj : public cppu::WeakImplHelper< @@ -852,40 +852,40 @@ public: ScAnnotationsObj(ScDocShell* pDocSh, SCTAB nT); virtual ~ScAnnotationsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XSheetAnnotations virtual void SAL_CALL insertNew( const ::com::sun::star::table::CellAddress& aPosition, const OUString& aText ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScScenariosObj : public cppu::WeakImplHelper< @@ -907,50 +907,50 @@ public: ScScenariosObj(ScDocShell* pDocSh, SCTAB nT); virtual ~ScScenariosObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XScenarios virtual void SAL_CALL addNewByName( const OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges, const OUString& aComment ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index 848b1d5751ca..c3b9ff263309 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -67,8 +67,8 @@ public: explicit SingleFilter(const ScDPItemData &rItem); virtual ~SingleFilter() {} - virtual bool match(const ScDPItemData& rCellData) const SAL_OVERRIDE; - virtual std::vector<ScDPItemData> getMatchValues() const SAL_OVERRIDE; + virtual bool match(const ScDPItemData& rCellData) const override; + virtual std::vector<ScDPItemData> getMatchValues() const override; private: explicit SingleFilter(); @@ -82,8 +82,8 @@ public: public: GroupFilter(); virtual ~GroupFilter() {} - virtual bool match(const ScDPItemData& rCellData) const SAL_OVERRIDE; - virtual std::vector<ScDPItemData> getMatchValues() const SAL_OVERRIDE; + virtual bool match(const ScDPItemData& rCellData) const override; + virtual std::vector<ScDPItemData> getMatchValues() const override; void addMatchItem(const ScDPItemData& rItem); size_t getMatchItemCount() const; diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index 805affeff6cb..7c8548d770c2 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -129,7 +129,7 @@ class ScDPGroupTableData : public ScDPTableData StringHashSet aGroupNames; void FillGroupValues(std::vector<SCROW>& rItems, const std::vector<long>& rDims); - virtual long GetSourceDim( long nDim ) SAL_OVERRIDE; + virtual long GetSourceDim( long nDim ) override; bool IsNumGroupDimension( long nDimension ) const; void GetNumGroupInfo(long nDimension, ScDPNumGroupInfo& rInfo); @@ -147,37 +147,37 @@ public: void SetNumGroupDimension( long nIndex, const ScDPNumGroupDimension& rGroup ); long GetDimensionIndex( const OUString& rName ); - virtual long GetColumnCount() SAL_OVERRIDE; - virtual long GetMembersCount( long nDim ) SAL_OVERRIDE; - virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) SAL_OVERRIDE ; - virtual const ScDPItemData* GetMemberById( long nDim, long nId) SAL_OVERRIDE; - virtual long Compare( long nDim, long nDataId1, long nDataId2) SAL_OVERRIDE; + virtual long GetColumnCount() override; + virtual long GetMembersCount( long nDim ) override; + virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) override ; + virtual const ScDPItemData* GetMemberById( long nDim, long nId) override; + virtual long Compare( long nDim, long nDataId1, long nDataId2) override; - virtual OUString getDimensionName(long nColumn) SAL_OVERRIDE; - virtual bool getIsDataLayoutDimension(long nColumn) SAL_OVERRIDE; - virtual bool IsDateDimension(long nDim) SAL_OVERRIDE; - virtual sal_uLong GetNumberFormat(long nDim) SAL_OVERRIDE; - virtual void DisposeData() SAL_OVERRIDE; - virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) SAL_OVERRIDE; + virtual OUString getDimensionName(long nColumn) override; + virtual bool getIsDataLayoutDimension(long nColumn) override; + virtual bool IsDateDimension(long nDim) override; + virtual sal_uLong GetNumberFormat(long nDim) override; + virtual void DisposeData() override; + virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) override; - virtual bool IsRepeatIfEmpty() SAL_OVERRIDE; + virtual bool IsRepeatIfEmpty() override; - virtual void CreateCacheTable() SAL_OVERRIDE; - virtual void FilterCacheTable(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rDataDims) SAL_OVERRIDE; + virtual void CreateCacheTable() override; + virtual void FilterCacheTable(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rDataDims) override; virtual void GetDrillDownData(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) SAL_OVERRIDE; - virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) SAL_OVERRIDE; - virtual const ScDPFilteredCache& GetCacheTable() const SAL_OVERRIDE; - virtual void ReloadCacheTable() SAL_OVERRIDE; - - virtual bool IsBaseForGroup(long nDim) const SAL_OVERRIDE; - virtual long GetGroupBase(long nGroupDim) const SAL_OVERRIDE; - virtual bool IsNumOrDateGroup(long nDim) const SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) override; + virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) override; + virtual const ScDPFilteredCache& GetCacheTable() const override; + virtual void ReloadCacheTable() override; + + virtual bool IsBaseForGroup(long nDim) const override; + virtual long GetGroupBase(long nGroupDim) const override; + virtual bool IsNumOrDateGroup(long nDim) const override; virtual bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, - const ScDPItemData& rBaseData, long nBaseIndex ) const SAL_OVERRIDE; + const ScDPItemData& rBaseData, long nBaseIndex ) const override; virtual bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, - const ScDPItemData& rSecondData, long nSecondIndex ) const SAL_OVERRIDE; + const ScDPItemData& rSecondData, long nSecondIndex ) const override; #if DEBUG_PIVOT_TABLE virtual void Dump() const; diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx index 2119373fcb57..e5666ac3288d 100644 --- a/sc/inc/dpsdbtab.hxx +++ b/sc/inc/dpsdbtab.hxx @@ -64,21 +64,21 @@ public: ScDatabaseDPData(ScDocument* pDoc, const ScDPCache& rCache); virtual ~ScDatabaseDPData(); - virtual long GetColumnCount() SAL_OVERRIDE; - virtual OUString getDimensionName(long nColumn) SAL_OVERRIDE; - virtual bool getIsDataLayoutDimension(long nColumn) SAL_OVERRIDE; - virtual bool IsDateDimension(long nDim) SAL_OVERRIDE; - virtual void DisposeData() SAL_OVERRIDE; - virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) SAL_OVERRIDE; + virtual long GetColumnCount() override; + virtual OUString getDimensionName(long nColumn) override; + virtual bool getIsDataLayoutDimension(long nColumn) override; + virtual bool IsDateDimension(long nDim) override; + virtual void DisposeData() override; + virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) override; - virtual void CreateCacheTable() SAL_OVERRIDE; - virtual void FilterCacheTable(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rDataDims) SAL_OVERRIDE; + virtual void CreateCacheTable() override; + virtual void FilterCacheTable(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rDataDims) override; virtual void GetDrillDownData(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) SAL_OVERRIDE; - virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) SAL_OVERRIDE; - virtual const ScDPFilteredCache& GetCacheTable() const SAL_OVERRIDE; - virtual void ReloadCacheTable() SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) override; + virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) override; + virtual const ScDPFilteredCache& GetCacheTable() const override; + virtual void ReloadCacheTable() override; }; #endif diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index 034d08213b96..b3087df8b0b0 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -101,24 +101,24 @@ public: ScSheetDPData(ScDocument* pD, const ScSheetSourceDesc& rDesc, const ScDPCache& rCache); virtual ~ScSheetDPData(); - virtual long GetColumnCount() SAL_OVERRIDE; - virtual OUString getDimensionName(long nColumn) SAL_OVERRIDE; - virtual bool getIsDataLayoutDimension(long nColumn) SAL_OVERRIDE; - virtual bool IsDateDimension(long nDim) SAL_OVERRIDE; - virtual sal_uLong GetNumberFormat(long nDim) SAL_OVERRIDE; - virtual void DisposeData() SAL_OVERRIDE; - virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) SAL_OVERRIDE; - - virtual bool IsRepeatIfEmpty() SAL_OVERRIDE; - - virtual void CreateCacheTable() SAL_OVERRIDE; - virtual void FilterCacheTable(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims) SAL_OVERRIDE; + virtual long GetColumnCount() override; + virtual OUString getDimensionName(long nColumn) override; + virtual bool getIsDataLayoutDimension(long nColumn) override; + virtual bool IsDateDimension(long nDim) override; + virtual sal_uLong GetNumberFormat(long nDim) override; + virtual void DisposeData() override; + virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) override; + + virtual bool IsRepeatIfEmpty() override; + + virtual void CreateCacheTable() override; + virtual void FilterCacheTable(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims) override; virtual void GetDrillDownData(const std::vector<ScDPFilteredCache::Criterion>& rCriteria, const std::unordered_set<sal_Int32>& rCatDims, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) SAL_OVERRIDE; - virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) SAL_OVERRIDE; - virtual const ScDPFilteredCache& GetCacheTable() const SAL_OVERRIDE; - virtual void ReloadCacheTable() SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rData) override; + virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow) override; + virtual const ScDPFilteredCache& GetCacheTable() const override; + virtual void ReloadCacheTable() override; }; #endif diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 4f63a8258861..8391f3d88fa8 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -183,81 +183,81 @@ public: // XDimensionsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getDimensions( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDataPilotResults virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataResult > > SAL_CALL getResults( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence<double> SAL_CALL getFilteredResults( const com::sun::star::uno::Sequence<com::sun::star::sheet::DataPilotFieldFilter>& aFilters ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDrillDownDataSupplier virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDrillDownData(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& aFilters ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; #if DEBUG_PIVOT_TABLE void DumpResults() const; @@ -283,24 +283,24 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; long getCount() const; ScDPDimension* getByIndex(long nIndex) const; @@ -343,66 +343,66 @@ public: const OUString* GetSubtotalName() const; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XHierarchiesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getHierarchies() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getHierarchies() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL - createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; sal_uInt16 getOrientation() const; void setOrientation(sal_uInt16 nNew); @@ -436,24 +436,24 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; long getCount() const; ScDPHierarchy* getByIndex(long nIndex) const; @@ -477,21 +477,21 @@ public: ScDPLevels* GetLevelsObject(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XLevelsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getLevels() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getLevels() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScDPLevels : public cppu::WeakImplHelper< @@ -513,24 +513,24 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; long getCount() const; ScDPLevel* getByIndex(long nIndex) const; @@ -568,66 +568,66 @@ public: ScDPMembers* GetMembersObject(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XMembersSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getMembers() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getMembers() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDataPilotMemberResults virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::MemberResult > SAL_CALL - getResults() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getResults() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> getSubTotals() const; bool getShowEmpty() const { return bShowEmpty;} @@ -691,24 +691,24 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; long getCount() const { return nMbrCount;} ScDPMember* getByIndex(long nIndex) const; @@ -754,58 +754,58 @@ public: sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; bool isVisible() const { return bVisible;} bool getShowDetails() const { return bShowDet;} diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx index 424b943723fa..aea4d2d1aafb 100644 --- a/sc/inc/drawpage.hxx +++ b/sc/inc/drawpage.hxx @@ -32,10 +32,10 @@ public: explicit ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage = false); virtual ~ScDrawPage(); - virtual ScDrawPage* Clone() const SAL_OVERRIDE; - virtual ScDrawPage* Clone(SdrModel* pNewModel) const SAL_OVERRIDE; + virtual ScDrawPage* Clone() const override; + virtual ScDrawPage* Clone(SdrModel* pNewModel) const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() override; private: ScDrawPage(const ScDrawPage& rSrcPage); diff --git a/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxx index ce92e04d3ee3..91a4baccda2a 100644 --- a/sc/inc/drdefuno.hxx +++ b/sc/inc/drdefuno.hxx @@ -34,10 +34,10 @@ public: ScDrawDefaultsObj(ScDocShell* pDocSh); virtual ~ScDrawDefaultsObj() throw (); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // from SvxUnoDrawPool - virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() SAL_OVERRIDE; + virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() override; }; #endif diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index a8db063850ce..ca990980164e 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -72,8 +72,8 @@ public: const ScAddress& rNS, const ScAddress& rNE ); virtual ~ScUndoObjData(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; }; class ScUndoAnchorData : public SdrUndoObj @@ -86,8 +86,8 @@ public: ScUndoAnchorData( SdrObject* pObj, ScDocument* pDoc, SCTAB nTab ); virtual ~ScUndoAnchorData(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; }; class SC_DLLPUBLIC ScDrawLayer : public FmFormModel @@ -111,9 +111,9 @@ public: ScDrawLayer( ScDocument* pDocument, const OUString& rName ); virtual ~ScDrawLayer(); - virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE; - virtual SdrModel* AllocModel() const SAL_OVERRIDE; - virtual void SetChanged( bool bFlg = true ) SAL_OVERRIDE; + virtual SdrPage* AllocPage(bool bMasterPage) override; + virtual SdrModel* AllocModel() const override; + virtual void SetChanged( bool bFlg = true ) override; bool HasObjects() const; @@ -206,14 +206,14 @@ public: static ScMacroInfo* GetMacroInfo( SdrObject* pObj, bool bCreate = false ); - virtual ImageMap* GetImageMapForObject(SdrObject* pObj) SAL_OVERRIDE; + virtual ImageMap* GetImageMapForObject(SdrObject* pObj) override; private: static SfxObjectShell* pGlobalDrawPersist; // for AllocModel public: static void SetGlobalDrawPersist(SfxObjectShell* pPersist); protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() override; }; #endif diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index 8625b706ff29..f992490aef0e 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -57,11 +57,11 @@ public: virtual ~ScHeaderFooterEditSource(); // GetEditEngine is needed because the forwarder doesn't have field functions - virtual ScEditEngineDefaulter* GetEditEngine() SAL_OVERRIDE; + virtual ScEditEngineDefaulter* GetEditEngine() override; - virtual SvxEditSource* Clone() const SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual void UpdateData() SAL_OVERRIDE; + virtual SvxEditSource* Clone() const override; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual void UpdateData() override; }; /** @@ -81,12 +81,12 @@ public: virtual ~ScCellEditSource(); // GetEditEngine is needed because the forwarder doesn't have field functions - virtual ScEditEngineDefaulter* GetEditEngine() SAL_OVERRIDE; + virtual ScEditEngineDefaulter* GetEditEngine() override; - virtual SvxEditSource* Clone() const SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxEditSource* Clone() const override; + virtual SvxTextForwarder* GetTextForwarder() override; - virtual void UpdateData() SAL_OVERRIDE; + virtual void UpdateData() override; void SetDoUpdateData(bool bValue); bool IsDirty() const; @@ -106,11 +106,11 @@ public: ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddress& rP); virtual ~ScAnnotationEditSource(); - virtual SvxEditSource* Clone() const SAL_OVERRIDE ; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual void UpdateData() SAL_OVERRIDE; + virtual SvxEditSource* Clone() const override ; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual void UpdateData() override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; // EditSource with a shared forwarder for all children of one text object @@ -124,9 +124,9 @@ public: ScSimpleEditSource( SvxTextForwarder* pForw ); virtual ~ScSimpleEditSource(); - virtual SvxEditSource* Clone() const SAL_OVERRIDE ; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual void UpdateData() SAL_OVERRIDE; + virtual SvxEditSource* Clone() const override ; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual void UpdateData() override; }; @@ -139,12 +139,12 @@ public: ScAccessibilityEditSource( ::std::unique_ptr < ScAccessibleTextData > && pAccessibleCellTextData ); virtual ~ScAccessibilityEditSource(); - virtual SvxEditSource* Clone() const SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; - virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE; - virtual void UpdateData() SAL_OVERRIDE; - virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE; + virtual SvxEditSource* Clone() const override; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual SvxViewForwarder* GetViewForwarder() override; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) override; + virtual void UpdateData() override; + virtual SfxBroadcaster& GetBroadcaster() const override; }; #endif diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index 5e3a12693b53..3d58582fea91 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -213,8 +213,8 @@ public: void SetExecuteURL(bool bSet) { bExecuteURL = bSet; } - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32, sal_Int32 ) SAL_OVERRIDE; - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) SAL_OVERRIDE; + virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32, sal_Int32 ) override; + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) override; }; // for headers/footers with fields @@ -225,7 +225,7 @@ private: public: ScHeaderEditEngine( SfxItemPool* pEnginePool, bool bDeleteEnginePool = false ); - virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) SAL_OVERRIDE; + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) override; void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; } void SetData(const ScHeaderFieldData& rNew) { aData = rNew; } diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx index 7b6eda52b253..ec50d5442c13 100644 --- a/sc/inc/eventuno.hxx +++ b/sc/inc/eventuno.hxx @@ -42,7 +42,7 @@ public: ScSheetEventsObj(ScDocShell* pDocSh, SCTAB nT); virtual ~ScSheetEventsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, @@ -50,30 +50,30 @@ public: throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index cbd5061c1c86..d29006fbc5a3 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -67,10 +67,10 @@ public: ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId, const OUString& rFilter); virtual ~ScExternalRefLink(); - virtual void Closed() SAL_OVERRIDE; + virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue) SAL_OVERRIDE; - virtual void Edit(vcl::Window* pParent, const Link<SvBaseLink&,void>& rEndEditHdl) SAL_OVERRIDE; + const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue) override; + virtual void Edit(vcl::Window* pParent, const Link<SvBaseLink&,void>& rEndEditHdl) override; void SetDoReferesh(bool b); @@ -438,7 +438,7 @@ public: explicit ScExternalRefManager(ScDocument* pDoc); virtual ~ScExternalRefManager(); - virtual OUString getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const SAL_OVERRIDE; + virtual OUString getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const override; /** * Get a cache table instance for specified table and table index. Unlike @@ -689,7 +689,7 @@ public: */ bool isFileLoadable(const OUString& rFile) const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /** * If we still contain unsaved files we should warn the user before saving diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index ed2e72c961e8..faf25143dc63 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -77,49 +77,49 @@ public: ScDocShell* pDocSh, const ScAddress& rPos); virtual ~ScCellFieldsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XRefreshable virtual void SAL_CALL refresh( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScHeaderFieldsObj : public cppu::WeakImplHelper< @@ -147,46 +147,46 @@ public: virtual ~ScHeaderFieldsObj(); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XRefreshable virtual void SAL_CALL refresh( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; /** @@ -250,29 +250,29 @@ public: // XTextField virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getAnchor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAnchor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, @@ -280,55 +280,55 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index ee188c4ad6a6..e992b9a657db 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -34,12 +34,12 @@ private: static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: ScFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) override; bool GetWK3Flag() const { return bWK3Flag; } }; diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx index 14039479037b..a297cba58134 100644 --- a/sc/inc/filtuno.hxx +++ b/sc/inc/filtuno.hxx @@ -53,39 +53,39 @@ public: // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XImporter virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index d59caf8c2212..6044abea6e2e 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -91,52 +91,52 @@ public: // XSheetConditionalEntries virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aConditionalEntry ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTableConditionalFormat* getImplementation(const css::uno::Reference<css::sheet::XSheetConditionalEntries>& rObj); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScTableConditionalEntry : public cppu::WeakImplHelper< @@ -156,36 +156,36 @@ public: // XSheetCondition virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getConditionOperator() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSourcePosition( const ::com::sun::star::table::CellAddress& aSourcePosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSheetConditionalEntry - virtual OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setStyleName( const OUString& aStyleName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScTableValidationObj : public cppu::WeakImplHelper< @@ -232,89 +232,89 @@ public: // XSheetCondition virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getConditionOperator() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula1( const OUString& aFormula1 ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula2( const OUString& aFormula2 ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSourcePosition( const ::com::sun::star::table::CellAddress& aSourcePosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XMultiFormulaTokens virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getTokens( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; virtual void SAL_CALL setTokens( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) - throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTableValidationObj* getImplementation(const css::uno::Reference<css::beans::XPropertySet>& rObj); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxx index 17f03f57eb00..5c3fa2b8b9de 100644 --- a/sc/inc/forbiuno.hxx +++ b/sc/inc/forbiuno.hxx @@ -32,13 +32,13 @@ class ScForbiddenCharsObj : public SvxUnoForbiddenCharsTable, public SfxListener ScDocShell* pDocShell; protected: - virtual void onChange() SAL_OVERRIDE; + virtual void onChange() override; public: ScForbiddenCharsObj( ScDocShell* pDocSh ); virtual ~ScForbiddenCharsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; #endif diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 61478f16b99e..724b1e20f322 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -319,8 +319,8 @@ public: void SetPreviousTrack( ScFormulaCell* pF ); void SetNextTrack( ScFormulaCell* pF ); - virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE; - virtual void Query( SvtListener::QueryBase& rQuery ) const SAL_OVERRIDE; + virtual void Notify( const SfxHint& rHint ) override; + virtual void Query( SvtListener::QueryBase& rQuery ) const override; void SetCompile( bool bVal ); ScDocument* GetDocument() const { return pDocument;} diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx index a7dba2bbf0ad..6a5c50948f02 100644 --- a/sc/inc/formulagroup.hxx +++ b/sc/inc/formulagroup.hxx @@ -152,9 +152,9 @@ public: FormulaGroupInterpreterSoftware(); virtual ~FormulaGroupInterpreterSoftware() {} - virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat) SAL_OVERRIDE; - virtual CompiledFormula* createCompiledFormula( ScFormulaCellGroup& rGroup, ScTokenArray& rCode ) SAL_OVERRIDE; - virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) SAL_OVERRIDE; + virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat) override; + virtual CompiledFormula* createCompiledFormula( ScFormulaCellGroup& rGroup, ScTokenArray& rCode ) override; + virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) override; }; } diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 5b71b2a81a25..ce56f208a947 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -87,8 +87,8 @@ public: ScTpFormulaItem( const ScTpFormulaItem& rItem ); virtual ~ScTpFormulaItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const ScFormulaOptions& GetFormulaOptions() const { return theOptions; } @@ -105,14 +105,14 @@ class ScFormulaCfg : public ScFormulaOptions, public utl::ConfigItem static ScFormulaCfg::PropsToIds GetPropNamesToId(); void UpdateFromProperties( const com::sun::star::uno::Sequence<OUString>& rNames ); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: ScFormulaCfg(); void SetOptions( const ScFormulaOptions& rNew ); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; }; #endif diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index 2bf4d01e5e2d..cda94fac37b3 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -65,49 +65,49 @@ public: @param _rArgumens Vector, which the indices are written to */ - virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const SAL_OVERRIDE ; + virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const override ; /** Returns the category of the function @return the category of the function */ - virtual const formula::IFunctionCategory* getCategory() const SAL_OVERRIDE ; + virtual const formula::IFunctionCategory* getCategory() const override ; /** Returns the description of the function @return the description of the function, or an empty OUString if there is no description */ - virtual OUString getDescription() const SAL_OVERRIDE ; + virtual OUString getDescription() const override ; /** Returns the function signature with parameters from the passed string array. @return function signature with parameters */ - virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const SAL_OVERRIDE ; + virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const override ; /** Returns the name of the function @return the name of the function, or an empty OUString if there is no name */ - virtual OUString getFunctionName() const SAL_OVERRIDE ; + virtual OUString getFunctionName() const override ; /** Returns the help id of the function @return help id of the function */ - virtual OString getHelpId() const SAL_OVERRIDE ; + virtual OString getHelpId() const override ; /** Returns number of arguments @return help id of the function */ - virtual sal_uInt32 getParameterCount() const SAL_OVERRIDE ; + virtual sal_uInt32 getParameterCount() const override ; /** Returns description of parameter at given position @@ -117,7 +117,7 @@ public: @return OUString description of the parameter */ - virtual OUString getParameterDescription(sal_uInt32 _nPos) const SAL_OVERRIDE ; + virtual OUString getParameterDescription(sal_uInt32 _nPos) const override ; /** Returns name of parameter at given position @@ -127,7 +127,7 @@ public: @return OUString name of the parameter */ - virtual OUString getParameterName(sal_uInt32 _nPos) const SAL_OVERRIDE ; + virtual OUString getParameterName(sal_uInt32 _nPos) const override ; /** Returns list of all parameter names @@ -141,7 +141,7 @@ public: @return OUString of the form "FUNCTIONNAME( parameter list )" */ - virtual OUString getSignature() const SAL_OVERRIDE ; + virtual OUString getSignature() const override ; /** Returns the number of non-suppressed arguments @@ -154,14 +154,14 @@ public: @return number of non-suppressed arguments */ sal_uInt16 GetSuppressedArgCount() const; - virtual sal_Int32 getSuppressedArgumentCount() const SAL_OVERRIDE ; + virtual sal_Int32 getSuppressedArgumentCount() const override ; /** Requests function data from AddInCollection Logs error message on failure for debugging purposes */ - virtual void initArgumentInfo() const SAL_OVERRIDE; + virtual void initArgumentInfo() const override; /** Returns true if parameter at given position is optional @@ -171,7 +171,7 @@ public: @return true if optional, false if not optional */ - virtual bool isParameterOptional(sal_uInt32 _nPos) const SAL_OVERRIDE ; + virtual bool isParameterOptional(sal_uInt32 _nPos) const override ; /** Compares functions by name, respecting special characters @@ -257,7 +257,7 @@ public: /** @return count of functions in this category */ - virtual sal_uInt32 getCount() const SAL_OVERRIDE; + virtual sal_uInt32 getCount() const override; /** Gives the _nPos'th function in this category. @@ -267,13 +267,13 @@ public: @return function at the _nPos position in this category, null if _nPos out of bounds. */ - virtual const formula::IFunctionDescription* getFunction(sal_uInt32 _nPos) const SAL_OVERRIDE; + virtual const formula::IFunctionDescription* getFunction(sal_uInt32 _nPos) const override; /** @return index number of this category. */ - virtual sal_uInt32 getNumber() const SAL_OVERRIDE; - virtual OUString getName() const SAL_OVERRIDE; + virtual sal_uInt32 getNumber() const override; + virtual OUString getName() const override; private: ::std::vector<const ScFuncDesc*>* m_pCategory; /**< list of functions in this category */ @@ -340,7 +340,7 @@ public: /** @return number of categories, not counting the cumulative category ('All') */ - virtual sal_uInt32 getCount() const SAL_OVERRIDE; + virtual sal_uInt32 getCount() const override; /** Returns a category. @@ -352,7 +352,7 @@ public: @return pointer to an IFunctionCategory object, null if nPos out of bounds. */ - virtual const formula::IFunctionCategory* getCategory(sal_uInt32 nPos) const SAL_OVERRIDE; + virtual const formula::IFunctionCategory* getCategory(sal_uInt32 nPos) const override; /** Appends the last recently used functions. @@ -362,7 +362,7 @@ public: @param _rLastRUFunctions a vector of pointer to IFunctionDescription, by reference. */ - virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const SAL_OVERRIDE; + virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const override; /** Maps Etoken to character @@ -374,7 +374,7 @@ public: @return character */ - virtual sal_Unicode getSingleToken(const formula::IFunctionManager::EToken _eToken) const SAL_OVERRIDE; + virtual sal_Unicode getSingleToken(const formula::IFunctionManager::EToken _eToken) const override; private: ScFunctionList* pFuncList; /**< list of all calc functions */ diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index d267c2a12bf2..19a7b489317a 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -69,7 +69,7 @@ public: ScFunctionAccess(); virtual ~ScFunctionAccess(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XFunctionAccess virtual ::com::sun::star::uno::Any SAL_CALL callFunction( @@ -79,56 +79,56 @@ public: throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/grouparealistener.hxx b/sc/inc/grouparealistener.hxx index d19c9fec0d80..180113810664 100644 --- a/sc/inc/grouparealistener.hxx +++ b/sc/inc/grouparealistener.hxx @@ -43,8 +43,8 @@ public: ScRange getListeningRange() const; - virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE; - virtual void Query( QueryBase& rQuery ) const SAL_OVERRIDE; + virtual void Notify( const SfxHint& rHint ) override; + virtual void Query( QueryBase& rQuery ) const override; /** * Given the row span of changed cells within a single column, collect all diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index e2f6b8d91954..db385559fa93 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -81,7 +81,7 @@ class ScInputCfg : public ScInputOptions, { static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: ScInputCfg(); @@ -89,7 +89,7 @@ public: void SetOptions( const ScInputOptions& rNew ); void OptionsChanged(); // after direct access to SetOptions base class - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) override; }; #endif diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index 63306cc64d28..cc74a8af4931 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -71,65 +71,65 @@ public: ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName); virtual ~ScSheetLinkObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XRefreshable virtual void SAL_CALL refresh() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // aus get/setPropertyValue gerufen: OUString getFileName() const; @@ -143,11 +143,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScSheetLinksObj : public cppu::WeakImplHelper< @@ -167,41 +167,41 @@ public: ScSheetLinksObj(ScDocShell* pDocSh); virtual ~ScSheetLinksObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScAreaLinkObj : public cppu::WeakImplHelper< @@ -227,60 +227,60 @@ public: ScAreaLinkObj(ScDocShell* pDocSh, size_t nP); virtual ~ScAreaLinkObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XRefreshable virtual void SAL_CALL refresh() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // called from get/setPropertyValue: OUString getFileName() const; @@ -293,21 +293,21 @@ public: void setRefreshDelay(sal_Int32 nRefreshDelay); // XAreaLink - virtual OUString SAL_CALL getSourceArea() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSourceArea() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSourceArea( const OUString& aSourceArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDestArea() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDestArea( const ::com::sun::star::table::CellRangeAddress& aDestArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScAreaLinksObj : public cppu::WeakImplHelper< @@ -325,7 +325,7 @@ public: ScAreaLinksObj(ScDocShell* pDocSh); virtual ~ScAreaLinksObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XAreaLinks virtual void SAL_CALL insertAtPosition( const ::com::sun::star::table::CellAddress& aDestPos, @@ -333,33 +333,33 @@ public: const OUString& aSourceArea, const OUString& aFilter, const OUString& aFilterOptions ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; //! order of XNamed and DDELink changed to avoid "duplicate comdat" symbols @@ -386,45 +386,45 @@ public: const OUString& rT, const OUString& rI); virtual ~ScDDELinkObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDDELink - virtual OUString SAL_CALL getApplication() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTopic() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getItem() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getApplication() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTopic() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getItem() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDDELinkResults virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getResults( ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setResults( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aResults ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScDDELinksObj : public cppu::WeakImplHelper< @@ -444,48 +444,48 @@ public: ScDDELinksObj(ScDocShell* pDocSh); virtual ~ScDDELinksObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XDDELinks virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDDELink > SAL_CALL addDDELink( const OUString& aApplication, const OUString& aTopic, const OUString& aItem, ::com::sun::star::sheet::DDELinkMode nMode ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScExternalSheetCacheObj : public cppu::WeakImplHelper< ::com::sun::star::sheet::XExternalSheetCache > @@ -497,20 +497,20 @@ public: // XExternalSheetCache virtual void SAL_CALL setCellValue( sal_Int32 nCol, sal_Int32 nRow, const ::com::sun::star::uno::Any& rAny) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getCellValue(sal_Int32 nCol, sal_Int32 nRow) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getAllRows() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getAllColumns(sal_Int32 nRow) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; // Attributes virtual sal_Int32 SAL_CALL getTokenIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: ScExternalSheetCacheObj(const ScExternalSheetCacheObj&) = delete; @@ -530,37 +530,37 @@ public: // XExternalDocLink virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache > SAL_CALL addSheetCache( const OUString& aSheetName, sal_Bool bDynamicCache ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // Attributes virtual sal_Int32 SAL_CALL getTokenIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: ScDocShell* mpDocShell; @@ -578,33 +578,33 @@ public: // XExternalDocLinks virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLink > SAL_CALL addDocLink( const OUString& aDocName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: ScExternalDocLinksObj(const ScExternalDocLinksObj&) = delete; diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx index fe40dea10127..0aa7eb204473 100644 --- a/sc/inc/listenercontext.hxx +++ b/sc/inc/listenercontext.hxx @@ -68,8 +68,8 @@ class PurgeListenerAction : public ColumnSpanSet::Action, boost::noncopyable public: PurgeListenerAction( ScDocument& rDoc ); - virtual void startColumn( SCTAB nTab, SCCOL nCol ) SAL_OVERRIDE; - virtual void execute( const ScAddress& rPos, SCROW nLength, bool bVal ) SAL_OVERRIDE; + virtual void startColumn( SCTAB nTab, SCCOL nCol ) override; + virtual void execute( const ScAddress& rPos, SCROW nLength, bool bVal ) override; }; } diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index a3f9bbc83d79..4675f0d5fc4e 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -110,7 +110,7 @@ public: ScLookupCache( ScDocument * pDoc, const ScRange & rRange ); virtual ~ScLookupCache(); /// Remove from document structure and delete (!) cache on modify hint. - virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( const SfxHint& rHint ) override; /// @returns document address in o_rAddress if Result==FOUND Result lookup( ScAddress & o_rResultAddress, diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index 4d87b79721eb..68e6d7bef748 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -99,19 +99,19 @@ public: virtual ~ScIndexEnumeration(); // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; // new (uno 3) variant @@ -130,24 +130,24 @@ public: virtual ~ScNameToIndexAccess(); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class SC_DLLPUBLIC ScUnoHelpFunctions diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 63f8b1057736..0e3dbd7bbcac 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -74,98 +74,98 @@ public: com::sun::star::uno::Reference< com::sun::star::container::XNamed > xSheet = com::sun::star::uno::Reference< com::sun::star::container::XNamed > ()); virtual ~ScNamedRangeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XNamedRange - virtual OUString SAL_CALL getContent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getContent() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setContent( const OUString& aContent ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::table::CellAddress SAL_CALL getReferencePosition() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setReferencePosition( const ::com::sun::star::table::CellAddress& aReferencePosition ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual sal_Int32 SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType( sal_Int32 nType ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// XFormulaTokens virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getTokens() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setTokens( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// XCellRangeReferrer virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL - getReferredCells() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getReferredCells() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScNamedRangesObj : public ::cppu::WeakImplHelper< @@ -203,7 +203,7 @@ public: ScNamedRangesObj(ScDocShell* pDocSh); virtual ~ScNamedRangesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; bool IsModifyAndBroadcast() const { return mbModifyAndBroadcast;} @@ -211,107 +211,107 @@ public: virtual void SAL_CALL addNewByName( const OUString& aName, const OUString& aContent, const ::com::sun::star::table::CellAddress& aPosition, sal_Int32 nType ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addNewFromTitles( const ::com::sun::star::table::CellRangeAddress& aSource, ::com::sun::star::sheet::Border aBorder ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL outputList( const ::com::sun::star::table::CellAddress& aOutputPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XActionLockable - virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScGlobalNamedRangesObj: public ScNamedRangesObj { private: - virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex) SAL_OVERRIDE; - virtual ScNamedRangeObj* GetObjectByName_Impl(const OUString& aName) SAL_OVERRIDE; + virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex) override; + virtual ScNamedRangeObj* GetObjectByName_Impl(const OUString& aName) override; - virtual ScRangeName* GetRangeName_Impl() SAL_OVERRIDE; - virtual SCTAB GetTab_Impl() SAL_OVERRIDE; + virtual ScRangeName* GetRangeName_Impl() override; + virtual SCTAB GetTab_Impl() override; public: ScGlobalNamedRangesObj(ScDocShell* pDocSh); @@ -322,11 +322,11 @@ class ScLocalNamedRangesObj: public ScNamedRangesObj { private: - virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex) SAL_OVERRIDE; - virtual ScNamedRangeObj* GetObjectByName_Impl(const OUString& aName) SAL_OVERRIDE; + virtual ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex) override; + virtual ScNamedRangeObj* GetObjectByName_Impl(const OUString& aName) override; - virtual ScRangeName* GetRangeName_Impl() SAL_OVERRIDE; - virtual SCTAB GetTab_Impl() SAL_OVERRIDE; + virtual ScRangeName* GetRangeName_Impl() override; + virtual SCTAB GetTab_Impl() override; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > mxSheet; public: @@ -352,25 +352,25 @@ public: ScLabelRangeObj(ScDocShell* pDocSh, bool bCol, const ScRange& rR); virtual ~ScLabelRangeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XLabelRange virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getLabelArea() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLabelArea( const ::com::sun::star::table::CellRangeAddress& aLabelArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDataArea() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScLabelRangesObj : public ::cppu::WeakImplHelper< @@ -389,38 +389,38 @@ public: ScLabelRangesObj(ScDocShell* pDocSh, bool bCol); virtual ~ScLabelRangesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XLabelRanges virtual void SAL_CALL addNew( const ::com::sun::star::table::CellRangeAddress& aLabelArea, const ::com::sun::star::table::CellRangeAddress& aDataArea ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx index e8ec0e63c00d..2247d4ef8a77 100644 --- a/sc/inc/notesuno.hxx +++ b/sc/inc/notesuno.hxx @@ -45,72 +45,72 @@ public: ScAnnotationObj(ScDocShell* pDocSh, const ScAddress& rPos); virtual ~ScAnnotationObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XSheetAnnotation virtual ::com::sun::star::table::CellAddress SAL_CALL getPosition() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAuthor() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual OUString SAL_CALL getDate() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL getIsVisible() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setIsVisible( sal_Bool bIsVisible ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; /// XSheetAnnotationShapeSupplier virtual ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > SAL_CALL getAnnotationShape() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: SvxUnoText& GetUnoText(); diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index c71314c8bcf5..5d04cb79372b 100644 --- a/sc/inc/optuno.hxx +++ b/sc/inc/optuno.hxx @@ -71,12 +71,12 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index 5e21a772ab54..e16f58652ad1 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -44,8 +44,8 @@ public: ScLinkConfigItem( const OUString& rSubTree, ConfigItemMode nMode ); void SetCommitLink( const Link<ScLinkConfigItem&,void>& rLink ); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) override; + virtual void ImplCommit() override; void SetModified() { ConfigItem::SetModified(); } com::sun::star::uno::Sequence< com::sun::star::uno::Any> diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx index 8de301c718c1..d3d0bec2670d 100644 --- a/sc/inc/pageuno.hxx +++ b/sc/inc/pageuno.hxx @@ -31,15 +31,15 @@ public: virtual ~ScPageObj() throw(); virtual css::uno::Reference<css::drawing::XShape> _CreateShape(SdrObject *pObj) const - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index 432357c3356e..ee30a0da0612 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -60,11 +60,11 @@ public: virtual ~ScPatternAttr(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const SAL_OVERRIDE; - virtual SvStream& Store(SvStream& rStream, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; + virtual SvStream& Store(SvStream& rStream, sal_uInt16 nItemVersion) const override; - virtual bool operator==(const SfxPoolItem& rCmp) const SAL_OVERRIDE; + virtual bool operator==(const SfxPoolItem& rCmp) const override; const SfxPoolItem& GetItem( sal_uInt16 nWhichP ) const { return GetItemSet().Get(nWhichP); } diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index 2bd348aac885..dec2fa00c292 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -61,8 +61,8 @@ public: ScTpPrintItem( const ScTpPrintItem& rItem ); virtual ~ScTpPrintItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const ScPrintOptions& GetPrintOptions() const { return theOptions; } @@ -77,14 +77,14 @@ class ScPrintCfg : public ScPrintOptions, public utl::ConfigItem private: static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: ScPrintCfg(); void SetOptions( const ScPrintOptions& rNew ); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; }; #endif diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index 867b15d880f8..3c96260c1322 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -133,7 +133,7 @@ struct ScDBQueryParamInternal : public ScDBQueryParamBase, public ScQueryParamTa ScDBQueryParamInternal(); virtual ~ScDBQueryParamInternal(); - virtual bool IsValidFieldIndex() const SAL_OVERRIDE; + virtual bool IsValidFieldIndex() const override; }; struct ScDBQueryParamMatrix : public ScDBQueryParamBase @@ -143,7 +143,7 @@ struct ScDBQueryParamMatrix : public ScDBQueryParamBase ScDBQueryParamMatrix(); virtual ~ScDBQueryParamMatrix(); - virtual bool IsValidFieldIndex() const SAL_OVERRIDE; + virtual bool IsValidFieldIndex() const override; }; #endif diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx index 46c48df1445e..3464151d666e 100644 --- a/sc/inc/refreshtimer.hxx +++ b/sc/inc/refreshtimer.hxx @@ -59,7 +59,7 @@ public: void StopRefreshTimer(); void SetRefreshDelay( sal_uLong nSeconds ); - SC_DLLPUBLIC virtual void Invoke() SAL_OVERRIDE; + SC_DLLPUBLIC virtual void Invoke() override; private: void Launch(); diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 3d70b9fb8295..c54a28d72723 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -123,8 +123,8 @@ public: ScModule( SfxObjectFactory* pFact ); virtual ~ScModule(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override; void DeleteCfg(); // moved by the application @@ -242,9 +242,9 @@ public: sal_uInt16 GetCurRefDlgId() const { return nCurRefDlgId; } // virtual methods for the options dialog - virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; - virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) override; + virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override; + virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override; void SetInSharedDocLoading( bool bNew ) { mbIsInSharedDocLoading = bNew; } bool IsInSharedDocLoading() const { return mbIsInSharedDocLoading; } diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index 7dccd90df81e..d9fa07ba357b 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -92,14 +92,14 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -107,76 +107,76 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XText virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< @@ -185,63 +185,63 @@ public: ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) - throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index 8719a6ff45b6..f32b74ca56b6 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -44,73 +44,73 @@ public: SvxSearchItem* GetSearchItem() const { return pSearchItem; } // XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getReplaceString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSearchDescriptor - virtual OUString SAL_CALL getSearchString() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSearchString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSearchString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // search/replace should be called from outside (from XSearchable)... // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScCellSearchObj* getImplementation(const css::uno::Reference<css::util::XSearchDescriptor>& rObj); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index 15acaf839fd3..74d815f3fafe 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -35,7 +35,7 @@ public: void SetDocument( ScDocument* pDocument ); ScDocument* GetDocument() const { return pDoc; } - virtual void Remove( SfxStyleSheetBase* pStyle ) SAL_OVERRIDE; + virtual void Remove( SfxStyleSheetBase* pStyle ) override; void SetActualStyleSheet ( SfxStyleSheetBase* pActStyleSheet ) { pActualStyleSheet = pActStyleSheet; } @@ -54,7 +54,7 @@ public: const OUString* GetForceStdName() const { return pForceStdName; } virtual SfxStyleSheetBase& Make( const OUString&, SfxStyleFamily eFam, - sal_uInt16 nMask = SFXSTYLEBIT_ALL) SAL_OVERRIDE; + sal_uInt16 nMask = SFXSTYLEBIT_ALL) override; protected: virtual ~ScStyleSheetPool(); @@ -63,8 +63,8 @@ protected: virtual SfxStyleSheetBase* Create( const OUString& rName, SfxStyleFamily eFamily, - sal_uInt16 nMask) SAL_OVERRIDE; - virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle ) SAL_OVERRIDE; + sal_uInt16 nMask) override; + virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle ) override; private: SfxStyleSheetBase* pActualStyleSheet; diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index 6bfcfd595e9d..a5de26142118 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -49,18 +49,18 @@ public: ScStyleSheet( const ScStyleSheet& rStyle ); - virtual bool SetParent ( const OUString& rParentName ) SAL_OVERRIDE; + virtual bool SetParent ( const OUString& rParentName ) override; SC_DLLPUBLIC void ResetParent(); - virtual SfxItemSet& GetItemSet () SAL_OVERRIDE; - virtual bool IsUsed () const SAL_OVERRIDE; - virtual bool HasFollowSupport () const SAL_OVERRIDE; - virtual bool HasParentSupport () const SAL_OVERRIDE; + virtual SfxItemSet& GetItemSet () override; + virtual bool IsUsed () const override; + virtual bool HasFollowSupport () const override; + virtual bool HasParentSupport () const override; - virtual const OUString& GetName() const SAL_OVERRIDE; - virtual const OUString& GetParent() const SAL_OVERRIDE; - virtual const OUString& GetFollow() const SAL_OVERRIDE; + virtual const OUString& GetName() const override; + virtual const OUString& GetParent() const override; + virtual const OUString& GetFollow() const override; - virtual bool SetName(const OUString& rNewName, bool bReindexNow = true) SAL_OVERRIDE; + virtual bool SetName(const OUString& rNewName, bool bReindexNow = true) override; void SetUsage( ScStyleSheet::Usage eUse ) const { eUsage = eUse; } ScStyleSheet::Usage GetUsage() const { return eUsage; } @@ -73,7 +73,7 @@ protected: SfxStyleFamily eFamily, sal_uInt16 nMask ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; #endif // INCLUDED_SC_INC_STLSHEET_HXX diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index a41d9e3e8a8d..f6de51e86357 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -63,52 +63,52 @@ public: ScStyleFamiliesObj(ScDocShell* pDocSh); virtual ~ScStyleFamiliesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XStyleLoader virtual void SAL_CALL loadStylesFromURL( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getStyleLoaderOptions() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getStyleLoaderOptions() throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XStyleLoader2 virtual void SAL_CALL loadStylesFromDocument( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XComponent > & aSourceComponent, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: void loadStylesFromDocShell( ScDocShell* pSource, const ::com::sun::star::uno::Sequence< @@ -135,7 +135,7 @@ public: ScStyleFamilyObj(ScDocShell* pDocSh, SfxStyleFamily eFam); virtual ~ScStyleFamilyObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, @@ -143,12 +143,12 @@ public: throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, @@ -156,57 +156,57 @@ public: throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScStyleObj : public ::cppu::WeakImplHelper< @@ -244,29 +244,29 @@ public: SfxStyleFamily GetFamily() const { return eFamily; } void InitDoc( ScDocShell* pNewDocSh, const OUString& rNewName ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > CreateEmptyNumberingRules(); // XStyle - virtual sal_Bool SAL_CALL isUserDefined() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isInUse() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isUserDefined() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isInUse() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -274,36 +274,36 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, @@ -312,68 +312,68 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XMultiPropertyStates // getPropertyStates already defined for XPropertyState virtual void SAL_CALL setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScStyleObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index eebc5024e539..a12ba1d3c2ee 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -48,11 +48,11 @@ public: ScTableLink( SfxObjectShell* pShell, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, sal_uLong nRefresh ); virtual ~ScTableLink(); - virtual void Closed() SAL_OVERRIDE; + virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; + const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; - virtual void Edit( vcl::Window*, const Link<SvBaseLink&,void>& rEndEditHdl ) SAL_OVERRIDE; + virtual void Edit( vcl::Window*, const Link<SvBaseLink&,void>& rEndEditHdl ) override; bool Refresh(const OUString& rNewFile, const OUString& rNewFilter, const OUString* pNewOptions /* = NULL */, sal_uLong nNewRefresh ); diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx index 07aecaa7dcad..7e0825609449 100644 --- a/sc/inc/tabprotection.hxx +++ b/sc/inc/tabprotection.hxx @@ -85,19 +85,19 @@ public: explicit ScDocProtection(const ScDocProtection& r); virtual ~ScDocProtection(); - virtual bool isProtected() const SAL_OVERRIDE; - virtual bool isProtectedWithPass() const SAL_OVERRIDE; - virtual void setProtected(bool bProtected) SAL_OVERRIDE; + virtual bool isProtected() const override; + virtual bool isProtectedWithPass() const override; + virtual void setProtected(bool bProtected) override; - virtual bool isPasswordEmpty() const SAL_OVERRIDE; - virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const SAL_OVERRIDE; - virtual void setPassword(const OUString& aPassText) SAL_OVERRIDE; + virtual bool isPasswordEmpty() const override; + virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const override; + virtual void setPassword(const OUString& aPassText) override; virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash( - ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const SAL_OVERRIDE; + ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const override; virtual void setPasswordHash( const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, - ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) SAL_OVERRIDE; - virtual bool verifyPassword(const OUString& aPassText) const SAL_OVERRIDE; + ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) override; + virtual bool verifyPassword(const OUString& aPassText) const override; bool isOptionEnabled(Option eOption) const; void setOption(Option eOption, bool bEnabled); @@ -171,19 +171,19 @@ public: explicit ScTableProtection(const ScTableProtection& r); virtual ~ScTableProtection(); - virtual bool isProtected() const SAL_OVERRIDE; - virtual bool isProtectedWithPass() const SAL_OVERRIDE; - virtual void setProtected(bool bProtected) SAL_OVERRIDE; + virtual bool isProtected() const override; + virtual bool isProtectedWithPass() const override; + virtual void setProtected(bool bProtected) override; - virtual bool isPasswordEmpty() const SAL_OVERRIDE; - virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const SAL_OVERRIDE; - virtual void setPassword(const OUString& aPassText) SAL_OVERRIDE; + virtual bool isPasswordEmpty() const override; + virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const override; + virtual void setPassword(const OUString& aPassText) override; virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash( - ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const SAL_OVERRIDE; + ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const override; virtual void setPasswordHash( const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, - ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) SAL_OVERRIDE; - virtual bool verifyPassword(const OUString& aPassText) const SAL_OVERRIDE; + ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) override; + virtual bool verifyPassword(const OUString& aPassText) const override; bool isOptionEnabled(Option eOption) const; void setOption(Option eOption, bool bEnabled); diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index d99930cfa748..5b465ce9f601 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -75,24 +75,24 @@ public: ScLinkTargetTypesObj(ScDocShell* pDocSh); virtual ~ScLinkTargetTypesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // ::com::sun::star::container::XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; }; class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper< @@ -110,51 +110,51 @@ public: ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT); virtual ~ScLinkTargetTypeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; static void SetLinkTargetBitmap( ::com::sun::star::uno::Any& rRet, sal_uInt16 nType ); // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // ::com::sun::star::document::XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; }; class ScLinkTargetsObj : public ::cppu::WeakImplHelper< @@ -172,18 +172,18 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 93c7b6696f06..11b692474b75 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -81,27 +81,27 @@ public: // XHeaderFooterContent virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getLeftText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getLeftText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getCenterText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getCenterText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getRightText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getRightText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::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(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; // ScHeaderFooterTextData: shared data between sub objects of a ScHeaderFooterTextObj @@ -169,68 +169,68 @@ public: ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XSimpleText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL - createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createTextCursor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTextRangeMover virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nParagraphs ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTextFieldsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL - getTextFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getTextFields() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getTextFieldMasters() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getTextFieldMasters() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; // derived cursor objects for getImplementation and getText/getStart/getEnd @@ -250,16 +250,16 @@ public: // SvxUnoTextCursor methods reimplemented here: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScCellTextCursor* getImplementation(const css::uno::Reference< css::uno::XInterface>& rObj); @@ -277,16 +277,16 @@ public: // SvxUnoTextCursor methods reimplemented here: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScHeaderFooterTextCursor* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); @@ -306,16 +306,16 @@ public: // SvxUnoTextCursor methods reimplemented here: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL - getText() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL - getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScDrawTextCursor* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); @@ -372,7 +372,7 @@ public: ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP); virtual ~ScCellTextData(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // helper functions for ScSharedCellEditSource: virtual SvxTextForwarder* GetTextForwarder(); diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index d6c8a9824a05..9cf02bf36671 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -73,11 +73,11 @@ public: FormulaToken( formula::svSingleRef, e ), aSingleRef( r ) {} ScSingleRefToken( const ScSingleRefToken& r ) : FormulaToken( r ), aSingleRef( r.aSingleRef ) {} - virtual const ScSingleRefData* GetSingleRef() const SAL_OVERRIDE; - virtual ScSingleRefData* GetSingleRef() SAL_OVERRIDE; - virtual bool TextEqual( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScSingleRefToken(*this); } + virtual const ScSingleRefData* GetSingleRef() const override; + virtual ScSingleRefData* GetSingleRef() override; + virtual bool TextEqual( const formula::FormulaToken& rToken ) const override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScSingleRefToken(*this); } DECL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken ); }; @@ -97,15 +97,15 @@ public: } ScDoubleRefToken( const ScDoubleRefToken& r ) : FormulaToken( r ), aDoubleRef( r.aDoubleRef ) {} - virtual const ScSingleRefData* GetSingleRef() const SAL_OVERRIDE; - virtual ScSingleRefData* GetSingleRef() SAL_OVERRIDE; - virtual const ScComplexRefData* GetDoubleRef() const SAL_OVERRIDE; - virtual ScComplexRefData* GetDoubleRef() SAL_OVERRIDE; - virtual const ScSingleRefData* GetSingleRef2() const SAL_OVERRIDE; - virtual ScSingleRefData* GetSingleRef2() SAL_OVERRIDE; - virtual bool TextEqual( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScDoubleRefToken(*this); } + virtual const ScSingleRefData* GetSingleRef() const override; + virtual ScSingleRefData* GetSingleRef() override; + virtual const ScComplexRefData* GetDoubleRef() const override; + virtual ScComplexRefData* GetDoubleRef() override; + virtual const ScSingleRefData* GetSingleRef2() const override; + virtual ScSingleRefData* GetSingleRef2() override; + virtual bool TextEqual( const formula::FormulaToken& rToken ) const override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScDoubleRefToken(*this); } DECL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken ); }; @@ -118,10 +118,10 @@ public: ScMatrixToken( const ScMatrixRef& p ); ScMatrixToken( const ScMatrixToken& r ); - virtual const ScMatrix* GetMatrix() const SAL_OVERRIDE; - virtual ScMatrix* GetMatrix() SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScMatrixToken(*this); } + virtual const ScMatrix* GetMatrix() const override; + virtual ScMatrix* GetMatrix() override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScMatrixToken(*this); } }; /** @@ -138,13 +138,13 @@ public: ScMatrixRangeToken( const sc::RangeMatrix& rMat ); ScMatrixRangeToken( const ScMatrixRangeToken& r ); - virtual sal_uInt8 GetByte() const SAL_OVERRIDE; - virtual const ScMatrix* GetMatrix() const SAL_OVERRIDE; - virtual ScMatrix* GetMatrix() SAL_OVERRIDE; - virtual const ScComplexRefData* GetDoubleRef() const SAL_OVERRIDE; - virtual ScComplexRefData* GetDoubleRef() SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE; + virtual sal_uInt8 GetByte() const override; + virtual const ScMatrix* GetMatrix() const override; + virtual ScMatrix* GetMatrix() override; + virtual const ScComplexRefData* GetDoubleRef() const override; + virtual ScComplexRefData* GetDoubleRef() override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override; }; class ScExternalSingleRefToken : public formula::FormulaToken @@ -159,12 +159,12 @@ public: ScExternalSingleRefToken( const ScExternalSingleRefToken& r ); virtual ~ScExternalSingleRefToken(); - virtual sal_uInt16 GetIndex() const SAL_OVERRIDE; - virtual svl::SharedString GetString() const SAL_OVERRIDE; - virtual const ScSingleRefData* GetSingleRef() const SAL_OVERRIDE; - virtual ScSingleRefData* GetSingleRef() SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScExternalSingleRefToken(*this); } + virtual sal_uInt16 GetIndex() const override; + virtual svl::SharedString GetString() const override; + virtual const ScSingleRefData* GetSingleRef() const override; + virtual ScSingleRefData* GetSingleRef() override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScExternalSingleRefToken(*this); } }; class ScExternalDoubleRefToken : public formula::FormulaToken @@ -179,16 +179,16 @@ public: ScExternalDoubleRefToken( const ScExternalDoubleRefToken& r ); virtual ~ScExternalDoubleRefToken(); - virtual sal_uInt16 GetIndex() const SAL_OVERRIDE; - virtual svl::SharedString GetString() const SAL_OVERRIDE; - virtual const ScSingleRefData* GetSingleRef() const SAL_OVERRIDE; - virtual ScSingleRefData* GetSingleRef() SAL_OVERRIDE; - virtual const ScSingleRefData* GetSingleRef2() const SAL_OVERRIDE; - virtual ScSingleRefData* GetSingleRef2() SAL_OVERRIDE; - virtual const ScComplexRefData* GetDoubleRef() const SAL_OVERRIDE; - virtual ScComplexRefData* GetDoubleRef() SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScExternalDoubleRefToken(*this); } + virtual sal_uInt16 GetIndex() const override; + virtual svl::SharedString GetString() const override; + virtual const ScSingleRefData* GetSingleRef() const override; + virtual ScSingleRefData* GetSingleRef() override; + virtual const ScSingleRefData* GetSingleRef2() const override; + virtual ScSingleRefData* GetSingleRef2() override; + virtual const ScComplexRefData* GetDoubleRef() const override; + virtual ScComplexRefData* GetDoubleRef() override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScExternalDoubleRefToken(*this); } }; class ScExternalNameToken : public formula::FormulaToken @@ -202,10 +202,10 @@ public: ScExternalNameToken( const ScExternalNameToken& r ); virtual ~ScExternalNameToken(); - virtual sal_uInt16 GetIndex() const SAL_OVERRIDE; - virtual svl::SharedString GetString() const SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScExternalNameToken(*this); } + virtual sal_uInt16 GetIndex() const override; + virtual svl::SharedString GetString() const override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScExternalNameToken(*this); } }; /** Special token to remember details of ocTableRef "structured references". */ @@ -229,11 +229,11 @@ public: ScTableRefToken( const ScTableRefToken& r ); virtual ~ScTableRefToken(); - virtual sal_uInt16 GetIndex() const SAL_OVERRIDE; - virtual void SetIndex( sal_uInt16 n ) SAL_OVERRIDE; - virtual bool IsGlobal() const SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScTableRefToken(*this); } + virtual sal_uInt16 GetIndex() const override; + virtual void SetIndex( sal_uInt16 n ) override; + virtual bool IsGlobal() const override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScTableRefToken(*this); } Item GetItem() const; void AddItem( Item ); @@ -262,9 +262,9 @@ public: ScJumpMatrixToken( const ScJumpMatrixToken& r ) : FormulaToken( r ), pJumpMatrix( r.pJumpMatrix ) {} virtual ~ScJumpMatrixToken(); - virtual ScJumpMatrix* GetJumpMatrix() const SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScJumpMatrixToken(*this); } + virtual ScJumpMatrix* GetJumpMatrix() const override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScJumpMatrixToken(*this); } }; // Only created from within the interpreter, no conversion from ScRawToken, @@ -278,10 +278,10 @@ public: FormulaToken( formula::svRefList ) {} ScRefListToken( const ScRefListToken & r ) : FormulaToken( r ), aRefList( r.aRefList ) {} - virtual const ScRefList* GetRefList() const SAL_OVERRIDE; - virtual ScRefList* GetRefList() SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScRefListToken(*this); } + virtual const ScRefList* GetRefList() const override; + virtual ScRefList* GetRefList() override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScRefListToken(*this); } }; class SC_DLLPUBLIC ScEmptyCellToken : public formula::FormulaToken @@ -299,10 +299,10 @@ public: bDisplayedAsString( r.bDisplayedAsString ) {} bool IsInherited() const { return bInherited; } bool IsDisplayedAsString() const { return bDisplayedAsString; } - virtual double GetDouble() const SAL_OVERRIDE; - virtual svl::SharedString GetString() const SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScEmptyCellToken(*this); } + virtual double GetDouble() const override; + virtual svl::SharedString GetString() const override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScEmptyCellToken(*this); } }; /** Transports the result from the interpreter to the formula cell. */ @@ -310,7 +310,7 @@ class SC_DLLPUBLIC ScMatrixCellResultToken : public formula::FormulaToken { // No non-const access implemented, silence down unxsols4 complaining about // the public GetMatrix() hiding the one from FormulaToken. - virtual ScMatrix* GetMatrix() SAL_OVERRIDE; + virtual ScMatrix* GetMatrix() override; protected: ScConstMatrixRef xMatrix; @@ -319,11 +319,11 @@ public: ScMatrixCellResultToken( const ScConstMatrixRef& pMat, formula::FormulaToken* pUL ); ScMatrixCellResultToken( const ScMatrixCellResultToken& r ); virtual ~ScMatrixCellResultToken(); - virtual double GetDouble() const SAL_OVERRIDE; - virtual svl::SharedString GetString() const SAL_OVERRIDE; - virtual const ScMatrix* GetMatrix() const SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE; + virtual double GetDouble() const override; + virtual svl::SharedString GetString() const override; + virtual const ScMatrix* GetMatrix() const override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override; formula::StackVar GetUpperLeftType() const { return xUpperLeft ? @@ -347,8 +347,8 @@ public: ScMatrixFormulaCellToken( const ScMatrixFormulaCellToken& r ); virtual ~ScMatrixFormulaCellToken(); - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScMatrixFormulaCellToken(*this); } + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScMatrixFormulaCellToken(*this); } void SetMatColsRows( SCCOL nC, SCROW nR ) { nRows = nR; @@ -401,11 +401,11 @@ public: double f, const svl::SharedString & rStr, const OUString & rFormula ); const OUString& GetFormula() const { return maFormula; } - virtual double GetDouble() const SAL_OVERRIDE; + virtual double GetDouble() const override; - virtual svl::SharedString GetString() const SAL_OVERRIDE; - virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScHybridCellToken(*this); } + virtual svl::SharedString GetString() const override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new ScHybridCellToken(*this); } }; // Simplify argument passing to RefUpdate methods with ScSingleRefToken or diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index b4b81288f457..1644264fdc0f 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -87,9 +87,9 @@ public: virtual bool AddFormulaToken( const css::sheet::FormulaToken& rToken, svl::SharedStringPool& rSPool, - formula::ExternalReferenceHelper* _pRef) SAL_OVERRIDE; - virtual void CheckToken( const formula::FormulaToken& r ) SAL_OVERRIDE; - virtual formula::FormulaToken* AddOpCode( OpCode eCode ) SAL_OVERRIDE; + formula::ExternalReferenceHelper* _pRef) override; + virtual void CheckToken( const formula::FormulaToken& r ) override; + virtual formula::FormulaToken* AddOpCode( OpCode eCode ) override; /** ScSingleRefToken with ocPush. */ formula::FormulaToken* AddSingleReference( const ScSingleRefData& rRef ); /** ScSingleRefOpToken with ocMatRef. */ @@ -103,7 +103,7 @@ public: formula::FormulaToken* AddMatrix( const ScMatrixRef& p ); /** ScSingleRefOpToken with ocColRowName. */ formula::FormulaToken* AddColRowName( const ScSingleRefData& rRef ); - virtual formula::FormulaToken* MergeArray( ) SAL_OVERRIDE; + virtual formula::FormulaToken* MergeArray( ) override; /** Merge very last SingleRef+ocRange+SingleRef combination into DoubleRef and adjust pCode array, or do nothing if conditions not met. diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index 6dd75aad1ff3..f643aeaa4dd4 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -70,67 +70,67 @@ public: ScFormulaParserObj(ScDocShell* pDocSh); virtual ~ScFormulaParserObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XFormulaParser virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL parseFormula( const OUString& aFormula, const ::com::sun::star::table::CellAddress& rReferencePos ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens, const ::com::sun::star::table::CellAddress& rReferencePos ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; class ScFormulaOpCodeMapperObj : public formula::FormulaOpCodeMapperObj diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx index a855e9994e9b..ba5a93538f29 100644 --- a/sc/inc/undorangename.hxx +++ b/sc/inc/undorangename.hxx @@ -28,11 +28,11 @@ public: virtual ~ScUndoAllRangeNames(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; + virtual OUString GetComment() const override; private: void DoChange(const boost::ptr_map<OUString, ScRangeName>& rNames); @@ -50,11 +50,11 @@ public: virtual ~ScUndoAddRangeData(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; + virtual OUString GetComment() const override; private: ScRangeData* mpRangeData; diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index 86e5a7af5a6b..bed2070d7ea4 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -56,7 +56,7 @@ public: explicit ScDrawObjData(); private: - virtual ScDrawObjData* Clone( SdrObject* pObj ) const SAL_OVERRIDE; + virtual ScDrawObjData* Clone( SdrObject* pObj ) const override; }; class ScIMapInfo : public SdrObjUserData @@ -69,7 +69,7 @@ public: ScIMapInfo( const ScIMapInfo& rIMapInfo ); virtual ~ScIMapInfo(); - virtual SdrObjUserData* Clone( SdrObject* pObj ) const SAL_OVERRIDE; + virtual SdrObjUserData* Clone( SdrObject* pObj ) const override; void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; } const ImageMap& GetImageMap() const { return aImageMap; } @@ -81,7 +81,7 @@ public: ScMacroInfo(); virtual ~ScMacroInfo(); - virtual SdrObjUserData* Clone( SdrObject* pObj ) const SAL_OVERRIDE; + virtual SdrObjUserData* Clone( SdrObject* pObj ) const override; void SetMacro( const OUString& rMacro ) { maMacro = rMacro; } const OUString& GetMacro() const { return maMacro; } diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index 4076b2179e0a..f27bf34bb862 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -96,7 +96,7 @@ public: ScValidationData* Clone() const // real copy { return new ScValidationData( GetDocument(), *this ); } - ScValidationData* Clone(ScDocument* pNew) const SAL_OVERRIDE + ScValidationData* Clone(ScDocument* pNew) const override { return new ScValidationData( pNew, *this ); } void ResetInput(); diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index cab92c05c5a3..b623e9c72811 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -120,8 +120,8 @@ public: ScTpViewItem( const ScTpViewItem& rItem ); virtual ~ScTpViewItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const ScViewOptions& GetViewOptions() const { return theOptions; } diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index f4d3afede272..4e919b52153e 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -73,57 +73,57 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XViewPane - virtual sal_Int32 SAL_CALL getFirstVisibleColumn() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getFirstVisibleColumn() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getFirstVisibleRow() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getFirstVisibleRow() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getVisibleRange() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XCellRangeReferrer virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL - getReferredCells() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getReferredCells() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XFormLayerAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isFormDesignMode( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XControlAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; // ScViewPaneObj for direct use (including OWeakObject) @@ -136,9 +136,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; }; // OWeakObject is base of SfxBaseController -> use ScViewPaneBase @@ -213,9 +213,9 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; void SelectionChanged(); void VisAreaChanged(); @@ -233,17 +233,17 @@ public: virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; //! XPrintable? @@ -251,7 +251,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -259,157 +259,157 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XSpreadsheetView virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > SAL_CALL - getActiveSheet() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getActiveSheet() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setActiveSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >& xActiveSheet ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XEnhancedMouseClickBroadcaster virtual void SAL_CALL addEnhancedMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEnhancedMouseClickHandler >& aListener ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeEnhancedMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEnhancedMouseClickHandler >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; //XActivationBroadcaster virtual void SAL_CALL addActivationEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XActivationEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeActivationEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XActivationEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XViewSplitable - virtual sal_Bool SAL_CALL getIsWindowSplit() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSplitHorizontal() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSplitVertical() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getIsWindowSplit() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSplitHorizontal() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSplitVertical() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSplitColumn() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getSplitRow() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XViewFreezable - virtual sal_Bool SAL_CALL hasFrozenPanes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasFrozenPanes() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XRangeSelection virtual void SAL_CALL startRangeSelection( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL abortRangeSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL abortRangeSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRangeSelectionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeRangeSelectionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionChangeListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); static ScTabViewObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XTransferableSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XSelectedSheetsSupplier virtual ::com::sun::star::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; }; class ScPreviewObj : public SfxBaseController, @@ -423,16 +423,16 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; - virtual void Notify(SfxBroadcaster&, const SfxHint& rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster&, const SfxHint& rHint) override; // XSelectedSheetsSupplier virtual ::com::sun::star::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx index 8dd0e8249df0..1151070b0e29 100644 --- a/sc/qa/extras/htmlexporttest.cxx +++ b/sc/qa/extras/htmlexporttest.cxx @@ -57,13 +57,13 @@ public: ScHTMLExportTest() {} - virtual void setUp() SAL_OVERRIDE + virtual void setUp() override { test::BootstrapFixture::setUp(); mxDesktop.set(css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory()))); } - virtual void tearDown() SAL_OVERRIDE + virtual void tearDown() override { if (mxComponent.is()) mxComponent->dispose(); diff --git a/sc/qa/extras/new_cond_format.cxx b/sc/qa/extras/new_cond_format.cxx index 375b23ad1f56..8dc111bacf5e 100644 --- a/sc/qa/extras/new_cond_format.cxx +++ b/sc/qa/extras/new_cond_format.cxx @@ -32,8 +32,8 @@ class ScConditionalFormatTest : public CalcUnoApiTest public: ScConditionalFormatTest(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; uno::Reference< uno::XInterface > init(sal_Int32 nIndex = 0); void testRequestCondFormatListFromSheet(); diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index 8f2433912cb5..85316528b211 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -31,11 +31,11 @@ class ScAnnontationObj : public CalcUnoApiTest, apitest::XSheetAnnotation public: ScAnnontationObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; - virtual uno::Reference< sheet::XSheetAnnotation> getAnnotation(table::CellAddress&) SAL_OVERRIDE; + virtual uno::Reference< uno::XInterface > init() override; + virtual uno::Reference< sheet::XSheetAnnotation> getAnnotation(table::CellAddress&) override; CPPUNIT_TEST_SUITE(ScAnnontationObj); CPPUNIT_TEST(testGetPosition); diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx index 07d3d80e368f..8f0c16e823fc 100644 --- a/sc/qa/extras/scannotationshapeobj.cxx +++ b/sc/qa/extras/scannotationshapeobj.cxx @@ -29,10 +29,10 @@ class ScAnnotationShapeObj : public CalcUnoApiTest, apitest::XText public: ScAnnotationShapeObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; - virtual uno::Reference<uno::XInterface> init() SAL_OVERRIDE; - virtual uno::Reference<text::XTextContent> getTextContent() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; + virtual uno::Reference<uno::XInterface> init() override; + virtual uno::Reference<text::XTextContent> getTextContent() override; CPPUNIT_TEST_SUITE(ScAnnotationShapeObj); diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index e011ac0eaf78..109c0654b08c 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -27,11 +27,11 @@ class ScAnnontationsObj : public CalcUnoApiTest, apitest::XSheetAnnotations public: ScAnnontationsObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; - virtual uno::Reference< sheet::XSheetAnnotations > getAnnotations(long nIndex) SAL_OVERRIDE; + virtual uno::Reference< uno::XInterface > init() override; + virtual uno::Reference< sheet::XSheetAnnotations > getAnnotations(long nIndex) override; CPPUNIT_TEST_SUITE(ScAnnontationsObj); CPPUNIT_TEST(testInsertNew); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 058967618fbe..2757f6260269 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -31,10 +31,10 @@ class ScCellRangeObj : public CalcUnoApiTest, apitest::XCellRangesQuery, apitest public: ScCellRangeObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; - virtual uno::Reference< uno::XInterface > getXCellRangeData() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; + virtual uno::Reference< uno::XInterface > init() override; + virtual uno::Reference< uno::XInterface > getXCellRangeData() override; CPPUNIT_TEST_SUITE(ScCellRangeObj); CPPUNIT_TEST(testQueryColumnDifference); diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx index 4dd558bec98b..2868b8a11365 100644 --- a/sc/qa/extras/sccondformats.cxx +++ b/sc/qa/extras/sccondformats.cxx @@ -36,8 +36,8 @@ class ScConditionalFormatTest : public CalcUnoApiTest public: ScConditionalFormatTest(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; uno::Reference< uno::XInterface > init(); void testCondFormat(); diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index a25b1ffe4eac..f6aca7abdf89 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -25,10 +25,10 @@ namespace sc_apitest { class ScDatabaseRangeObj : public CalcUnoApiTest, apitest::XDatabaseRange { public: - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init( const OUString& rDBName ) SAL_OVERRIDE; + virtual uno::Reference< uno::XInterface > init( const OUString& rDBName ) override; ScDatabaseRangeObj(); diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index cad8aa7297aa..d2d9bd0c2c23 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -28,9 +28,9 @@ class ScDataPilotFieldObj : public CalcUnoApiTest, apitest::XDataPilotFieldGroup apitest::DataPilotField { public: - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; + virtual uno::Reference< uno::XInterface > init() override; ScDataPilotFieldObj(); diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index 9f4e0a03f711..a39a4c3635b8 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -32,11 +32,11 @@ class ScDataPilotTableObj : public CalcUnoApiTest, apitest::XDataPilotDescriptor public: ScDataPilotTableObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; - virtual uno::Reference< uno::XInterface > initDP2() SAL_OVERRIDE; - virtual uno::Reference< uno::XInterface > getSheets() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; + virtual uno::Reference< uno::XInterface > init() override; + virtual uno::Reference< uno::XInterface > initDP2() override; + virtual uno::Reference< uno::XInterface > getSheets() override; CPPUNIT_TEST_SUITE(ScDataPilotTableObj); CPPUNIT_TEST(testRefresh); diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx index 878210b7ab34..b16aaf6bc5e0 100644 --- a/sc/qa/extras/sceditfieldobj-cell.cxx +++ b/sc/qa/extras/sceditfieldobj-cell.cxx @@ -32,12 +32,12 @@ class ScEditFieldObj_Cell : public CalcUnoApiTest, apitest::XTextField, apitest: public: ScEditFieldObj_Cell(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; - virtual uno::Reference<uno::XInterface> init() SAL_OVERRIDE; - virtual uno::Reference<text::XTextContent> getTextContent() SAL_OVERRIDE; - virtual uno::Reference<text::XTextRange> getTextRange() SAL_OVERRIDE; - virtual bool isAttachSupported() SAL_OVERRIDE { return true; } + virtual void setUp() override; + virtual void tearDown() override; + virtual uno::Reference<uno::XInterface> init() override; + virtual uno::Reference<text::XTextContent> getTextContent() override; + virtual uno::Reference<text::XTextRange> getTextRange() override; + virtual bool isAttachSupported() override { return true; } void testEditFieldProperties(); diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx index c72befda1dfd..d55663923dbf 100644 --- a/sc/qa/extras/sceditfieldobj-header.cxx +++ b/sc/qa/extras/sceditfieldobj-header.cxx @@ -35,12 +35,12 @@ class ScEditFieldObj_Header : public CalcUnoApiTest, apitest::XTextContent, apit public: ScEditFieldObj_Header(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; - virtual uno::Reference<uno::XInterface> init() SAL_OVERRIDE; - virtual uno::Reference<text::XTextContent> getTextContent() SAL_OVERRIDE; - virtual uno::Reference<text::XTextRange> getTextRange() SAL_OVERRIDE; - virtual bool isAttachSupported() SAL_OVERRIDE { return false; } + virtual void setUp() override; + virtual void tearDown() override; + virtual uno::Reference<uno::XInterface> init() override; + virtual uno::Reference<text::XTextContent> getTextContent() override; + virtual uno::Reference<text::XTextRange> getTextRange() override; + virtual bool isAttachSupported() override { return false; } CPPUNIT_TEST_SUITE(ScEditFieldObj_Header); diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index bb04af931bfe..dbddb106f532 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/extras/scmodelobj.cxx @@ -20,10 +20,10 @@ namespace sc_apitest { class ScModelObj : public UnoApiTest, apitest::XGoalSeek { public: - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; + virtual uno::Reference< uno::XInterface > init() override; ScModelObj(); diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index da6e331ac1b8..20dfa517bb61 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -29,11 +29,11 @@ class ScNamedRangeObj : public CalcUnoApiTest, apitest::XNamedRange, apitest::XN public: ScNamedRangeObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; - virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName) SAL_OVERRIDE; + virtual uno::Reference< uno::XInterface > init() override; + virtual uno::Reference< sheet::XNamedRange > getNamedRange(const OUString& rRangeName) override; CPPUNIT_TEST_SUITE(ScNamedRangeObj); CPPUNIT_TEST(testGetContent); diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index d3eb0f379253..a5371e2c3654 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -24,10 +24,10 @@ namespace sc_apitest { class ScNamedRangesObj : public CalcUnoApiTest, apitest::XNamedRanges { public: - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheet) SAL_OVERRIDE; + virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheet) override; ScNamedRangesObj(); diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx index cd27392d0346..b275a57f2676 100644 --- a/sc/qa/extras/scoutlineobj.cxx +++ b/sc/qa/extras/scoutlineobj.cxx @@ -25,10 +25,10 @@ class ScOutlineObj : public CalcUnoApiTest, apitest::XSheetOutline public: ScOutlineObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; + virtual uno::Reference< uno::XInterface > init() override; CPPUNIT_TEST_SUITE(ScOutlineObj); CPPUNIT_TEST(testHideDetail); diff --git a/sc/qa/extras/scstyleloaderobj.cxx b/sc/qa/extras/scstyleloaderobj.cxx index e79e445bba80..7e8d576bd2d8 100644 --- a/sc/qa/extras/scstyleloaderobj.cxx +++ b/sc/qa/extras/scstyleloaderobj.cxx @@ -25,13 +25,13 @@ class ScStyleLoaderObj : public CalcUnoApiTest, apitest::XStyleLoader public: ScStyleLoaderObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; - virtual uno::Reference< lang::XComponent > getTargetComponent() SAL_OVERRIDE; - virtual uno::Reference< lang::XComponent > getSourceComponent() SAL_OVERRIDE; - virtual OUString getTestURL() SAL_OVERRIDE; + virtual uno::Reference< uno::XInterface > init() override; + virtual uno::Reference< lang::XComponent > getTargetComponent() override; + virtual uno::Reference< lang::XComponent > getSourceComponent() override; + virtual OUString getTestURL() override; CPPUNIT_TEST_SUITE(ScStyleLoaderObj); CPPUNIT_TEST(testLoadStylesFromURL); diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index fd9aa7671d06..f13efd2b845f 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -26,10 +26,10 @@ class ScTableSheetObj : public CalcUnoApiTest, apitest::XSearchable, apitest::XR public: ScTableSheetObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; + virtual uno::Reference< uno::XInterface > init() override; CPPUNIT_TEST_SUITE(ScTableSheetObj); CPPUNIT_TEST(testFindAll); diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index 6fdeacebdc6f..a71192c462b1 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -26,8 +26,8 @@ class ScTableSheetsObj : public CalcUnoApiTest, public ::apitest::XSpreadsheets2 public: ScTableSheetsObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; CPPUNIT_TEST_SUITE(ScTableSheetsObj); CPPUNIT_TEST(testImportedSheetNameAndIndex); @@ -43,10 +43,10 @@ public: CPPUNIT_TEST(testRemoveByName); CPPUNIT_TEST_SUITE_END(); - virtual uno::Reference< lang::XComponent > getComponent() SAL_OVERRIDE; - virtual void createFileURL(const OUString& rFileBase, OUString& rFileURL) SAL_OVERRIDE; - virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString& rString) SAL_OVERRIDE; - virtual uno::Reference< uno::XInterface > init() SAL_OVERRIDE; + virtual uno::Reference< lang::XComponent > getComponent() override; + virtual void createFileURL(const OUString& rFileBase, OUString& rFileURL) override; + virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString& rString) override; + virtual uno::Reference< uno::XInterface > init() override; protected: static uno::Reference< lang::XComponent > mxComponent; static sal_Int32 nTest; diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx index 41632d0ff8a1..b15fa4b34f20 100644 --- a/sc/qa/perf/scperfobj.cxx +++ b/sc/qa/perf/scperfobj.cxx @@ -49,8 +49,8 @@ public: ScPerfObj(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; uno::Reference< uno::XInterface > init(const OUString& aFileName); diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx index a6a30abc09b7..1c83f8ae3ffe 100644 --- a/sc/qa/unit/bugfix-test.cxx +++ b/sc/qa/unit/bugfix-test.cxx @@ -75,8 +75,8 @@ public: ScFiltersTest(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; void testTdf64229(); void testTdf36933(); diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx index 73259e649ed8..1cd559beb904 100644 --- a/sc/qa/unit/copy_paste_test.cxx +++ b/sc/qa/unit/copy_paste_test.cxx @@ -28,8 +28,8 @@ class ScCopyPasteTest : public ScBootstrapFixture public: ScCopyPasteTest(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; void testCopyPasteXLS(); diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 7c4fb339760a..1f90e7a24a59 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -53,12 +53,12 @@ class ScFiltersTest public: ScFiltersTest(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; virtual bool load( const OUString &rFilter, const OUString &rURL, const OUString &rUserData, SfxFilterFlags nFilterFlags, - SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE; + SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) override; /** * Ensure CVEs remain unbroken */ diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 17b0e1198ecf..5bc34e3ba9de 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -60,12 +60,12 @@ public: */ void enableOpenCL(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; virtual bool load( const OUString &rFilter, const OUString &rURL, const OUString &rUserData, SfxFilterFlags nFilterFlags, - SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE; + SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) override; void testSharedFormulaXLS(); #if 0 void testSharedFormulaXLSGroundWater(); diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx index 6430fef64865..b22ca7cf0f35 100644 --- a/sc/qa/unit/rangelst_test.cxx +++ b/sc/qa/unit/rangelst_test.cxx @@ -23,8 +23,8 @@ public: { } - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; void testDeleteArea_4Ranges(); void testDeleteArea_3Ranges(); diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 7fe0a69b6d8f..6b1f60e1964f 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -76,12 +76,12 @@ using namespace ::com::sun::star::uno; class ScExportTest : public ScBootstrapFixture, XmlTestTools { protected: - virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) SAL_OVERRIDE; + virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override; public: ScExportTest(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; #if !defined MACOSX && !defined DRAGONFLY ScDocShellRef saveAndReloadPassword( ScDocShell*, const OUString&, const OUString&, const OUString&, SfxFilterFlags ); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 2bc98075c234..dbafbf7d1553 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -92,10 +92,10 @@ public: virtual bool load( const OUString &rFilter, const OUString &rURL, const OUString &rUserData, SfxFilterFlags nFilterFlags, - SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE; + SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) override; - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; //ods, xls, xlsx filter tests void testBooleanFormatXLSX(); diff --git a/sc/qa/unit/test_ScChartListenerCollection.cxx b/sc/qa/unit/test_ScChartListenerCollection.cxx index 427dc4d2145b..fccf3f0ddc62 100644 --- a/sc/qa/unit/test_ScChartListenerCollection.cxx +++ b/sc/qa/unit/test_ScChartListenerCollection.cxx @@ -49,7 +49,7 @@ struct MockedHiddenRangeListener : public ScChartHiddenRangeListener { : mNotifyCount(0) { } - void notify() SAL_OVERRIDE { + void notify() override { mNotifyCount++; } }; diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx index 53482ca4dab5..9e9a934f8a7f 100644 --- a/sc/qa/unit/ucalc.hxx +++ b/sc/qa/unit/ucalc.hxx @@ -95,8 +95,8 @@ public: ScDocShell& getDocShell(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; /** * Basic performance regression test. Pick some actions that *should* take diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 897737ec5b65..c346f73b19f4 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -33,7 +33,7 @@ public: ScFormulaListener(ScFormulaCell* pCell); virtual ~ScFormulaListener(); - void Notify( const SfxHint& rHint ) SAL_OVERRIDE; + void Notify( const SfxHint& rHint ) override; bool NeedsRepaint() const; }; diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 04eedf75b24b..fbbaf70dcc69 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -2269,7 +2269,7 @@ public: virtual ~UpdateRefGroupBoundChecker() {} - virtual void processSharedTop( ScFormulaCell** ppCells, size_t /*nRow*/, size_t /*nLength*/ ) SAL_OVERRIDE + virtual void processSharedTop( ScFormulaCell** ppCells, size_t /*nRow*/, size_t /*nLength*/ ) override { // Check its tokens and record its reference boundaries. ScFormulaCell& rCell = **ppCells; @@ -2290,7 +2290,7 @@ public: virtual ~UpdateRefExpandGroupBoundChecker() {} - virtual void processSharedTop( ScFormulaCell** ppCells, size_t /*nRow*/, size_t /*nLength*/ ) SAL_OVERRIDE + virtual void processSharedTop( ScFormulaCell** ppCells, size_t /*nRow*/, size_t /*nLength*/ ) override { // Check its tokens and record its reference boundaries. ScFormulaCell& rCell = **ppCells; @@ -2309,12 +2309,12 @@ public: virtual ~FormulaGroupPicker() {} - virtual void processNonShared( ScFormulaCell* pCell, size_t nRow ) SAL_OVERRIDE + virtual void processNonShared( ScFormulaCell* pCell, size_t nRow ) override { mrGroups.push_back(sc::FormulaGroupEntry(pCell, nRow)); } - virtual void processSharedTop( ScFormulaCell** ppCells, size_t nRow, size_t nLength ) SAL_OVERRIDE + virtual void processSharedTop( ScFormulaCell** ppCells, size_t nRow, size_t nLength ) override { mrGroups.push_back(sc::FormulaGroupEntry(ppCells, nRow, nLength)); } diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index 8b6009df4b05..b9db4df8375e 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -160,12 +160,12 @@ class ScriptTypeAggregator : public sc::ColumnSpanSet::Action public: ScriptTypeAggregator(ScDocument& rDoc) : mrDoc(rDoc), mnScriptType(SvtScriptType::NONE) {} - virtual void startColumn(SCTAB nTab, SCCOL nCol) SAL_OVERRIDE + virtual void startColumn(SCTAB nTab, SCCOL nCol) override { mrDoc.InitColumnBlockPosition(maBlockPos, nTab, nCol); } - virtual void execute(const ScAddress& rPos, SCROW nLength, bool bVal) SAL_OVERRIDE + virtual void execute(const ScAddress& rPos, SCROW nLength, bool bVal) override { if (!bVal) return; diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 221c1d6f612c..5711c45e7de3 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -2651,12 +2651,12 @@ class BroadcastAction : public sc::ColumnSpanSet::ColumnAction public: BroadcastAction( ScDocument& rDoc ) : mrDoc(rDoc), mpCol(NULL) {} - virtual void startColumn( ScColumn* pCol ) SAL_OVERRIDE + virtual void startColumn( ScColumn* pCol ) override { mpCol = pCol; } - virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) SAL_OVERRIDE + virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) override { if (!bVal) return; diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index 96b47b089f34..a8ad62db3ba4 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -58,8 +58,8 @@ class ScDPGroupNumFilter : public ScDPFilteredCache::FilterBase public: ScDPGroupNumFilter(const std::vector<ScDPItemData>& rValues, const ScDPNumGroupInfo& rInfo); virtual ~ScDPGroupNumFilter() {} - virtual bool match(const ScDPItemData &rCellData) const SAL_OVERRIDE; - virtual std::vector<ScDPItemData> getMatchValues() const SAL_OVERRIDE; + virtual bool match(const ScDPItemData &rCellData) const override; + virtual std::vector<ScDPItemData> getMatchValues() const override; private: std::vector<ScDPItemData> maValues; ScDPNumGroupInfo maNumInfo; @@ -117,8 +117,8 @@ public: ScDPGroupDateFilter( const std::vector<ScDPItemData>& rValues, const Date& rNullDate, const ScDPNumGroupInfo& rNumInfo); - virtual bool match(const ScDPItemData & rCellData) const SAL_OVERRIDE; - virtual std::vector<ScDPItemData> getMatchValues() const SAL_OVERRIDE; + virtual bool match(const ScDPItemData & rCellData) const override; + virtual std::vector<ScDPItemData> getMatchValues() const override; private: std::vector<ScDPItemData> maValues; diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 757f274956ff..316a8780ceee 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -124,12 +124,12 @@ public: bool isValid() const; - virtual void getValue(long nCol, ScDPItemData &rData, short& rNumType) const SAL_OVERRIDE; - virtual OUString getColumnLabel(long nCol) const SAL_OVERRIDE; - virtual long getColumnCount() const SAL_OVERRIDE; - virtual bool first() SAL_OVERRIDE; - virtual bool next() SAL_OVERRIDE; - virtual void finish() SAL_OVERRIDE; + virtual void getValue(long nCol, ScDPItemData &rData, short& rNumType) const override; + virtual OUString getColumnLabel(long nCol) const override; + virtual long getColumnCount() const override; + virtual bool first() override; + virtual bool next() override; + virtual void finish() override; }; DBConnector::DBConnector(ScDPCache& rCache, const uno::Reference<sdbc::XRowSet>& xRowSet, const Date& rNullDate) : diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index ecc6b45f3327..12c7c0dce6ee 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -446,7 +446,7 @@ struct CaseInsensitiveNamePredicate : svl::StyleSheetPredicate } bool - Check(const SfxStyleSheetBase& rStyleSheet) SAL_OVERRIDE + Check(const SfxStyleSheetBase& rStyleSheet) override { if (rStyleSheet.GetFamily() == mFamily) { diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index df81cfd9ca6e..159f945b1ebe 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -134,7 +134,7 @@ struct SetRowHeightOnlyFunc : public OptimalHeightsFuncObjBase mpTab(pTab) {} - virtual bool operator() (SCROW nStartRow, SCROW nEndRow, sal_uInt16 nHeight) SAL_OVERRIDE + virtual bool operator() (SCROW nStartRow, SCROW nEndRow, sal_uInt16 nHeight) override { mpTab->SetRowHeightOnly(nStartRow, nEndRow, nHeight); return false; @@ -153,7 +153,7 @@ struct SetRowHeightRangeFunc : public OptimalHeightsFuncObjBase mnPPTY(nPPTY) {} - virtual bool operator() (SCROW nStartRow, SCROW nEndRow, sal_uInt16 nHeight) SAL_OVERRIDE + virtual bool operator() (SCROW nStartRow, SCROW nEndRow, sal_uInt16 nHeight) override { return mpTab->SetRowHeightRange(nStartRow, nEndRow, nHeight, mnPPTX, mnPPTY); } diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 706e0e593ab5..a95dd68c0094 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -848,12 +848,12 @@ public: FormulaCellCollectAction( std::vector<ScFormulaCell*>& rCells ) : mrCells(rCells), mpCol(NULL) {} - virtual void startColumn( ScColumn* pCol ) SAL_OVERRIDE + virtual void startColumn( ScColumn* pCol ) override { mpCol = pCol; } - virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) SAL_OVERRIDE + virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) override { assert(mpCol); @@ -879,12 +879,12 @@ public: maStartCxt(rDoc, mpPosSet), maEndCxt(rDoc, mpPosSet) {} - virtual void startColumn( ScColumn* pCol ) SAL_OVERRIDE + virtual void startColumn( ScColumn* pCol ) override { mpCol = pCol; } - virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) SAL_OVERRIDE + virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) override { assert(mpCol); diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx index 962898d22fed..b3591d109820 100644 --- a/sc/source/core/inc/addinlis.hxx +++ b/sc/source/core/inc/addinlis.hxx @@ -68,21 +68,21 @@ public: // XResultListener virtual void SAL_CALL modified( const ::com::sun::star::sheet::ResultEvent& aEvent ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SC_SOURCE_CORE_INC_ADDINLIS_HXX diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx index 978b3ab636b2..4b147086c27c 100644 --- a/sc/source/core/inc/ddelink.hxx +++ b/sc/source/core/inc/ddelink.hxx @@ -60,10 +60,10 @@ public: // SvBaseLink override: virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; + const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; // SvtBroadcaster override: - virtual void ListenersGone() SAL_OVERRIDE; + virtual void ListenersGone() override; // for interpreter: diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 7208be736d5a..5b68cbea6d04 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -98,9 +98,9 @@ public: const ScRange& getRange() const { return maRange;} - virtual SCCOL getColSize() const SAL_OVERRIDE; - virtual SCROW getRowSize() const SAL_OVERRIDE; - virtual SCSIZE getVisibleDataCellCount() const SAL_OVERRIDE; + virtual SCCOL getColSize() const override; + virtual SCROW getRowSize() const override; + virtual SCSIZE getVisibleDataCellCount() const override; /** * Get a string value of a specified cell position. Note that the @@ -110,9 +110,9 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual OUString getString(SCCOL nCol, SCROW nRow) const SAL_OVERRIDE; + virtual OUString getString(SCCOL nCol, SCROW nRow) const override; - virtual SCCOL getFirstFieldColumn() const SAL_OVERRIDE; + virtual SCCOL getFirstFieldColumn() const override; /** * Get a <i>0-based</i> column index that corresponds with the passed field * index. Note that the field index passed as the 1st parameter is @@ -122,10 +122,10 @@ public: * * @return 0-based column index */ - virtual SCCOL findFieldColumn(SCCOL nIndex) const SAL_OVERRIDE; - virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const SAL_OVERRIDE; - virtual std::unique_ptr<ScDBQueryParamBase> createQueryParam(const ScDBRangeBase* pQueryRef) const SAL_OVERRIDE; - virtual bool isRangeEqual(const ScRange& rRange) const SAL_OVERRIDE; + virtual SCCOL findFieldColumn(SCCOL nIndex) const override; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const override; + virtual std::unique_ptr<ScDBQueryParamBase> createQueryParam(const ScDBRangeBase* pQueryRef) const override; + virtual bool isRangeEqual(const ScRange& rRange) const override; private: ScRange maRange; @@ -137,9 +137,9 @@ public: explicit ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat); virtual ~ScDBExternalRange(); - virtual SCCOL getColSize() const SAL_OVERRIDE; - virtual SCROW getRowSize() const SAL_OVERRIDE; - virtual SCSIZE getVisibleDataCellCount() const SAL_OVERRIDE; + virtual SCCOL getColSize() const override; + virtual SCROW getRowSize() const override; + virtual SCSIZE getVisibleDataCellCount() const override; /** * Get a string value of a specified cell position. Note that the @@ -149,9 +149,9 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual OUString getString(SCCOL nCol, SCROW nRow) const SAL_OVERRIDE; + virtual OUString getString(SCCOL nCol, SCROW nRow) const override; - virtual SCCOL getFirstFieldColumn() const SAL_OVERRIDE; + virtual SCCOL getFirstFieldColumn() const override; /** * Get a <i>0-based</i> column index that corresponds with the passed field @@ -162,10 +162,10 @@ public: * * @return 0-based column index */ - virtual SCCOL findFieldColumn(SCCOL nIndex) const SAL_OVERRIDE; - virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const SAL_OVERRIDE; - virtual std::unique_ptr<ScDBQueryParamBase> createQueryParam(const ScDBRangeBase* pQueryRef) const SAL_OVERRIDE; - virtual bool isRangeEqual(const ScRange& rRange) const SAL_OVERRIDE; + virtual SCCOL findFieldColumn(SCCOL nIndex) const override; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const override; + virtual std::unique_ptr<ScDBQueryParamBase> createQueryParam(const ScDBRangeBase* pQueryRef) const override; + virtual bool isRangeEqual(const ScRange& rRange) const override; private: const ScMatrixRef mpMatrix; diff --git a/sc/source/core/inc/formulagroupcl.hxx b/sc/source/core/inc/formulagroupcl.hxx index 441250c06807..b65ff3067548 100644 --- a/sc/source/core/inc/formulagroupcl.hxx +++ b/sc/source/core/inc/formulagroupcl.hxx @@ -20,11 +20,11 @@ public: FormulaGroupInterpreterOpenCL(); virtual ~FormulaGroupInterpreterOpenCL(); - virtual ScMatrixRef inverseMatrix( const ScMatrix& rMat ) SAL_OVERRIDE; + virtual ScMatrixRef inverseMatrix( const ScMatrix& rMat ) override; virtual CompiledFormula* createCompiledFormula( - ScFormulaCellGroup& rGroup, ScTokenArray& rCode ) SAL_OVERRIDE; + ScFormulaCellGroup& rGroup, ScTokenArray& rCode ) override; virtual bool interpret( ScDocument& rDoc, const ScAddress& rTopPos, - ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode ) SAL_OVERRIDE; + ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode ) override; }; }} // namespace sc::opencl diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index d8d586137264..50190ad16277 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -256,19 +256,19 @@ public: FormulaTreeNodeRef ft ) : DynamicKernelArgument(config, s, ft) { } /// Generate declaration - virtual void GenDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDecl( std::stringstream& ss ) const override { ss << "unsigned " << mSymName; } - virtual void GenDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDeclRef( std::stringstream& ss ) const override { ss << GenSlidingWindowDeclRef(); } - virtual void GenSlidingWindowDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenSlidingWindowDecl( std::stringstream& ss ) const override { GenDecl(ss); } - virtual std::string GenSlidingWindowDeclRef( bool = false ) const SAL_OVERRIDE + virtual std::string GenSlidingWindowDeclRef( bool = false ) const override { std::stringstream ss; if (GetFormulaToken()->GetType() != formula::svString) @@ -277,12 +277,12 @@ public: ss << Tok->GetString().getString().toAsciiUpperCase().hashCode() << "U"; return ss.str(); } - virtual size_t GetWindowSize() const SAL_OVERRIDE + virtual size_t GetWindowSize() const override { return 1; } /// Pass the 32-bit hash of the string to the kernel - virtual size_t Marshal( cl_kernel k, int argno, int, cl_program ) SAL_OVERRIDE + virtual size_t Marshal( cl_kernel k, int argno, int, cl_program ) override { FormulaToken* ref = mFormulaTree->GetFormulaToken(); cl_uint hashCode = 0; @@ -313,25 +313,25 @@ public: FormulaTreeNodeRef ft ) : DynamicKernelArgument(config, s, ft) { } /// Generate declaration - virtual void GenDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDecl( std::stringstream& ss ) const override { ss << "double " << mSymName; } - virtual void GenDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDeclRef( std::stringstream& ss ) const override { ss << mSymName; } - virtual void GenSlidingWindowDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenSlidingWindowDecl( std::stringstream& ss ) const override { GenDecl(ss); } - virtual std::string GenSlidingWindowDeclRef( bool = false ) const SAL_OVERRIDE + virtual std::string GenSlidingWindowDeclRef( bool = false ) const override { if (GetFormulaToken()->GetType() != formula::svDouble) throw Unhandled(); return mSymName; } - virtual size_t GetWindowSize() const SAL_OVERRIDE + virtual size_t GetWindowSize() const override { return 1; } @@ -343,7 +343,7 @@ public: return Tok->GetDouble(); } /// Create buffer and pass the buffer to a given kernel - virtual size_t Marshal( cl_kernel k, int argno, int, cl_program ) SAL_OVERRIDE + virtual size_t Marshal( cl_kernel k, int argno, int, cl_program ) override { double tmp = GetDouble(); // Pass the scalar result back to the rest of the formula kernel @@ -362,28 +362,28 @@ public: FormulaTreeNodeRef ft ) : DynamicKernelArgument(config, s, ft) { } /// Generate declaration - virtual void GenDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDecl( std::stringstream& ss ) const override { ss << "double " << mSymName; } - virtual void GenDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDeclRef( std::stringstream& ss ) const override { ss << "3.14159265358979"; } - virtual void GenSlidingWindowDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenSlidingWindowDecl( std::stringstream& ss ) const override { GenDecl(ss); } - virtual std::string GenSlidingWindowDeclRef( bool = false ) const SAL_OVERRIDE + virtual std::string GenSlidingWindowDeclRef( bool = false ) const override { return mSymName; } - virtual size_t GetWindowSize() const SAL_OVERRIDE + virtual size_t GetWindowSize() const override { return 1; } /// Create buffer and pass the buffer to a given kernel - virtual size_t Marshal( cl_kernel k, int argno, int, cl_program ) SAL_OVERRIDE + virtual size_t Marshal( cl_kernel k, int argno, int, cl_program ) override { double tmp = 0.0; // Pass the scalar result back to the rest of the formula kernel @@ -402,23 +402,23 @@ public: FormulaTreeNodeRef ft ) : DynamicKernelArgument(config, s, ft) { } /// Generate declaration - virtual void GenDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDecl( std::stringstream& ss ) const override { ss << "double " << mSymName; } - virtual void GenDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDeclRef( std::stringstream& ss ) const override { ss << mSymName; } - virtual void GenSlidingWindowDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenSlidingWindowDecl( std::stringstream& ss ) const override { ss << "int " << mSymName; } - virtual std::string GenSlidingWindowDeclRef( bool = false ) const SAL_OVERRIDE + virtual std::string GenSlidingWindowDeclRef( bool = false ) const override { return mSymName + "_Random(" + mSymName + ")"; } - virtual void GenSlidingWindowFunction( std::stringstream& ss ) SAL_OVERRIDE + virtual void GenSlidingWindowFunction( std::stringstream& ss ) override { // This string is from the pi_opencl_kernel.i file as // generated when building the Random123 examples. Unused @@ -743,12 +743,12 @@ threefry2x32 (threefry2x32_ctr_t in, threefry2x32_key_t k)\n\ }\n\ "; } - virtual size_t GetWindowSize() const SAL_OVERRIDE + virtual size_t GetWindowSize() const override { return 1; } /// Create buffer and pass the buffer to a given kernel - virtual size_t Marshal( cl_kernel k, int argno, int, cl_program ) SAL_OVERRIDE + virtual size_t Marshal( cl_kernel k, int argno, int, cl_program ) override { cl_int seed = comphelper::rng::uniform_int_distribution(0, SAL_MAX_INT32); // Pass the scalar result back to the rest of the formula kernel @@ -768,17 +768,17 @@ public: FormulaTreeNodeRef ft, int index = 0 ) : VectorRef(config, s, ft, index) { } - virtual void GenSlidingWindowFunction( std::stringstream& ) SAL_OVERRIDE { } + virtual void GenSlidingWindowFunction( std::stringstream& ) override { } /// Generate declaration - virtual void GenDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDecl( std::stringstream& ss ) const override { ss << "__global unsigned int *" << mSymName; } - virtual void GenSlidingWindowDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenSlidingWindowDecl( std::stringstream& ss ) const override { DynamicKernelStringArgument::GenDecl(ss); } - virtual size_t Marshal( cl_kernel, int, int, cl_program ) SAL_OVERRIDE; + virtual size_t Marshal( cl_kernel, int, int, cl_program ) override; }; /// Marshal a string vector reference @@ -877,36 +877,36 @@ public: DynamicKernelMixedArgument( const ScCalcConfig& config, const std::string& s, FormulaTreeNodeRef ft ) : VectorRef(config, s, ft), mStringArgument(config, s + "s", ft) { } - virtual void GenSlidingWindowDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenSlidingWindowDecl( std::stringstream& ss ) const override { VectorRef::GenSlidingWindowDecl(ss); ss << ", "; mStringArgument.GenSlidingWindowDecl(ss); } - virtual bool IsMixedArgument() const SAL_OVERRIDE { return true;} - virtual void GenSlidingWindowFunction( std::stringstream& ) SAL_OVERRIDE { } + virtual bool IsMixedArgument() const override { return true;} + virtual void GenSlidingWindowFunction( std::stringstream& ) override { } /// Generate declaration - virtual void GenDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDecl( std::stringstream& ss ) const override { VectorRef::GenDecl(ss); ss << ", "; mStringArgument.GenDecl(ss); } - virtual void GenDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDeclRef( std::stringstream& ss ) const override { VectorRef::GenDeclRef(ss); ss << ","; mStringArgument.GenDeclRef(ss); } - virtual void GenNumDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenNumDeclRef( std::stringstream& ss ) const override { VectorRef::GenSlidingWindowDecl(ss); } - virtual void GenStringDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenStringDeclRef( std::stringstream& ss ) const override { mStringArgument.GenSlidingWindowDecl(ss); } - virtual std::string GenSlidingWindowDeclRef( bool nested ) const SAL_OVERRIDE + virtual std::string GenSlidingWindowDeclRef( bool nested ) const override { std::stringstream ss; ss << "(!isNan(" << VectorRef::GenSlidingWindowDeclRef(); @@ -915,19 +915,19 @@ public: ss << ")"; return ss.str(); } - virtual std::string GenDoubleSlidingWindowDeclRef( bool = false ) const SAL_OVERRIDE + virtual std::string GenDoubleSlidingWindowDeclRef( bool = false ) const override { std::stringstream ss; ss << VectorRef::GenSlidingWindowDeclRef(); return ss.str(); } - virtual std::string GenStringSlidingWindowDeclRef( bool = false ) const SAL_OVERRIDE + virtual std::string GenStringSlidingWindowDeclRef( bool = false ) const override { std::stringstream ss; ss << mStringArgument.GenSlidingWindowDeclRef(); return ss.str(); } - virtual size_t Marshal( cl_kernel k, int argno, int vw, cl_program p ) SAL_OVERRIDE + virtual size_t Marshal( cl_kernel k, int argno, int vw, cl_program p ) override { int i = VectorRef::Marshal(k, argno, vw, p); i += mStringArgument.Marshal(k, argno + i, vw, p); @@ -1140,27 +1140,27 @@ public: VectorRef(config, s, ft), mDoubleArgument(mCalcConfig, s, ft, CodeGen, index), mStringArgument(mCalcConfig, s + "s", ft, CodeGen, index) { } - virtual void GenSlidingWindowDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenSlidingWindowDecl( std::stringstream& ss ) const override { mDoubleArgument.GenSlidingWindowDecl(ss); ss << ", "; mStringArgument.GenSlidingWindowDecl(ss); } - virtual void GenSlidingWindowFunction( std::stringstream& ) SAL_OVERRIDE { } + virtual void GenSlidingWindowFunction( std::stringstream& ) override { } /// Generate declaration - virtual void GenDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDecl( std::stringstream& ss ) const override { mDoubleArgument.GenDecl(ss); ss << ", "; mStringArgument.GenDecl(ss); } - virtual void GenDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDeclRef( std::stringstream& ss ) const override { mDoubleArgument.GenDeclRef(ss); ss << ","; mStringArgument.GenDeclRef(ss); } - virtual std::string GenSlidingWindowDeclRef( bool nested ) const SAL_OVERRIDE + virtual std::string GenSlidingWindowDeclRef( bool nested ) const override { std::stringstream ss; ss << "(!isNan(" << mDoubleArgument.GenSlidingWindowDeclRef(); @@ -1169,28 +1169,28 @@ public: ss << ")"; return ss.str(); } - virtual bool IsMixedArgument() const SAL_OVERRIDE { return true;} - virtual std::string GenDoubleSlidingWindowDeclRef( bool = false ) const SAL_OVERRIDE + virtual bool IsMixedArgument() const override { return true;} + virtual std::string GenDoubleSlidingWindowDeclRef( bool = false ) const override { std::stringstream ss; ss << mDoubleArgument.GenSlidingWindowDeclRef(); return ss.str(); } - virtual std::string GenStringSlidingWindowDeclRef( bool = false ) const SAL_OVERRIDE + virtual std::string GenStringSlidingWindowDeclRef( bool = false ) const override { std::stringstream ss; ss << mStringArgument.GenSlidingWindowDeclRef(); return ss.str(); } - virtual void GenNumDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenNumDeclRef( std::stringstream& ss ) const override { mDoubleArgument.GenDeclRef(ss); } - virtual void GenStringDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenStringDeclRef( std::stringstream& ss ) const override { mStringArgument.GenDeclRef(ss); } - virtual size_t Marshal( cl_kernel k, int argno, int vw, cl_program p ) SAL_OVERRIDE + virtual size_t Marshal( cl_kernel k, int argno, int vw, cl_program p ) override { int i = mDoubleArgument.Marshal(k, argno, vw, p); i += mStringArgument.Marshal(k, argno + i, vw, p); @@ -1683,7 +1683,7 @@ public: } virtual void GenSlidingWindowFunction( std::stringstream& ss, - const std::string& sSymName, SubArguments& vSubArguments ) SAL_OVERRIDE + const std::string& sSymName, SubArguments& vSubArguments ) override { ss << "\ndouble " << sSymName; ss << "_" << BinFuncName() << "("; @@ -1790,8 +1790,8 @@ public: ss << ";\n}"; } virtual bool isAverage() const { return false; } - virtual bool takeString() const SAL_OVERRIDE { return false; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + virtual bool takeString() const override { return false; } + virtual bool takeNumeric() const override { return true; } }; // Strictly binary operators @@ -1799,7 +1799,7 @@ class Binary : public SlidingFunctionBase { public: virtual void GenSlidingWindowFunction( std::stringstream& ss, - const std::string& sSymName, SubArguments& vSubArguments ) SAL_OVERRIDE + const std::string& sSymName, SubArguments& vSubArguments ) override { ss << "\ndouble " << sSymName; ss << "_" << BinFuncName() << "("; @@ -1817,15 +1817,15 @@ public: vSubArguments[1]->GenSlidingWindowDeclRef()) << ";\n\t"; ss << "return tmp;\n}"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + virtual bool takeString() const override { return true; } + virtual bool takeNumeric() const override { return true; } }; class SumOfProduct : public SlidingFunctionBase { public: virtual void GenSlidingWindowFunction( std::stringstream& ss, - const std::string& sSymName, SubArguments& vSubArguments ) SAL_OVERRIDE + const std::string& sSymName, SubArguments& vSubArguments ) override { size_t nCurWindowSize = 0; FormulaToken* tmpCur = NULL; @@ -2020,8 +2020,8 @@ public: ss << "return tmp;\n"; ss << "}"; } - virtual bool takeString() const SAL_OVERRIDE { return false; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + virtual bool takeString() const override { return false; } + virtual bool takeNumeric() const override { return true; } }; /// operator traits @@ -2030,12 +2030,12 @@ class OpNop : public Reduction public: OpNop( int nResultSize ) : Reduction(nResultSize) {} - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& ) const override { return lhs; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "nop"; } + virtual std::string BinFuncName() const override { return "nop"; } }; class OpCount : public Reduction @@ -2043,66 +2043,66 @@ class OpCount : public Reduction public: OpCount( int nResultSize ) : Reduction(nResultSize) {} - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { std::stringstream ss; ss << "(isNan(" << lhs << ")?" << rhs << ":" << rhs << "+1.0)"; return ss.str(); } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "fcount"; } + virtual std::string BinFuncName() const override { return "fcount"; } }; class OpEqual : public Binary { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { std::stringstream ss; ss << "strequal(" << lhs << "," << rhs << ")"; return ss.str(); } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "eq"; } + virtual std::string BinFuncName() const override { return "eq"; } }; class OpLessEqual : public Binary { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { std::stringstream ss; ss << "(" << lhs << "<=" << rhs << ")"; return ss.str(); } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "leq"; } + virtual std::string BinFuncName() const override { return "leq"; } }; class OpLess : public Binary { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { std::stringstream ss; ss << "(" << lhs << "<" << rhs << ")"; return ss.str(); } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "less"; } + virtual std::string BinFuncName() const override { return "less"; } }; class OpGreater : public Binary { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { std::stringstream ss; ss << "(" << lhs << ">" << rhs << ")"; return ss.str(); } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "gt"; } + virtual std::string BinFuncName() const override { return "gt"; } }; class OpSum : public Reduction @@ -2110,14 +2110,14 @@ class OpSum : public Reduction public: OpSum( int nResultSize ) : Reduction(nResultSize) {} - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { std::stringstream ss; ss << "((" << lhs << ")+(" << rhs << "))"; return ss.str(); } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "fsum"; } + virtual std::string BinFuncName() const override { return "fsum"; } }; class OpAverage : public Reduction @@ -2125,15 +2125,15 @@ class OpAverage : public Reduction public: OpAverage( int nResultSize ) : Reduction(nResultSize) {} - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { std::stringstream ss; ss << "fsum_count(" << lhs << "," << rhs << ", &nCount)"; return ss.str(); } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "fsum"; } - virtual bool isAverage() const SAL_OVERRIDE { return true; } + virtual std::string BinFuncName() const override { return "fsum"; } + virtual bool isAverage() const override { return true; } }; class OpSub : public Reduction @@ -2141,12 +2141,12 @@ class OpSub : public Reduction public: OpSub( int nResultSize ) : Reduction(nResultSize) {} - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { return lhs + "-" + rhs; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "fsub"; } + virtual std::string BinFuncName() const override { return "fsub"; } }; class OpMul : public Reduction @@ -2154,13 +2154,13 @@ class OpMul : public Reduction public: OpMul( int nResultSize ) : Reduction(nResultSize) {} - virtual std::string GetBottom() SAL_OVERRIDE { return "1"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "1"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { return lhs + "*" + rhs; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "fmul"; } - virtual bool ZeroReturnZero() SAL_OVERRIDE { return true; } + virtual std::string BinFuncName() const override { return "fmul"; } + virtual bool ZeroReturnZero() override { return true; } }; /// Technically not a reduction, but fits the framework. @@ -2169,14 +2169,14 @@ class OpDiv : public Reduction public: OpDiv( int nResultSize ) : Reduction(nResultSize) {} - virtual std::string GetBottom() SAL_OVERRIDE { return "1.0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "1.0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { return "(" + rhs + "==0 ? CreateDoubleError(errDivisionByZero) : (" + lhs + "/" + rhs + ") )"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "fdiv"; } + virtual std::string BinFuncName() const override { return "fdiv"; } - virtual bool HandleNaNArgument( std::stringstream& ss, unsigned argno, SubArguments& vSubArguments ) const SAL_OVERRIDE + virtual bool HandleNaNArgument( std::stringstream& ss, unsigned argno, SubArguments& vSubArguments ) const override { if (argno == 1) { @@ -2208,12 +2208,12 @@ class OpMin : public Reduction public: OpMin( int nResultSize ) : Reduction(nResultSize) {} - virtual std::string GetBottom() SAL_OVERRIDE { return "MAXFLOAT"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "MAXFLOAT"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { return "fmin(" + lhs + "," + rhs + ")"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "min"; } + virtual std::string BinFuncName() const override { return "min"; } }; class OpMax : public Reduction @@ -2221,23 +2221,23 @@ class OpMax : public Reduction public: OpMax( int nResultSize ) : Reduction(nResultSize) {} - virtual std::string GetBottom() SAL_OVERRIDE { return "-MAXFLOAT"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "-MAXFLOAT"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { return "fmax(" + lhs + "," + rhs + ")"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "max"; } + virtual std::string BinFuncName() const override { return "max"; } }; class OpSumProduct : public SumOfProduct { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const SAL_OVERRIDE + virtual std::string GetBottom() override { return "0"; } + virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) const override { return lhs + "*" + rhs; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "fsop"; } + virtual std::string BinFuncName() const override { return "fsop"; } }; namespace { struct SumIfsArgs @@ -2260,7 +2260,7 @@ public: SlidingFunctionBase* pCodeGen, int nResultSize ); /// Create buffer and pass the buffer to a given kernel - virtual size_t Marshal( cl_kernel k, int argno, int nVectorWidth, cl_program pProgram ) SAL_OVERRIDE + virtual size_t Marshal( cl_kernel k, int argno, int nVectorWidth, cl_program pProgram ) override { unsigned i = 0; for (SubArgumentsType::iterator it = mvSubArguments.begin(), e = mvSubArguments.end(); it != e; @@ -2427,13 +2427,13 @@ public: return i; } - virtual void GenSlidingWindowFunction( std::stringstream& ss ) SAL_OVERRIDE + virtual void GenSlidingWindowFunction( std::stringstream& ss ) override { for (size_t i = 0; i < mvSubArguments.size(); i++) mvSubArguments[i]->GenSlidingWindowFunction(ss); mpCodeGen->GenSlidingWindowFunction(ss, mSymName, mvSubArguments); } - virtual void GenDeclRef( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDeclRef( std::stringstream& ss ) const override { for (size_t i = 0; i < mvSubArguments.size(); i++) { @@ -2442,7 +2442,7 @@ public: mvSubArguments[i]->GenDeclRef(ss); } } - virtual void GenDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenDecl( std::stringstream& ss ) const override { for (SubArgumentsType::const_iterator it = mvSubArguments.begin(), e = mvSubArguments.end(); it != e; ++it) @@ -2453,7 +2453,7 @@ public: } } - virtual size_t GetWindowSize() const SAL_OVERRIDE + virtual size_t GetWindowSize() const override { size_t nCurWindowSize = 0; for (size_t i = 0; i < mvSubArguments.size(); i++) @@ -2466,7 +2466,7 @@ public: } /// When declared as input to a sliding window function - virtual void GenSlidingWindowDecl( std::stringstream& ss ) const SAL_OVERRIDE + virtual void GenSlidingWindowDecl( std::stringstream& ss ) const override { for (SubArgumentsType::const_iterator it = mvSubArguments.begin(), e = mvSubArguments.end(); it != e; ++it) @@ -2478,7 +2478,7 @@ public: } /// Generate either a function call to each children /// or directly inline it if we are already inside a loop - virtual std::string GenSlidingWindowDeclRef( bool nested = false ) const SAL_OVERRIDE + virtual std::string GenSlidingWindowDeclRef( bool nested = false ) const override { std::stringstream ss; if (!nested) @@ -2512,7 +2512,7 @@ public: } return ss.str(); } - virtual std::string DumpOpName() const SAL_OVERRIDE + virtual std::string DumpOpName() const override { std::string t = "_" + mpCodeGen->BinFuncName(); for (size_t i = 0; i < mvSubArguments.size(); i++) @@ -2520,7 +2520,7 @@ public: return t; } virtual void DumpInlineFun( std::set<std::string>& decls, - std::set<std::string>& funs ) const SAL_OVERRIDE + std::set<std::string>& funs ) const override { mpCodeGen->BinInlineFun(decls, funs); for (size_t i = 0; i < mvSubArguments.size(); i++) diff --git a/sc/source/core/opencl/op_addin.hxx b/sc/source/core/opencl/op_addin.hxx index c092eebd9daf..11d6eb77f2cc 100644 --- a/sc/source/core/opencl/op_addin.hxx +++ b/sc/source/core/opencl/op_addin.hxx @@ -18,15 +18,15 @@ class OpBesselj: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Besselj"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Besselj"; } }; class OpGestep: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gestep"; } + const std::string &sSymName, SubArguments &vSubArguments) override;; + virtual std::string BinFuncName() const override { return "Gestep"; } }; }} diff --git a/sc/source/core/opencl/op_array.hxx b/sc/source/core/opencl/op_array.hxx index e8d76bef9696..b9c5ca191f77 100644 --- a/sc/source/core/opencl/op_array.hxx +++ b/sc/source/core/opencl/op_array.hxx @@ -18,24 +18,24 @@ class OpSumX2MY2: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumX2MY2"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "SumX2MY2"; } }; class OpSumX2PY2: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumX2PY2"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "SumX2PY2"; } }; class OpSumXMY2: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumXMY2"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "SumXMY2"; } }; }} diff --git a/sc/source/core/opencl/op_database.hxx b/sc/source/core/opencl/op_database.hxx index 30a41618d395..f246332598f1 100644 --- a/sc/source/core/opencl/op_database.hxx +++ b/sc/source/core/opencl/op_database.hxx @@ -18,88 +18,88 @@ class OpDmax: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dmax"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Dmax"; } }; class OpDmin: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dmin"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Dmin"; } }; class OpDproduct: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dproduct"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Dproduct"; } }; class OpDaverage: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Daverage"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Daverage"; } }; class OpDstdev: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dstdev"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Dstdev"; } }; class OpDstdevp: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dstdevp"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Dstdevp"; } }; class OpDsum: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dsum"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Dsum"; } }; class OpDvar: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dvar"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Dvar"; } }; class OpDvarp: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dvarp"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Dvarp"; } }; class OpDcount: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dcount"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Dcount"; } }; class OpDcount2: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dcount2"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Dcount2"; } }; }} diff --git a/sc/source/core/opencl/op_financial.hxx b/sc/source/core/opencl/op_financial.hxx index b64d2ee86eee..32466f3a427b 100644 --- a/sc/source/core/opencl/op_financial.hxx +++ b/sc/source/core/opencl/op_financial.hxx @@ -18,232 +18,232 @@ class RRI: public SlidingFunctionBase { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual bool takeString() const SAL_OVERRIDE { return false; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual bool takeString() const override { return false; } + virtual bool takeNumeric() const override { return true; } }; class OpRRI:public RRI { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "RRI"; } + virtual std::string GetBottom() override { return "0"; } + virtual std::string BinFuncName() const override { return "RRI"; } }; class OpNominal: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "NOMINAL_ADD"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "NOMINAL_ADD"; } }; class OpDollarde:public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dollarde"; } + virtual std::string BinFuncName() const override { return "Dollarde"; } }; class OpDollarfr:public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dollarfr"; } + virtual std::string BinFuncName() const override { return "Dollarfr"; } }; class OpDISC: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "DISC"; } + virtual std::string BinFuncName() const override { return "DISC"; } }; class OpINTRATE: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "INTRATE"; } + virtual std::string BinFuncName() const override { return "INTRATE"; } }; class OpFV: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments& vSubArguments) override; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ) SAL_OVERRIDE; + std::set<std::string>& ) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { + virtual std::string BinFuncName() const override { return "FV"; } }; class OpIPMT: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments& vSubArguments) override; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ) SAL_OVERRIDE; + std::set<std::string>& ) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { + virtual std::string BinFuncName() const override { return "IPMT"; } }; class OpISPMT: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ISPMT"; } + virtual std::string BinFuncName() const override { return "ISPMT"; } }; class OpDuration: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments& vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Duration"; } + virtual std::string BinFuncName() const override { return "Duration"; } }; class OpDuration_ADD: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments& vSubArguments) override; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ) SAL_OVERRIDE; + std::set<std::string>& ) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { + virtual std::string BinFuncName() const override { return "Duration_ADD"; } }; class OpMDuration: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments& vSubArguments) override; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ) SAL_OVERRIDE; + std::set<std::string>& ) override; - virtual std::string BinFuncName() const SAL_OVERRIDE {return "MDuration"; } + virtual std::string BinFuncName() const override {return "MDuration"; } }; class Fvschedule: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; }; class Cumipmt: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class IRR: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; }; class OpIRR: public IRR { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "IRR"; } + virtual std::string GetBottom() override { return "0"; } + virtual std::string BinFuncName() const override { return "IRR"; } }; class XNPV: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; }; class PriceMat: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpSYD: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SYD"; } + virtual std::string BinFuncName() const override { return "SYD"; } }; class MIRR: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; }; class OpEffective:public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Effect_Add"; } + virtual std::string BinFuncName() const override { return "Effect_Add"; } }; class OpCumipmt: public Cumipmt { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cumipmt"; } + virtual std::string GetBottom() override { return "0"; } + virtual std::string BinFuncName() const override { return "Cumipmt"; } }; class OpXNPV: public XNPV { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "XNPV"; } + virtual std::string GetBottom() override { return "0"; } + virtual std::string BinFuncName() const override { return "XNPV"; } }; @@ -251,170 +251,170 @@ class OpTbilleq: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "fTbilleq"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName() const override { return "fTbilleq"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpCumprinc: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "cumprinc"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "cumprinc"; } }; class OpAccrintm: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string GetBottom() override { return "0"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Accrintm"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Accrintm"; } }; class OpAccrint: public Normal { public: - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Accrint"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Accrint"; } }; class OpYield: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yield"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Yield"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpSLN: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SLN"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "SLN"; } }; class OpFvschedule: public Fvschedule { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fvschedule"; } + virtual std::string GetBottom() override { return "0"; } + virtual std::string BinFuncName() const override { return "Fvschedule"; } }; class OpYieldmat: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yieldmat"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Yieldmat"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpPMT: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "PMT"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "PMT"; } }; class OpNPV: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "NPV"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "NPV"; } }; class OpPrice: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Price"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "Price"; } }; class OpNper: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "NPER"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "NPER"; } }; class OpOddlprice: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; virtual void BinInlineFun(std::set<std::string>&, - std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Oddlprice"; } + std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "Oddlprice"; } }; class OpOddlyield: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Oddlyield"; } + std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "Oddlyield"; } }; class OpPriceDisc: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; virtual void BinInlineFun(std::set<std::string>&, - std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "PriceDisc"; } + std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "PriceDisc"; } }; class OpPPMT: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "PPMT"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "PPMT"; } }; class OpCoupdaybs:public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() override { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdaybs"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "Coupdaybs"; } }; class OpCoupdays:public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() override { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdays";} + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "Coupdays";} }; class OpCoupdaysnc:public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() override { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdaysnc"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "Coupdaysnc"; } }; @@ -422,9 +422,9 @@ class OpCouppcd:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Couppcd"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "Couppcd"; } }; @@ -432,147 +432,147 @@ class OpCoupncd:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupncd"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "Coupncd"; } }; class OpCoupnum:public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() override { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupnum"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "Coupnum"; } }; class OpDDB:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "DDB"; } + virtual std::string BinFuncName() const override { return "DDB"; } }; class OpDB:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "DB"; } + virtual std::string BinFuncName() const override { return "DB"; } }; class OpAmordegrc:public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() override { return "0";} virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Amordegrc"; } + const std::string &sSymName, SubArguments& vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "Amordegrc"; } }; class OpAmorlinc:public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() override { return "0";} virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Amorlinc"; } + const std::string &sSymName, SubArguments& vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "Amorlinc"; } }; class OpReceived:public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Received"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Received"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpYielddisc: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yielddisc"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Yielddisc"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpTbillprice: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "fTbillprice"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "fTbillprice"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpPriceMat:public PriceMat { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "PriceMat"; } + virtual std::string GetBottom() override { return "0"; } + virtual std::string BinFuncName() const override { return "PriceMat"; } }; class RATE: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpIntrate: public RATE { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "rate"; } + virtual std::string GetBottom() override { return "0"; } + virtual std::string BinFuncName() const override { return "rate"; } }; class OpTbillyield: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "fTbillyield"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName() const override { return "fTbillyield"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpMIRR: public MIRR { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "MIRR"; } + virtual std::string GetBottom() override { return "0"; } + virtual std::string BinFuncName() const override { return "MIRR"; } }; class OpPV: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "PV"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "PV"; } }; class OpVDB: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "VDB"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName() const override { return "VDB"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpXirr: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Xirr"; } + virtual std::string BinFuncName() const override { return "Xirr"; } }; }} diff --git a/sc/source/core/opencl/op_logical.hxx b/sc/source/core/opencl/op_logical.hxx index db29889cc815..aad16cb68e48 100644 --- a/sc/source/core/opencl/op_logical.hxx +++ b/sc/source/core/opencl/op_logical.hxx @@ -18,37 +18,37 @@ class OpAnd: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "And"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "And"; } }; class OpOr: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Or"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Or"; } }; class OpNot: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Not"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Not"; } }; class OpXor: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Xor"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Xor"; } }; class OpIf:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "IF"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "IF"; } }; }} diff --git a/sc/source/core/opencl/op_math.hxx b/sc/source/core/opencl/op_math.hxx index 6cb1eab34a79..d4bc6bd9ffb4 100644 --- a/sc/source/core/opencl/op_math.hxx +++ b/sc/source/core/opencl/op_math.hxx @@ -18,49 +18,49 @@ class OpCos: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cos"; } + virtual std::string BinFuncName() const override { return "Cos"; } }; class OpSec: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sec"; } + virtual std::string BinFuncName() const override { return "Sec"; } }; class OpSecH: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SecH"; } + virtual std::string BinFuncName() const override { return "SecH"; } }; class OpMROUND: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "MROUND"; } + virtual std::string BinFuncName() const override { return "MROUND"; } }; class OpCsc: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Csc"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Csc"; } }; class OpSumIfs: public CheckVariables { public: OpSumIfs(): CheckVariables(), mNeedReductionKernel(false) {} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumIfs"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "SumIfs"; } bool NeedReductionKernel() const { return mNeedReductionKernel; } protected: bool mNeedReductionKernel; @@ -69,429 +69,429 @@ class OpCosh: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cosh"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "Cosh"; } }; class OpSinh: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sinh"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Sinh"; } }; class OpSin: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sin"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Sin"; } }; class OpAbs:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScAbs"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScAbs"; } }; class OpArcCos:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACos"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScACos"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; }; class OpArcCosHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "1.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACosH"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "1.0"; } + virtual std::string BinFuncName() const override { return "ScACosH"; } }; class OpTan: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Tan"; } + virtual std::string BinFuncName() const override { return "Tan"; } }; class OpTanH: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "TanH"; } + virtual std::string BinFuncName() const override { return "TanH"; } }; class OpSqrt: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sqrt"; } + virtual std::string BinFuncName() const override { return "Sqrt"; } }; class OpArcCot:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACot"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScACot"; } }; class OpArcCotHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "2.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACotH"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "2.0"; } + virtual std::string BinFuncName() const override { return "ScACotH"; } }; class OpArcSin:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScASin"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScASin"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; }; class OpArcSinHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScASinH"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScASinH"; } }; class OpTrunc: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Trunc"; } + virtual std::string BinFuncName() const override { return "Trunc"; } }; class OpArcTan2:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATan2"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScATan2"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; }; class OpArcTan:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATan"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScATan"; } }; class OpArcTanH:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATanH"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScATanH"; } }; class OpBitAnd:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitAnd"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScBitAnd"; } }; class OpBitOr:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitOr"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScBitOr"; } }; class OpBitXor:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitXor"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScBitXor"; } }; class OpBitLshift:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitLshift"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScBitLshift"; } }; class OpBitRshift:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitRshift"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScBitRshift"; } }; class OpLn: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Ln"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Ln"; } }; class OpRound: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Round"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Round"; } }; class OpRoundUp: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "RoundUp"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "RoundUp"; } }; class OpRoundDown: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "RoundDown"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "RoundDown"; } }; class OpInt: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Int"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Int"; } }; class OpRadians: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Radians"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Radians"; } }; class OpIsEven: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "IsEven"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "IsEven"; } }; class OpIsOdd: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "IsOdd"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "IsOdd"; } }; class OpCot: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cot"; } + virtual std::string BinFuncName() const override { return "Cot"; } }; class OpSumSQ: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumSQ"; } + virtual std::string BinFuncName() const override { return "SumSQ"; } }; class OpCoth: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coth"; } + std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "Coth"; } }; class OpPower: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Power"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Power"; } }; class OpOdd: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Odd"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Odd"; } }; class OpFloor: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Floor"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Floor"; } }; class OpCscH: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "CscH"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "CscH"; } }; class OpCeil:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScCeil"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScCeil"; } }; class OpExp: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Exp"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Exp"; } }; class OpLog10: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Log10"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Log10"; } }; class OpConvert: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Convert"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Convert"; } + virtual bool takeString() const override { return true; } }; class OpEven: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Even"; } + virtual std::string BinFuncName() const override { return "Even"; } }; class OpAverageIfs: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "AverageIfs"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "AverageIfs"; } }; class OpCountIfs: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "CountIfs"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "CountIfs"; } }; class OpMod: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Mod"; } + virtual std::string BinFuncName() const override { return "Mod"; } }; class OpProduct: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Product"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Product"; } }; class OpSqrtPi: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SqrtPi"; } + virtual std::string BinFuncName() const override { return "SqrtPi"; } }; class OpCombinA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Combina"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName() const override { return "Combina"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpLog: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Log"; } + virtual std::string BinFuncName() const override { return "Log"; } }; class OpCombin: public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScCombin"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "ScCombin"; } }; class OpAverageIf: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "AverageIf"; } + virtual std::string BinFuncName() const override { return "AverageIf"; } }; class OpDeg: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Degrees"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Degrees"; } }; class OpCountIf: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Countif"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Countif"; } }; class OpFact: public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fact"; } + const std::string &sSymName, SubArguments& vSubArguments) override; + virtual std::string GetBottom() override { return "0.0"; } + virtual std::string BinFuncName() const override { return "Fact"; } }; class OpSeriesSum: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SeriesSum"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "SeriesSum"; } }; class OpSumIf: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumIf"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "SumIf"; } }; class OpQuotient: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Quotient"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Quotient"; } }; class OpNegSub: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "NegSub"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "NegSub"; } }; }} diff --git a/sc/source/core/opencl/op_spreadsheet.hxx b/sc/source/core/opencl/op_spreadsheet.hxx index 190ab1dca135..00cbae368df6 100644 --- a/sc/source/core/opencl/op_spreadsheet.hxx +++ b/sc/source/core/opencl/op_spreadsheet.hxx @@ -18,8 +18,8 @@ class OpVLookup: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "VLookup"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "VLookup"; } }; }} diff --git a/sc/source/core/opencl/op_statistical.hxx b/sc/source/core/opencl/op_statistical.hxx index 0f9eb6478392..00deb73f5fb9 100644 --- a/sc/source/core/opencl/op_statistical.hxx +++ b/sc/source/core/opencl/op_statistical.hxx @@ -18,184 +18,184 @@ class OpStandard: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Standard"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Standard"; } }; class OpExponDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ExponDist"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "ExponDist"; } }; class OpVar: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Var"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Var"; } }; class OpSTEYX: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "STEYX"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "STEYX"; } }; class OpVarP: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "VarP"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "VarP"; } }; class OpZTest: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ZTest"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "ZTest"; } }; class OpStDevP: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "StDevP"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "StDevP"; } }; class OpStDev: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "StDev"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "StDev"; } }; class OpSkewp: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Skewp"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Skewp"; } }; class OpSlope: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Slope"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Slope"; } }; class OpWeibull: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Weibull"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Weibull"; } }; class OpFdist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fdist"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "Fdist"; } }; class OpTDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "TDist"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "TDist"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; }; class OpTInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "TInv"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "TInv"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; }; class OpTTest: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "TTest"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "TTest"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; }; class OpSkew: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Skew"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Skew"; } }; class OpFisher: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fisher"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Fisher"; } }; class OpFisherInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "FisherInv"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "FisherInv"; } }; class OpGamma: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gamma"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Gamma"; } }; class OpCorrel: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Correl"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Correl"; } }; class OpNegbinomdist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNegbinomdist"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpNegbinomdist"; } }; class OpPearson: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPearson"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpPearson"; } }; class OpGammaLn: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaLn"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "GammaLn"; } }; class OpGauss: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gauss"; } + std::set<std::string>& ) override; + virtual std::string BinFuncName() const override { return "Gauss"; } }; class OpGeoMean: public CheckVariables @@ -203,8 +203,8 @@ class OpGeoMean: public CheckVariables public: OpGeoMean(): CheckVariables(), mNeedReductionKernel(true) {} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "GeoMean"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "GeoMean"; } bool NeedReductionKernel() const { return mNeedReductionKernel; } protected: bool mNeedReductionKernel; @@ -214,331 +214,331 @@ class OpHarMean: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "HarMean"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "HarMean"; } }; class OpRsq: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpRsq"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpRsq"; } }; class OpNormdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormdist"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpNormdist"; } }; class OpMedian:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMedian"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpMedian"; } }; class OpNormsdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormsdist"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "OpNormsdist"; } }; class OpNorminv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNorminv"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpNorminv"; } }; class OpNormsinv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormsinv"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpNormsinv"; } }; class OpPhi:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPhi"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpPhi"; } }; class OpKurt: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Kurt"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Kurt"; } }; class OpCovar: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Covar"; } + const std::string &sSymName, SubArguments& vSubArguments) override; + virtual std::string BinFuncName() const override { return "Covar"; } }; class OpPermut:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPermut"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpPermut"; } }; class OpPermutationA:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPermutationA";} + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpPermutationA";} }; class OpConfidence: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments& vSubArguments) override; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ) SAL_OVERRIDE; + std::set<std::string>& ) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Confidence"; } + virtual std::string BinFuncName() const override { return "Confidence"; } }; class OpIntercept: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Intercept"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Intercept"; } }; class OpLogInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "LogInv"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "LogInv"; } }; class OpCritBinom: public Normal { public: - virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() override { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments& vSubArguments) override; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ) SAL_OVERRIDE; + std::set<std::string>& ) override; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "CritBinom"; } + virtual std::string BinFuncName() const override { return "CritBinom"; } }; class OpForecast: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "Forecast"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "Forecast"; } }; class OpLogNormDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "LogNormdist"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "LogNormdist"; } }; class OpGammaDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaDist"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs) override; + virtual std::string BinFuncName() const override { return "GammaDist"; } }; class OpHypGeomDist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpHypGeomDist"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpHypGeomDist"; } }; class OpChiDist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpChiDist"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "OpChiDist"; } }; class OpBinomdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpBinomdist"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "OpBinomdist"; } }; class OpChiSqDist: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ChiSqDist"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "ChiSqDist"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpChiSqInv: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "ChiSqInv"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "ChiSqInv"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) override; }; class OpChiInv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpChiInv"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "OpChiInv"; } }; class OpPoisson:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPoisson"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "OpPoisson"; } }; class OpGammaInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs -) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaInv"; } +) override; + virtual std::string BinFuncName() const override { return "GammaInv"; } }; class OpFInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs -) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "FInv"; } +) override; + virtual std::string BinFuncName() const override { return "FInv"; } }; class OpFTest: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs -) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "FTest"; } +) override; + virtual std::string BinFuncName() const override { return "FTest"; } }; class OpDevSq: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "DevSq"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "DevSq"; } }; class OpB: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs -) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "B"; } +) override; + virtual std::string BinFuncName() const override { return "B"; } }; class OpBetaDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + const std::string &sSymName, SubArguments &vSubArguments) override; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs -) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "BetaDist"; } +) override; + virtual std::string BinFuncName() const override { return "BetaDist"; } }; class OpBetainv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpBetainv"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) override; + virtual std::string BinFuncName() const override { return "OpBetainv"; } }; class OpMinA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMinA"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpMinA"; } + virtual bool takeString() const override { return true; } + virtual bool takeNumeric() const override { return true; } }; class OpCountA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpCountA"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpCountA"; } + virtual bool takeString() const override { return true; } + virtual bool takeNumeric() const override { return true; } }; class OpMaxA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMaxA"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpMaxA"; } + virtual bool takeString() const override { return true; } + virtual bool takeNumeric() const override { return true; } }; class OpVarA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpVarA"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpVarA"; } + virtual bool takeString() const override { return true; } + virtual bool takeNumeric() const override { return true; } }; class OpVarPA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpVarPA"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpVarPA"; } + virtual bool takeString() const override { return true; } + virtual bool takeNumeric() const override { return true; } }; class OpStDevPA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpStDevPA"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpStDevPA"; } + virtual bool takeString() const override { return true; } + virtual bool takeNumeric() const override { return true; } }; class OpAverageA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpAverageA"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpAverageA"; } + virtual bool takeString() const override { return true; } + virtual bool takeNumeric() const override { return true; } }; class OpStDevA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpStDevA"; } - virtual bool takeString() const SAL_OVERRIDE { return true; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "OpStDevA"; } + virtual bool takeString() const override { return true; } + virtual bool takeNumeric() const override { return true; } }; class OpAveDev: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName() const SAL_OVERRIDE { return "AveDev"; } + const std::string &sSymName, SubArguments &vSubArguments) override; + virtual std::string BinFuncName() const override { return "AveDev"; } }; }} diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx index 9a49703f7532..d308b107ac51 100644 --- a/sc/source/core/opencl/opbase.hxx +++ b/sc/source/core/opencl/opbase.hxx @@ -143,23 +143,23 @@ public: virtual ~VectorRef(); /// Generate declaration - virtual void GenDecl( std::stringstream& ss ) const SAL_OVERRIDE; + virtual void GenDecl( std::stringstream& ss ) const override; /// When declared as input to a sliding window function - virtual void GenSlidingWindowDecl( std::stringstream& ss ) const SAL_OVERRIDE; + virtual void GenSlidingWindowDecl( std::stringstream& ss ) const override; /// When referenced in a sliding window function - virtual std::string GenSlidingWindowDeclRef( bool = false ) const SAL_OVERRIDE; + virtual std::string GenSlidingWindowDeclRef( bool = false ) const override; /// Create buffer and pass the buffer to a given kernel - virtual size_t Marshal( cl_kernel, int, int, cl_program ) SAL_OVERRIDE; + virtual size_t Marshal( cl_kernel, int, int, cl_program ) override; - virtual void GenSlidingWindowFunction( std::stringstream& ) SAL_OVERRIDE; - virtual size_t GetWindowSize() const SAL_OVERRIDE; - virtual std::string DumpOpName() const SAL_OVERRIDE; - virtual void DumpInlineFun( std::set<std::string>&, std::set<std::string>& ) const SAL_OVERRIDE; + virtual void GenSlidingWindowFunction( std::stringstream& ) override; + virtual size_t GetWindowSize() const override; + virtual std::string DumpOpName() const override; + virtual void DumpInlineFun( std::set<std::string>&, std::set<std::string>& ) const override; const std::string& GetName() const; cl_mem GetCLBuffer() const; - virtual bool NeedParallelReduction() const SAL_OVERRIDE; + virtual bool NeedParallelReduction() const override; protected: // Used by marshaling @@ -202,9 +202,9 @@ class Normal : public SlidingFunctionBase { public: virtual void GenSlidingWindowFunction( std::stringstream& ss, - const std::string& sSymName, SubArguments& vSubArguments ) SAL_OVERRIDE; - virtual bool takeString() const SAL_OVERRIDE { return false; } - virtual bool takeNumeric() const SAL_OVERRIDE { return true; } + const std::string& sSymName, SubArguments& vSubArguments ) override; + virtual bool takeString() const override { return false; } + virtual bool takeNumeric() const override { return true; } }; class CheckVariables : public Normal diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 91bef3d0c2fd..425bf0c0b854 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -711,7 +711,7 @@ struct Convention_A1 : public ScCompiler::Convention ParseResult parseAnyToken( const OUString& rFormula, sal_Int32 nSrcPos, - const CharClass* pCharClass) const SAL_OVERRIDE + const CharClass* pCharClass) const override { ParseResult aRet; if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) ) @@ -726,7 +726,7 @@ struct Convention_A1 : public ScCompiler::Convention nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); } - virtual sal_uLong getCharTableFlags( sal_Unicode c, sal_Unicode /*cLast*/ ) const SAL_OVERRIDE + virtual sal_uLong getCharTableFlags( sal_Unicode c, sal_Unicode /*cLast*/ ) const override { return mpCharTable[static_cast<sal_uInt8>(c)]; } @@ -846,7 +846,7 @@ struct ConventionOOO_A1 : public Convention_A1 const OUString& rErrRef, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, bool bSingleRef, - bool /*bFromRangeName*/ ) const SAL_OVERRIDE + bool /*bFromRangeName*/ ) const override { // In case absolute/relative positions weren't separately available: // transform relative to absolute! @@ -864,7 +864,7 @@ struct ConventionOOO_A1 : public Convention_A1 } } - virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const SAL_OVERRIDE + virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const override { switch (eSymType) { @@ -879,13 +879,13 @@ struct ConventionOOO_A1 : public Convention_A1 virtual bool parseExternalName( const OUString& rSymbol, OUString& rFile, OUString& rName, const ScDocument* pDoc, - const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const SAL_OVERRIDE + const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const override { return lcl_parseExternalName(rSymbol, rFile, rName, '#', pDoc, pExternalLinks); } virtual OUString makeExternalNameStr( sal_uInt16 /*nFileId*/, const OUString& rFile, - const OUString& rName ) const SAL_OVERRIDE + const OUString& rName ) const override { return lcl_makeExternalNameStr( rFile, rName, '#', false); } @@ -937,7 +937,7 @@ struct ConventionOOO_A1 : public Convention_A1 virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, - const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE + const OUString& rTabName, const ScSingleRefData& rRef ) const override { makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabName, rRef, false); } @@ -985,7 +985,7 @@ struct ConventionOOO_A1 : public Convention_A1 virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, - const ScComplexRefData& rRef ) const SAL_OVERRIDE + const ScComplexRefData& rRef ) const override { makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabNames, rTabName, rRef, false); } @@ -1001,7 +1001,7 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 const OUString& rErrRef, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, bool bSingleRef, - bool /*bFromRangeName*/ ) const SAL_OVERRIDE + bool /*bFromRangeName*/ ) const override { rBuffer.append('['); // In case absolute/relative positions weren't separately available: @@ -1032,14 +1032,14 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 } virtual OUString makeExternalNameStr( sal_uInt16 /*nFileId*/, const OUString& rFile, - const OUString& rName ) const SAL_OVERRIDE + const OUString& rName ) const override { return lcl_makeExternalNameStr( rFile, rName, '#', true); } virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, - const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE + const OUString& rTabName, const ScSingleRefData& rRef ) const override { makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabName, rRef, true); } @@ -1047,7 +1047,7 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const std::vector<OUString>& rTabNames, - const OUString& rTabName, const ScComplexRefData& rRef ) const SAL_OVERRIDE + const OUString& rTabName, const ScComplexRefData& rRef ) const override { makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabNames, rTabName, rRef, true); } @@ -1248,7 +1248,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL const OUString& /*rErrRef*/, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, bool bSingleRef, - bool /*bFromRangeName*/ ) const SAL_OVERRIDE + bool /*bFromRangeName*/ ) const override { ScComplexRefData aRef( rRef ); @@ -1308,7 +1308,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL virtual ParseResult parseAnyToken( const OUString& rFormula, sal_Int32 nSrcPos, - const CharClass* pCharClass) const SAL_OVERRIDE + const CharClass* pCharClass) const override { parseExternalDocName(rFormula, nSrcPos); @@ -1325,27 +1325,27 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); } - virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const SAL_OVERRIDE + virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const override { return ConventionXL::getSpecialSymbol(eSymType); } virtual bool parseExternalName( const OUString& rSymbol, OUString& rFile, OUString& rName, const ScDocument* pDoc, - const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const SAL_OVERRIDE + const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const override { return ConventionXL::parseExternalName( rSymbol, rFile, rName, pDoc, pExternalLinks); } virtual OUString makeExternalNameStr( sal_uInt16 /*nFileId*/, const OUString& rFile, - const OUString& rName ) const SAL_OVERRIDE + const OUString& rName ) const override { return ConventionXL::makeExternalNameStr(rFile, rName); } virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, - const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE + const OUString& rTabName, const ScSingleRefData& rRef ) const override { // ['file:///path/to/file/filename.xls']'Sheet Name'!$A$1 // This is a little different from the format Excel uses, as Excel @@ -1363,7 +1363,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, - const ScComplexRefData& rRef ) const SAL_OVERRIDE + const ScComplexRefData& rRef ) const override { ScRange aAbsRef = rRef.toAbs(rPos); @@ -1390,7 +1390,7 @@ struct ConventionXL_OOX : public ConventionXL_A1 const OUString& rErrRef, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, bool bSingleRef, - bool bFromRangeName ) const SAL_OVERRIDE + bool bFromRangeName ) const override { // In OOXML relative references in named expressions are relative to // column 0 and row 0. Relative sheet references don't exist. @@ -1411,7 +1411,7 @@ struct ConventionXL_OOX : public ConventionXL_A1 } virtual OUString makeExternalNameStr( sal_uInt16 nFileId, const OUString& /*rFile*/, - const OUString& rName ) const SAL_OVERRIDE + const OUString& rName ) const override { // [N]!DefinedName is a workbook global name. return OUString( "[" + OUString::number(nFileId+1) + "]!" + rName ); @@ -1422,7 +1422,7 @@ struct ConventionXL_OOX : public ConventionXL_A1 * CellStr. */ } - virtual void parseExternalDocName(const OUString& rFormula, sal_Int32& rSrcPos) const SAL_OVERRIDE + virtual void parseExternalDocName(const OUString& rFormula, sal_Int32& rSrcPos) const override { sal_Int32 nLen = rFormula.getLength(); const sal_Unicode* p = rFormula.getStr(); @@ -1445,7 +1445,7 @@ struct ConventionXL_OOX : public ConventionXL_A1 virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& /*rFileName*/, - const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE + const OUString& rTabName, const ScSingleRefData& rRef ) const override { // [N]'Sheet Name'!$A$1 // Where N is a 1-based positive integer number of a file name in OOXML @@ -1461,7 +1461,7 @@ struct ConventionXL_OOX : public ConventionXL_A1 virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 nFileId, const OUString& /*rFileName*/, const std::vector<OUString>& rTabNames, const OUString& rTabName, - const ScComplexRefData& rRef ) const SAL_OVERRIDE + const ScComplexRefData& rRef ) const override { ScRange aAbsRef = rRef.toAbs(rPos); @@ -1521,7 +1521,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL const OUString& /*rErrRef*/, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, bool bSingleRef, - bool /*bFromRangeName*/ ) const SAL_OVERRIDE + bool /*bFromRangeName*/ ) const override { ScRange aAbsRef = rRef.toAbs(rPos); ScComplexRefData aRef( rRef ); @@ -1582,7 +1582,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL ParseResult parseAnyToken( const OUString& rFormula, sal_Int32 nSrcPos, - const CharClass* pCharClass) const SAL_OVERRIDE + const CharClass* pCharClass) const override { parseExternalDocName(rFormula, nSrcPos); @@ -1600,27 +1600,27 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); } - virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const SAL_OVERRIDE + virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const override { return ConventionXL::getSpecialSymbol(eSymType); } virtual bool parseExternalName( const OUString& rSymbol, OUString& rFile, OUString& rName, const ScDocument* pDoc, - const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const SAL_OVERRIDE + const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const override { return ConventionXL::parseExternalName( rSymbol, rFile, rName, pDoc, pExternalLinks); } virtual OUString makeExternalNameStr( sal_uInt16 /*nFileId*/, const OUString& rFile, - const OUString& rName ) const SAL_OVERRIDE + const OUString& rName ) const override { return ConventionXL::makeExternalNameStr(rFile, rName); } virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, - const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE + const OUString& rTabName, const ScSingleRefData& rRef ) const override { // ['file:///path/to/file/filename.xls']'Sheet Name'!$A$1 // This is a little different from the format Excel uses, as Excel @@ -1640,7 +1640,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, sal_uInt16 /*nFileId*/, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, - const ScComplexRefData& rRef ) const SAL_OVERRIDE + const ScComplexRefData& rRef ) const override { ScRange aAbsRef = rRef.toAbs(rPos); @@ -1683,7 +1683,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL r1c1_add_col(rBuffer, rRef.Ref2, aAbsRef.aEnd); } - virtual sal_uLong getCharTableFlags( sal_Unicode c, sal_Unicode cLast ) const SAL_OVERRIDE + virtual sal_uLong getCharTableFlags( sal_Unicode c, sal_Unicode cLast ) const override { sal_uLong nFlags = mpCharTable[static_cast<sal_uInt8>(c)]; if (c == '-' && cLast == '[') diff --git a/sc/source/core/tool/grouparealistener.cxx b/sc/source/core/tool/grouparealistener.cxx index 82a7204def37..02c048acc9e2 100644 --- a/sc/source/core/tool/grouparealistener.cxx +++ b/sc/source/core/tool/grouparealistener.cxx @@ -44,13 +44,13 @@ public: CollectCellAction( const FormulaGroupAreaListener& rAreaListener ) : mrAreaListener(rAreaListener) {} - virtual void startColumn( ScColumn* pCol ) SAL_OVERRIDE + virtual void startColumn( ScColumn* pCol ) override { maPos.SetTab(pCol->GetTab()); maPos.SetCol(pCol->GetCol()); } - virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) SAL_OVERRIDE + virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) override { if (!bVal) return; diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 3f04e4d9d2ab..c85edcdb94df 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -2202,7 +2202,7 @@ public: virtual ~ScGammaDistFunction() {} - double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetGammaDist(x, fAlpha, fBeta); } + double GetValue( double x ) const override { return fp - rInt.GetGammaDist(x, fAlpha, fBeta); } }; void ScInterpreter::ScGammaInv() @@ -2242,7 +2242,7 @@ public: virtual ~ScBetaDistFunction() {} - double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetBetaDist(x, fAlpha, fBeta); } + double GetValue( double x ) const override { return fp - rInt.GetBetaDist(x, fAlpha, fBeta); } }; void ScInterpreter::ScBetaInv() @@ -2298,7 +2298,7 @@ public: virtual ~ScTDistFunction() {} - double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetTDist( x, fDF, nT ); } + double GetValue( double x ) const override { return fp - rInt.GetTDist( x, fDF, nT ); } }; void ScInterpreter::ScTInv( int nType ) @@ -2344,7 +2344,7 @@ public: virtual ~ScFDistFunction() {} - double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetFDist(x, fF1, fF2); } + double GetValue( double x ) const override { return fp - rInt.GetFDist(x, fF1, fF2); } }; void ScInterpreter::ScFInv() @@ -2400,7 +2400,7 @@ public: virtual ~ScChiDistFunction() {} - double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetChiDist(x, fDF); } + double GetValue( double x ) const override { return fp - rInt.GetChiDist(x, fDF); } }; void ScInterpreter::ScChiInv() @@ -2435,7 +2435,7 @@ public: virtual ~ScChiSqDistFunction() {} - double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetChiSqDistCDF(x, fDF); } + double GetValue( double x ) const override { return fp - rInt.GetChiSqDistCDF(x, fDF); } }; void ScInterpreter::ScChiSqInv() diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index c6ae7c9ad863..68750f89fd32 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -296,13 +296,13 @@ class FuncCount : public sc::ColumnSpanSet::ColumnAction public: FuncCount() : mpCol(0), mnCount(0), mnNumFmt(0) {} - virtual void startColumn(ScColumn* pCol) SAL_OVERRIDE + virtual void startColumn(ScColumn* pCol) override { mpCol = pCol; mpCol->InitBlockPosition(maPos); } - virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) SAL_OVERRIDE + virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) override { if (!bVal) return; @@ -328,15 +328,15 @@ class FuncSum : public sc::ColumnSpanSet::ColumnAction public: FuncSum() : mpCol(0), mfSum(0.0), mnError(0), mnNumFmt(0) {} - virtual void startColumn(ScColumn* pCol) SAL_OVERRIDE + virtual void startColumn(ScColumn* pCol) override { mpCol = pCol; mpCol->InitBlockPosition(maPos); } - virtual void execute(SCROW, SCROW, bool) SAL_OVERRIDE { return; }; + virtual void execute(SCROW, SCROW, bool) override { return; }; - virtual void executeSum(SCROW nRow1, SCROW nRow2, bool bVal, double& fMem ) SAL_OVERRIDE + virtual void executeSum(SCROW nRow1, SCROW nRow2, bool bVal, double& fMem ) override { if (!bVal) return; diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 73e02d7986dc..75eff67959bd 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -119,21 +119,21 @@ private: ::osl::Mutex m_aMutex; public: // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<container::XIndexContainer>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + 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 { ::osl::MutexGuard aGuard( m_aMutex ); return ( !IdToOleNameHash.empty() ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) 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) SAL_OVERRIDE + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override { ::osl::MutexGuard aGuard( m_aMutex ); uno::Sequence< OUString > aResult( IdToOleNameHash.size() ); @@ -144,14 +144,14 @@ public: *pName = it->first; return aResult; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) 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) SAL_OVERRIDE + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -161,14 +161,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) SAL_OVERRIDE + virtual void SAL_CALL removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) 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) SAL_OVERRIDE + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) diff --git a/sc/source/filter/excel/xedbdata.cxx b/sc/source/filter/excel/xedbdata.cxx index f4c404bce93f..ff487e6963b9 100644 --- a/sc/source/filter/excel/xedbdata.cxx +++ b/sc/source/filter/excel/xedbdata.cxx @@ -22,8 +22,8 @@ public: explicit XclExpTablesImpl5( const XclExpRoot& rRoot ); virtual ~XclExpTablesImpl5(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; /** Implementation of table export for OOXML, so far dummy for BIFF8. */ @@ -33,8 +33,8 @@ public: explicit XclExpTablesImpl8( const XclExpRoot& rRoot ); virtual ~XclExpTablesImpl8(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index bea10981b99d..023afdbef584 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -57,7 +57,7 @@ public: private: /** Writes the start of the record that is equal in all EXTERNNAME records and calls WriteAddData(). */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; /** Called to write additional data following the common record contents. @descr Derived classes should overwrite this function to write their data. */ virtual void WriteAddData( XclExpStream& rStrm ); @@ -76,7 +76,7 @@ public: private: /** Writes additional record contents. */ - virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteAddData( XclExpStream& rStrm ) override; }; /** Represents an EXTERNNAME record for a DDE link. */ @@ -88,7 +88,7 @@ public: private: /** Writes additional record contents. */ - virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteAddData( XclExpStream& rStrm ) override; private: typedef std::shared_ptr< XclExpCachedMatrix > XclExpCachedMatRef; @@ -103,11 +103,11 @@ public: explicit XclExpExtName( const XclExpRoot& rRoot, const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ); - virtual void SaveXml(XclExpXmlStream& rStrm) SAL_OVERRIDE; + virtual void SaveXml(XclExpXmlStream& rStrm) override; private: /** Writes additional record contents. */ - virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteAddData( XclExpStream& rStrm ) override; private: const XclExpSupbook& mrSupbook; @@ -134,9 +134,9 @@ public: sal_uInt16 InsertExtName( const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ); /** Writes the EXTERNNAME record list. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; - virtual void SaveXml(XclExpXmlStream& rStrm) SAL_OVERRIDE; + virtual void SaveXml(XclExpXmlStream& rStrm) override; private: typedef XclExpRecordList< XclExpExtNameBase > XclExpExtNameList; @@ -165,10 +165,10 @@ public: bool InsertValue( SCCOL nScCol, SCROW nScRow, const Any& rValue ); /** Writes the row and child elements. */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; static void WriteBool( XclExpStream& rStrm, bool bValue ); static void WriteDouble( XclExpStream& rStrm, double fValue ); @@ -205,10 +205,10 @@ public: void StoreCellRange( const ScRange& rRange, const ::formula::FormulaToken& rToken ); /** Writes the XCT and all CRN records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; /** Writes the sheetDataSet and child elements. */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: ScExternalRefCache::TableTypeRef mxCacheTable; @@ -267,13 +267,13 @@ public: sal_uInt16 InsertAddIn( const OUString& rName ); /** Writes the EXTERNSHEET and all EXTERNNAME, XCT and CRN records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: /** Initializes the record data with the passed encoded URL. */ void Init( const OUString& rEncUrl ); /** Writes the contents of the EXTERNSHEET record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpString maTabName; /// The name of the sheet. @@ -336,17 +336,17 @@ public: const OUString& GetUrl() const; /** Writes the SUPBOOK and all EXTERNNAME, XCT and CRN records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; /** Writes the externalBook and all child elements. */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Returns the sheet name inside of this SUPBOOK. */ const XclExpString* GetTabName( sal_uInt16 nSBTab ) const; /** Writes the SUPBOOK record contents. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpXct > XclExpXctList; @@ -431,10 +431,10 @@ public: XclExpRefLogEntry* pRefLogEntry = NULL ); /** Writes all SUPBOOK records with their sub records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; /** Writes all externalBook elements with their child elements to OOXML. */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; /** Whether we need to write externalReferences or not. */ bool HasExternalReferences() const; @@ -538,38 +538,38 @@ public: virtual void FindExtSheet( sal_uInt16& rnExtSheet, sal_uInt16& rnFirstXclTab, sal_uInt16& rnLastXclTab, SCTAB nFirstScTab, SCTAB nLastScTab, - XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; - virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ) SAL_OVERRIDE; + XclExpRefLogEntry* pRefLogEntry ) override; + virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ) override; virtual void FindExtSheet( sal_uInt16 nFileId, const OUString& rTabName, sal_uInt16 nXclTabSpan, sal_uInt16& rnExtSheet, sal_uInt16& rnFirstSBTab, sal_uInt16& rnLastSBTab, - XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; + XclExpRefLogEntry* pRefLogEntry ) override; - virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ) SAL_OVERRIDE; + virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ) override; - virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ) SAL_OVERRIDE; - virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ) SAL_OVERRIDE; + virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ) override; + virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ) override; virtual bool InsertAddIn( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ) SAL_OVERRIDE; + const OUString& rName ) override; /** InsertEuroTool */ virtual bool InsertEuroTool( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ) SAL_OVERRIDE; + const OUString& rName ) override; virtual bool InsertDde( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) SAL_OVERRIDE; + const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) override; virtual bool InsertExtName( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl, - const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ) SAL_OVERRIDE; + const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ) override; - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpExternSheet > XclExpExtSheetList; @@ -608,37 +608,37 @@ public: virtual void FindExtSheet( sal_uInt16& rnExtSheet, sal_uInt16& rnFirstXclTab, sal_uInt16& rnLastXclTab, SCTAB nFirstScTab, SCTAB nLastScTab, - XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; - virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ) SAL_OVERRIDE; + XclExpRefLogEntry* pRefLogEntry ) override; + virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ) override; virtual void FindExtSheet( sal_uInt16 nFileId, const OUString& rTabName, sal_uInt16 nXclTabSpan, sal_uInt16& rnExtSheet, sal_uInt16& rnFirstSBTab, sal_uInt16& rnLastSBTab, - XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; + XclExpRefLogEntry* pRefLogEntry ) override; - virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ) SAL_OVERRIDE; + virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ) override; - virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ) SAL_OVERRIDE; - virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ) SAL_OVERRIDE; + virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ) override; + virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ) override; virtual bool InsertAddIn( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ) SAL_OVERRIDE; + const OUString& rName ) override; /** InsertEuroTool */ virtual bool InsertEuroTool( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ) SAL_OVERRIDE; + const OUString& rName ) override; virtual bool InsertDde( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) SAL_OVERRIDE; + const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) override; virtual bool InsertExtName( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl, - const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ) SAL_OVERRIDE; + const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ) override; - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Searches for or inserts a new XTI structure. diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 30707526a322..c4b07996954f 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -81,13 +81,13 @@ public: bool IsMacroCall( bool bVBasic, bool bFunc ) const; /** Writes the entire NAME record to the passed stream. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the NAME record to the passed stream. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: OUString maOrigName; /// The original user-defined name. diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index a68f0218d12e..7982d285083c 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -337,7 +337,7 @@ public: explicit XclExpXmlStartHeaderFooterElementRecord(sal_Int32 const nElement) : XclExpXmlElementRecord(nElement) {} - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; void XclExpXmlStartHeaderFooterElementRecord::SaveXml(XclExpXmlStream& rStrm) diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 9b4b0815b1cb..0b259b2c7842 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -1598,7 +1598,7 @@ class XclExpPivotRecWrapper : public XclExpRecordBase { public: explicit XclExpPivotRecWrapper( XclExpPivotTableManager& rPTMgr, SCTAB nScTab ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: XclExpPivotTableManager& mrPTMgr; SCTAB mnScTab; diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index be651813f2e2..2aa170e4d5a5 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2109,7 +2109,7 @@ public: mrColXFIndexes( rColXFIndexes ) {} virtual ~RowFinalizeTask() {} void push_back( XclExpRow *pRow ) { maRows.push_back( pRow ); } - virtual void doWork() SAL_OVERRIDE + virtual void doWork() override { for (size_t i = 0; i < maRows.size(); i++ ) maRows[ i ]->Finalize( mrColXFIndexes, mbProgress ); diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index f5c95bdeaf86..8ffc79eee57d 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -77,23 +77,23 @@ public: PaletteIndex( const ColorDataVec& rColorDataTable ) : maColorData( rColorDataTable ) {} // Methods XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override { return maColorData.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { //--Index; // apparently the palette is already 1 based return uno::makeAny( sal_Int32( maColorData[ Index ] ) ); } // Methods XElementAcess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override { return ::cppu::UnoType<sal_Int32>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { return (maColorData.size() > 0); } diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index f3631be5c46a..b4aa420239b2 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -31,8 +31,8 @@ class MSOExcelCommandConvertor : public MSOCommandConvertor IdToString tcidToOOcmd; public: MSOExcelCommandConvertor(); - virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) SAL_OVERRIDE; - virtual OUString MSOTCIDToOOCommand( sal_Int16 key ) SAL_OVERRIDE; + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) override; + virtual OUString MSOTCIDToOOCommand( sal_Int16 key ) override; }; MSOExcelCommandConvertor::MSOExcelCommandConvertor() diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index 892ec61f2d90..b8c8c342ec66 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -25,9 +25,9 @@ public: sal_uInt16 cmdType:5; bool C:1; sal_uInt16 reserved3:8; - bool Read( SvStream& rS ) SAL_OVERRIDE; + bool Read( SvStream& rS ) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print(FILE* fp) SAL_OVERRIDE; + virtual void Print(FILE* fp) override; #endif }; @@ -40,9 +40,9 @@ public: ScTBC(); virtual ~ScTBC(){} #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; bool ImportToolBarControl( ScCTBWrapper&, const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar ); }; @@ -57,9 +57,9 @@ public: ScCTB(sal_uInt16); virtual ~ScCTB(){} #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; bool IsMenuToolbar(); bool ImportCustomToolBar( ScCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenuTB( ScCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); @@ -83,9 +83,9 @@ public: CTBS(); virtual ~CTBS(){} #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; }; class ScCTBWrapper : public TBBase @@ -97,9 +97,9 @@ class ScCTBWrapper : public TBBase public: ScCTBWrapper(); virtual ~ScCTBWrapper(); - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif bool ImportCustomToolBar( SfxObjectShell& rDocSh ); ScCTB* GetCustomizationData( const OUString& name ); diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 0d28137ba98b..c88284d56d03 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -32,9 +32,9 @@ class ExcXmlRecord : public ExcRecord { public: - virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual sal_Size GetLen() const override; + virtual sal_uInt16 GetNum() const override; + virtual void Save( XclExpStream& rStrm ) override; }; // XclExpUserBView - one UserBView record for each user @@ -45,15 +45,15 @@ private: XclExpString sUsername; sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID ); inline const sal_uInt8* GetGUID() const { return aGUID; } - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // XclExpUserBViewList - list of UserBView records @@ -74,7 +74,7 @@ public: inline iterator begin () { return aViews.begin(); } inline iterator end () { return aViews.end(); } - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; }; // XclExpUsersViewBegin - begin of view block (one per sheet) @@ -85,12 +85,12 @@ private: sal_uInt8 aGUID[ 16 ]; sal_uInt32 nCurrTab; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // XclExpUsersViewEnd - end of view block (one per sheet) @@ -98,11 +98,11 @@ public: class XclExpUsersViewEnd : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "User Names" stream @@ -110,11 +110,11 @@ public: class XclExpChTr0x0191 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "User Names" stream @@ -122,11 +122,11 @@ public: class XclExpChTr0x0198 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "User Names" stream @@ -134,11 +134,11 @@ public: class XclExpChTr0x0192 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "User Names" stream @@ -146,11 +146,11 @@ public: class XclExpChTr0x0197 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record without content @@ -164,8 +164,8 @@ public: inline XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {} virtual ~XclExpChTrEmpty(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "Revision Log" stream @@ -173,13 +173,13 @@ public: class XclExpChTr0x0195 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: virtual ~XclExpChTr0x0195(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "Revision Log" stream @@ -190,14 +190,14 @@ private: XclExpString sUsername; DateTime aDateTime; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ); virtual ~XclExpChTr0x0194(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) : @@ -214,7 +214,7 @@ private: sal_uInt8 aGUID[ 16 ]; sal_uInt32 nCount; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: inline XclExpChTrHeader() : nCount( 0 ) {} @@ -223,10 +223,10 @@ public: inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); } inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; } - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpXmlChTrHeaders : public ExcXmlRecord @@ -235,7 +235,7 @@ class XclExpXmlChTrHeaders : public ExcXmlRecord public: void SetGUID( const sal_uInt8* pGUID ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpChTrTabIdBuffer; @@ -258,7 +258,7 @@ public: const OUString& rUserName, const DateTime& rDateTime, const sal_uInt8* pGUID, sal_Int32 nLogNumber, const XclExpChTrTabIdBuffer& rBuf ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; void AppendAction( XclExpChTrAction* pAction ); }; @@ -272,7 +272,7 @@ private: DateTime aDateTime; sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclExpChTrInfo( const OUString& rUsername, const DateTime& rDateTime, @@ -280,8 +280,8 @@ public: virtual ~XclExpChTrInfo(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // XclExpChTrTabIdBuffer - buffer for tab id's @@ -321,7 +321,7 @@ private: inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: inline XclExpChTrTabId( sal_uInt16 nCount ) : @@ -331,8 +331,8 @@ public: void Copy( const XclExpChTrTabIdBuffer& rBuffer ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // XclExpChTrAction - base class for action records @@ -367,7 +367,7 @@ protected: inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; // save header data, call SaveActionData() - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; static inline sal_Size GetHeaderByteCount() { return 12; } // override to save action data without header, called by SaveCont() @@ -399,8 +399,8 @@ public: // could override to use more indexes per action void SetIndex( sal_uInt32& rIndex ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual sal_Size GetLen() const override; inline XclExpChTrAction* GetAddAction() { return pAddAction; } inline sal_uInt32 GetActionNumber() const { return nIndex; } @@ -474,7 +474,7 @@ protected: const XclExpRoot& rRoot, const ScCellValue& rScCell, XclExpChTrData*& rpData, sal_uInt32& rXclLength1, sal_uInt16& rXclLength2 ); - virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void SaveActionData( XclExpStream& rStrm ) const override; public: XclExpChTrCellContent( @@ -483,10 +483,10 @@ public: const XclExpChTrTabIdBuffer& rTabIdBuffer ); virtual ~XclExpChTrCellContent(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetActionByteCount() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // XclExpChTrInsert - insert/delete columns/rows @@ -500,9 +500,9 @@ protected: XclExpChTrInsert( const XclExpChTrInsert& rCopy ); - virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void SaveActionData( XclExpStream& rStrm ) const override; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const override; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const override; public: XclExpChTrInsert( @@ -512,10 +512,10 @@ public: ScChangeTrack& rChangeTrack ); virtual ~XclExpChTrInsert(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetActionByteCount() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // XclExpChTrInsertTab - insert table @@ -526,7 +526,7 @@ private: SCTAB nTab; protected: - virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void SaveActionData( XclExpStream& rStrm ) const override; public: XclExpChTrInsertTab( @@ -535,10 +535,10 @@ public: const XclExpChTrTabIdBuffer& rTabIdBuffer ); virtual ~XclExpChTrInsertTab(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetActionByteCount() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // XclExpChTrMoveRange - move cell range @@ -549,9 +549,9 @@ protected: ScRange aSourceRange; ScRange aDestRange; - virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void SaveActionData( XclExpStream& rStrm ) const override; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const override; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const override; public: XclExpChTrMoveRange( @@ -561,10 +561,10 @@ public: ScChangeTrack& rChangeTrack ); virtual ~XclExpChTrMoveRange(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetActionByteCount() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // XclExpChTr0x019A - additional data for delete action @@ -572,16 +572,16 @@ public: class XclExpChTr0x014A : public XclExpChTrInsert { protected: - virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void SaveActionData( XclExpStream& rStrm ) const override; public: XclExpChTr0x014A( const XclExpChTrInsert& rAction ); virtual ~XclExpChTr0x014A(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetActionByteCount() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // XclExpChangeTrack - exports the "Revision Log" stream diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index ce80abdbe480..758b2b35719b 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -149,7 +149,7 @@ class XclImpChTrFmlConverter : public ExcelToSc8 private: XclImpChangeTrack& rChangeTrack; - virtual bool Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ) SAL_OVERRIDE; + virtual bool Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ) override; public: XclImpChTrFmlConverter( XclImpRoot& rRoot, XclImpChangeTrack& rXclChTr ); diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index a23cbda61789..83a45ace1916 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -74,12 +74,12 @@ public: explicit DiscreteFilter( const WorkbookHelper& rHelper ); /** Imports filter settings from the filters and filter elements. */ - virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) override; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) override; private: typedef ::std::vector< OUString > FilterValueVector; @@ -96,12 +96,12 @@ public: explicit Top10Filter( const WorkbookHelper& rHelper ); /** Imports filter settings from the filters and filter elements. */ - virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) override; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) override; private: double mfValue; /// Number of items or percentage. @@ -135,12 +135,12 @@ public: explicit CustomFilter( const WorkbookHelper& rHelper ); /** Imports filter settings from the filters and filter elements. */ - virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) override; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) override; private: /** Appends the passed filter criteriom, if it contains valid settings. */ diff --git a/sc/source/filter/inc/autofiltercontext.hxx b/sc/source/filter/inc/autofiltercontext.hxx index 410495c857c5..9a58a8a998e0 100644 --- a/sc/source/filter/inc/autofiltercontext.hxx +++ b/sc/source/filter/inc/autofiltercontext.hxx @@ -35,11 +35,11 @@ public: explicit FilterSettingsContext( WorksheetContextBase& rParent, FilterSettingsBase& rFilterSettings ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: FilterSettingsBase& mrFilterSettings; @@ -51,11 +51,11 @@ public: explicit FilterColumnContext( WorksheetContextBase& rParent, FilterColumn& rFilterColumn ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: FilterColumn& mrFilterColumn; @@ -67,11 +67,11 @@ public: explicit AutoFilterContext( WorksheetFragmentBase& rFragment, AutoFilter& rAutoFilter ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: AutoFilter& mrAutoFilter; diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index f541ef9d7b8a..3aafeae8aa1c 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -41,8 +41,8 @@ public: inline BiffDecoderBase* clone() { return implClone(); } /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; /** Returns true, if the decoder has been initialized correctly. */ inline bool isValid() const { return mbValid; } @@ -84,18 +84,18 @@ private: BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ); /** Returns a clone of the decoder for usage in new streams. */ - virtual BiffDecoder_XOR* implClone() SAL_OVERRIDE; + virtual BiffDecoder_XOR* implClone() override; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; + virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; /** Implementation of decryption of a memory block. */ virtual void implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, - sal_uInt16 nBytes ) SAL_OVERRIDE; + sal_uInt16 nBytes ) override; private: ::oox::core::BinaryCodec_XOR maCodec; /// Cipher algorithm implementation. @@ -112,18 +112,18 @@ private: BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ); /** Returns a clone of the decoder for usage in new streams. */ - virtual BiffDecoder_RCF* implClone() SAL_OVERRIDE; + virtual BiffDecoder_RCF* implClone() override; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; + virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; /** Implementation of decryption of a memory block. */ virtual void implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, - sal_uInt16 nBytes ) SAL_OVERRIDE; + sal_uInt16 nBytes ) override; private: ::oox::core::BinaryCodec_RCF maCodec; /// Cipher algorithm implementation. diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 13f9dbaa5e03..d048da1ad631 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -197,24 +197,24 @@ public: // BinaryStreamBase interface (seeking) ----------------------------------- /** Returns the data size of the whole record without record headers. */ - virtual sal_Int64 size() const SAL_OVERRIDE; + virtual sal_Int64 size() const override; /** Returns the position inside of the whole record content. */ - virtual sal_Int64 tell() const SAL_OVERRIDE; + virtual sal_Int64 tell() const override; /** Seeks in record content to the specified position. */ - virtual void seek( sal_Int64 nRecPos ) SAL_OVERRIDE; + virtual void seek( sal_Int64 nRecPos ) override; /** Closes the input stream but not the wrapped stream. */ - virtual void close() SAL_OVERRIDE; + virtual void close() override; // BinaryInputStream interface (stream read access) ----------------------- /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Reads nBytes bytes and copies them to the passed buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Seeks forward inside the current record. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Stream operator for integral and floating-point types. */ template< typename Type > diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx index b573ccffbdb5..f15a94bc4049 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -33,14 +33,14 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void initializeImport() SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void initializeImport() override; + virtual void finalizeImport() override; private: /** Imports the relation identifier for the DrawingML part. */ diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx index 7da902064426..778938a4b6a4 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -33,14 +33,14 @@ public: const WorksheetHelper& rHelper, const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onEndRecord() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onEndRecord() override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; private: /** Imports comment data from the comment element. */ diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx index ff85e1832ab8..866ba271d3d5 100644 --- a/sc/source/filter/inc/condformatcontext.hxx +++ b/sc/source/filter/inc/condformatcontext.hxx @@ -35,8 +35,8 @@ class ColorScaleContext : public WorksheetContextBase public: explicit ColorScaleContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; private: CondFormatRuleRef mxRule; @@ -47,8 +47,8 @@ class DataBarContext : public WorksheetContextBase public: explicit DataBarContext( CondFormatContext& rFormat, CondFormatRuleRef xRule ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; private: CondFormatRuleRef mxRule; @@ -59,10 +59,10 @@ class IconSetContext : public WorksheetContextBase public: explicit IconSetContext( WorksheetContextBase& rParent, IconSetRule* pIconSet ); - virtual oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters(const OUString& rChars) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters(const OUString& rChars) override; + virtual void onEndElement() override; private: IconSetRule* mpIconSet; @@ -75,14 +75,14 @@ public: explicit CondFormatContext( WorksheetFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; - - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onEndRecord() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; + + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; + virtual void onEndRecord() override; private: CondFormatRef mxCondFmt; diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx index fa9bcb08042e..9dc23c736304 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -33,11 +33,11 @@ public: explicit ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: Connection& mrConnection; @@ -51,11 +51,11 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void finalizeImport() override; }; } // namespace xls diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 4e36ad63a199..401ee46d46bb 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -49,7 +49,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); private: - virtual void attachMacro( const OUString& rMacroUrl ) SAL_OVERRIDE; + virtual void attachMacro( const OUString& rMacroUrl ) override; private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; @@ -66,7 +66,7 @@ public: protected: virtual void finalizeXShape( ::oox::core::XmlFilterBase& rFilter, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ) override; private: OUString maMacroName; @@ -95,7 +95,7 @@ protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; }; /** Fragment handler for a complete sheet drawing. */ @@ -107,9 +107,9 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; private: typedef ::std::unique_ptr< ShapeAnchor > ShapeAnchorRef; @@ -130,7 +130,7 @@ public: sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ); private: - virtual void attachMacro( const OUString& rMacroUrl ) SAL_OVERRIDE; + virtual void attachMacro( const OUString& rMacroUrl ) override; private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxCtrlFormIC; @@ -148,28 +148,28 @@ public: const ::oox::vml::ShapeBase* getNoteShape( const ::com::sun::star::table::CellAddress& rPos ) const; /** Filters cell note shapes. */ - virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const SAL_OVERRIDE; + virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const override; /** Returns additional base names for automatic shape name creation. */ - virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const SAL_OVERRIDE; + virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const override; /** Calculates the shape rectangle from a cell anchor string. */ virtual bool convertClientAnchor( ::com::sun::star::awt::Rectangle& orShapeRect, - const OUString& rShapeAnchor ) const SAL_OVERRIDE; + const OUString& rShapeAnchor ) const override; /** Creates a UNO control shape for legacy drawing controls. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createAndInsertClientXShape( const ::oox::vml::ShapeBase& rShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const override; /** Updates the bounding box covering all shapes of this drawing. */ virtual void notifyXShapeInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, const ::com::sun::star::awt::Rectangle& rShapeRect, - const ::oox::vml::ShapeBase& rShape, bool bGroupChild ) SAL_OVERRIDE; + const ::oox::vml::ShapeBase& rShape, bool bGroupChild ) override; private: /** Converts the passed VML textbox text color to an OLE color. */ @@ -201,7 +201,7 @@ public: const OUString& rFragmentPath ); protected: - virtual void finalizeImport() SAL_OVERRIDE; + virtual void finalizeImport() override; }; } // namespace xls diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx index 629394ab47fe..3b1217dbf808 100644 --- a/sc/source/filter/inc/eeimport.hxx +++ b/sc/source/filter/inc/eeimport.hxx @@ -51,12 +51,12 @@ public: ScEEImport( ScDocument* pDoc, const ScRange& rRange ); virtual ~ScEEImport(); - virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ) SAL_OVERRIDE; - virtual ScRange GetRange() SAL_OVERRIDE { return maRange; } + virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ) override; + virtual ScRange GetRange() override { return maRange; } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, SvNumberFormatter* pFormatter = NULL, - bool bConvertDate = true ) SAL_OVERRIDE; + bool bConvertDate = true ) override; }; #endif diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index c4afd77e6953..7e594b2c9cda 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -34,13 +34,13 @@ public: /** Creates an external data provider that is able to use spreadsheet data. */ virtual void createDataProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc ) override; /** Creates a data sequence from the passed formula. */ virtual css::uno::Reference<css::chart2::data::XDataSequence> createDataSequence( const css::uno::Reference<css::chart2::data::XDataProvider>& rxDataProvider, - const oox::drawingml::chart::DataSequenceModel& rDataSeq, const OUString& rRole ) SAL_OVERRIDE; + const oox::drawingml::chart::DataSequenceModel& rDataSeq, const OUString& rRole ) override; }; } // namespace xls diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 75d78644378c..637e7fe29a9b 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -39,21 +39,21 @@ public: WorkbookGlobals& getWorkbookGlobals() const; void unregisterWorkbookGlobals(); - virtual bool importDocument() SAL_OVERRIDE; - virtual bool exportDocument() throw() SAL_OVERRIDE; + virtual bool importDocument() override; + virtual bool exportDocument() throw() override; - virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; - virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; - virtual void useInternalChartDataTable( bool bInternal ) SAL_OVERRIDE; + virtual const ::oox::drawingml::Theme* getCurrentTheme() const override; + virtual ::oox::vml::Drawing* getVmlDrawing() override; + virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() override; + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override; + virtual void useInternalChartDataTable( bool bInternal ) override; - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; private: - virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual GraphicHelper* implCreateGraphicHelper() const override; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; WorkbookGlobals* mpBookGlob; }; diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx index 56d41cf170b7..47d37fec2edc 100644 --- a/sc/source/filter/inc/excelvbaproject.hxx +++ b/sc/source/filter/inc/excelvbaproject.hxx @@ -39,7 +39,7 @@ public: protected: /** Adds dummy modules for sheets without imported code name. */ - virtual void prepareImport() SAL_OVERRIDE; + virtual void prepareImport() override; private: ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 4a2362e0f808..9648e9277500 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -49,9 +49,9 @@ public: ExcelToSc( XclImpRoot& rRoot ); virtual ~ExcelToSc(); virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen, - bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; + bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) override; - virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; + virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) override; virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, const OUString& rUrl, const ::std::vector<OUString>& rTabNames ); @@ -122,16 +122,16 @@ public: ExcelToSc8( XclImpRoot& rRoot ); virtual ~ExcelToSc8(); - virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; + virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) override; - virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; + virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) override; virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, - const OUString& rUrl, const ::std::vector<OUString>& rTabNames ) SAL_OVERRIDE; + const OUString& rUrl, const ::std::vector<OUString>& rTabNames ) override; static inline bool IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ); - virtual bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ) SAL_OVERRIDE; + virtual bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ) override; }; inline bool ExcelToSc8::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ) diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 2ce1135e916e..dc01c5ebcf86 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -38,7 +38,7 @@ public: ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ); virtual ~ImportExcel8(); - virtual FltError Read() SAL_OVERRIDE; + virtual FltError Read() override; void Calccount(); // 0x0C void Precision(); // 0x0E @@ -56,8 +56,8 @@ public: void FeatHdr(); // 0x0867 void Feat(); // 0x0868 - virtual void EndSheet() SAL_OVERRIDE; - virtual void PostDocLoad() SAL_OVERRIDE; + virtual void EndSheet() override; + virtual void PostDocLoad() override; private: void LoadDocumentProperties(); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 6a12db863ac8..e78373754fce 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -48,8 +48,8 @@ struct ScQueryEntry; class ExcRecord : public XclExpRecord { public: - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; virtual sal_uInt16 GetNum() const = 0; virtual sal_Size GetLen() const = 0; @@ -59,7 +59,7 @@ protected: private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; //--------------------------------------------------------- class ExcEmptyRec - @@ -69,9 +69,9 @@ class ExcEmptyRec : public ExcRecord private: protected: public: - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; //--------------------------------------------------------- class ExcDummyRec - @@ -80,8 +80,8 @@ class ExcDummyRec : public ExcRecord { protected: public: - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual sal_uInt16 GetNum() const override; virtual const sal_uInt8* GetData() const = 0; // byte data must contain header and body }; @@ -91,7 +91,7 @@ public: class ExcBoolRecord : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; protected: bool bVal; @@ -101,7 +101,7 @@ protected: public: inline ExcBoolRecord( const bool bDefault ) : bVal( bDefault ) {} - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; }; //--------------------------------------------------------- class ExcBof_Base - @@ -124,12 +124,12 @@ public: class ExcBof : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: ExcBof(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; //------------------------------------------------------------- class ExcBofW - @@ -138,12 +138,12 @@ public: class ExcBofW : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: ExcBofW(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; //-------------------------------------------------------------- class ExcEof - @@ -152,8 +152,8 @@ class ExcEof : public ExcRecord { private: public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; //--------------------------------------------------------- class ExcDummy_00 - @@ -165,8 +165,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual const sal_uInt8* GetData() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; + virtual const sal_uInt8* GetData() const override; }; // EXC_ID_WINDOWPROTECTION @@ -175,7 +175,7 @@ class XclExpWindowProtection : public XclExpBoolRecord public: XclExpWindowProtection(bool bValue); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // EXC_ID_PROTECT Document Protection @@ -190,7 +190,7 @@ class XclExpSheetProtection : public XclExpProtection SCTAB mnTab; public: XclExpSheetProtection(bool bValue, SCTAB nTab); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpPassHash : public XclExpRecord @@ -200,7 +200,7 @@ public: virtual ~XclExpPassHash(); private: - virtual void WriteBody(XclExpStream& rStrm) SAL_OVERRIDE; + virtual void WriteBody(XclExpStream& rStrm) override; private: sal_uInt16 mnHash; @@ -215,8 +215,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual const sal_uInt8* GetData() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; + virtual const sal_uInt8* GetData() const override; }; class ExcDummy_041 : public ExcDummyRec @@ -225,8 +225,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual const sal_uInt8* GetData() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; + virtual const sal_uInt8* GetData() const override; }; //------------------------------------------------------------- class Exc1904 - @@ -235,9 +235,9 @@ class Exc1904 : public ExcBoolRecord { public: Exc1904( ScDocument& rDoc ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: bool bDateCompatibility; }; @@ -260,7 +260,7 @@ public: inline void SetStreamPos(sal_uInt64 const nStrPos) { m_nStrPos = nStrPos; } void UpdateStreamPos( XclExpStream& rStrm ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; }; class ExcBundlesheet : public ExcBundlesheetBase @@ -268,11 +268,11 @@ class ExcBundlesheet : public ExcBundlesheetBase private: OString aName; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: ExcBundlesheet( RootData& rRootData, SCTAB nTab ); - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; }; //--------------------------------------------------------- class ExcDummy_02 - @@ -284,8 +284,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual const sal_uInt8* GetData() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; + virtual const sal_uInt8* GetData() const override; }; /** This record contains the Windows country IDs for the UI and document language. */ @@ -299,7 +299,7 @@ private: sal_uInt16 mnDocCountry; /// The document country ID. /** Writes the body of the COUNTRY record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; // XclExpWsbool =============================================================== @@ -319,7 +319,7 @@ public: explicit XclExpXmlSheetPr( bool bFitToPages, SCTAB nScTab, const Color& rTabColor, XclExpFilterManager* pManager ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: SCTAB mnScTab; @@ -383,7 +383,7 @@ private: sal_uInt8 nOp, double fVal, OUString* pText, bool bSimple = false ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; public: XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ); @@ -395,7 +395,7 @@ public: bool AddEntry( const ScQueryEntry& rEntry ); bool AddMultiValueEntry( const ScQueryEntry& rEntry ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class ExcAutoFilterRecs : public XclExpRecordBase, protected XclExpRoot @@ -406,8 +406,8 @@ public: void AddObjRecs(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; bool HasFilterMode() const; diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index 1272a031af92..cce22e2a13c6 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -59,7 +59,7 @@ protected: public: ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ); virtual ~ExportBiff5(); - FltError Write() SAL_OVERRIDE; + FltError Write() override; }; class ExportBiff8 : public ExportBiff5 diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 4b67a319ac27..af728e5b802d 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -41,10 +41,10 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache >& rxSheetCache ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; private: /** Imports cell settings from a c element. */ @@ -80,13 +80,13 @@ public: ExternalLink& rExtLink ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; private: ::oox::core::ContextHandlerRef createSheetDataContext( sal_Int32 nSheetId ); diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx index d77d51ae50d0..51fd498acf1e 100644 --- a/sc/source/filter/inc/extlstcontext.hxx +++ b/sc/source/filter/inc/extlstcontext.hxx @@ -29,8 +29,8 @@ class ExtCfRuleContext : public WorksheetContextBase public: explicit ExtCfRuleContext( WorksheetContextBase& rFragment, ScDataBarFormatData* pDataBar ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; private: ScDataBarFormatData* mpTarget; @@ -43,10 +43,10 @@ class ExtConditionalFormattingContext : public WorksheetContextBase public: explicit ExtConditionalFormattingContext(WorksheetContextBase& rFragment); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters(const OUString& rCharacters) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters(const OUString& rCharacters) override; + virtual void onEndElement() override; private: OUString aChars; @@ -68,9 +68,9 @@ public: explicit ExtLstLocalContext( WorksheetContextBase& rFragment, ScDataBarFormatData* pTarget ); // until now a ExtLst always extends an existing entry protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; private: ScDataBarFormatData* mpTarget; @@ -85,8 +85,8 @@ public: explicit ExtGlobalContext( WorksheetContextBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; private: }; @@ -101,7 +101,7 @@ public: explicit ExtLstGlobalContext( WorksheetFragment& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; class ExtGlobalWorkbookContext : public WorkbookContextBase @@ -110,8 +110,8 @@ public: explicit ExtGlobalWorkbookContext( WorkbookContextBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; private: }; @@ -122,7 +122,7 @@ public: explicit ExtLstGlobalWorkbookContext( WorkbookFragment& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; } //namespace xls diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 8200b6ee7132..5a920c870620 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -267,36 +267,36 @@ public: ScFormatFilterPluginImpl(); virtual ~ScFormatFilterPluginImpl(); // various import filters - virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW ) SAL_OVERRIDE; - virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ) SAL_OVERRIDE; - virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) SAL_OVERRIDE; + virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW ) override; + virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ) override; + virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) override; // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren - virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) SAL_OVERRIDE; + virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) override; virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, - const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; - virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) SAL_OVERRIDE; + const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) override; + virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) override; virtual FltError ScImportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, bool bCalcWidthHeight = true, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) SAL_OVERRIDE; + SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) override; - virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) SAL_OVERRIDE; - virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) SAL_OVERRIDE; - virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ) SAL_OVERRIDE; + virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) override; + virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) override; + virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ) override; // various export filters - virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ) SAL_OVERRIDE; + virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ) override; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const rtl_TextEncoding eDest, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) override; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) override; virtual FltError ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll, - const OUString& rStreamPath, OUString& rNonConvertibleChars, const OUString& rFilterOptions ) SAL_OVERRIDE; - virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) SAL_OVERRIDE; + const OUString& rStreamPath, OUString& rNonConvertibleChars, const OUString& rFilterOptions ) override; + virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) override; - virtual ScOrcusFilters* GetOrcusFilters() SAL_OVERRIDE; + virtual ScOrcusFilters* GetOrcusFilters() override; }; #endif diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 13c943362f2d..858e5beeb25c 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -34,7 +34,7 @@ public: const ScHTMLParser* GetParser() const { return static_cast<ScHTMLParser*>(mpParser); } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) SAL_OVERRIDE; + SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) override; static OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ); }; diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 27d2b85fdf3b..6cc2bc82ff56 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -86,7 +86,7 @@ public: explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLParser(); - virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) SAL_OVERRIDE = 0; + virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) override = 0; ScHTMLStyles& GetStyles() { return maStyles;} ScDocument& GetDoc() { return *mpDoc;} @@ -217,8 +217,8 @@ private: public: ScHTMLLayoutParser( EditEngine*, const OUString& rBaseURL, const Size& aPageSize, ScDocument* ); virtual ~ScHTMLLayoutParser(); - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) SAL_OVERRIDE; - virtual const ScHTMLTable* GetGlobalTable() const SAL_OVERRIDE; + virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) override; + virtual const ScHTMLTable* GetGlobalTable() const override; }; // HTML DATA QUERY PARSER @@ -585,10 +585,10 @@ public: explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLQueryParser(); - virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) SAL_OVERRIDE; + virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) override; /** Returns the "global table" which contains the entire HTML document. */ - virtual const ScHTMLTable* GetGlobalTable() const SAL_OVERRIDE; + virtual const ScHTMLTable* GetGlobalTable() const override; private: /** Handles all possible tags in the HTML document. */ diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 090189df385a..df0111578053 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -203,7 +203,7 @@ public: virtual ~ImportExcel(); - virtual FltError Read() SAL_OVERRIDE; + virtual FltError Read() override; }; #endif diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index cc819cfdf993..bcde57911709 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -90,7 +90,7 @@ public: LotusToSc(LotusContext &rContext, SvStream& aStr, svl::SharedStringPool& rSPool, rtl_TextEncoding eSrc, bool b); virtual ConvErr Convert( const ScTokenArray*& rpErg, sal_Int32& nRest, - const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; + const FORMULA_TYPE eFT = FT_CellFormula ) override; void Reset( const ScAddress& rEingPos ); inline void SetWK3(); diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index fb6704cc1ba9..f0cfccc7ae4f 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -79,7 +79,7 @@ public: virtual ~ImportLotus(); - FltError Read() SAL_OVERRIDE; + FltError Read() override; FltError Read( SvStream& ); // special for *.fm3-Dateien }; diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index c70e277a22cf..91df7282977e 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -48,26 +48,26 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- virtual ::rtl::OUString SAL_CALL - getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rService ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.lang.XInitialization interface ---------------------------- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) - throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.sheet.XFilterFormulaParser interface ---------------------- virtual ::rtl::OUString SAL_CALL getSupportedNamespace() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.sheet.XFormulaParser interface ---------------------------- @@ -75,13 +75,13 @@ public: parseFormula( const ::rtl::OUString& rFormula, const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::rtl::OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& rTokens, const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; private: typedef std::shared_ptr< OOXMLFormulaParserImpl > ParserImplRef; diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index 175308d869ce..ce909d7af7d0 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -20,12 +20,12 @@ class ScOrcusFiltersImpl : public ScOrcusFilters public: static OString toSystemPath(const OUString& rPath); - virtual bool importCSV(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; - virtual bool importGnumeric(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; - virtual bool importXLSX(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; - virtual bool importODS(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; + virtual bool importCSV(ScDocument& rDoc, SfxMedium& rMedium) const override; + virtual bool importGnumeric(ScDocument& rDoc, SfxMedium& rMedium) const override; + virtual bool importXLSX(ScDocument& rDoc, SfxMedium& rMedium) const override; + virtual bool importODS(ScDocument& rDoc, SfxMedium& rMedium) const override; - virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const SAL_OVERRIDE; + virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const override; }; class ScOrcusXMLContextImpl : public ScOrcusXMLContext @@ -39,9 +39,9 @@ public: ScOrcusXMLContextImpl(ScDocument& rDoc, const OUString& rPath); virtual ~ScOrcusXMLContextImpl(); - virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam) SAL_OVERRIDE; + virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam) override; - virtual bool importXML(const ScOrcusImportXMLParam& rParam) SAL_OVERRIDE; + virtual bool importXML(const ScOrcusImportXMLParam& rParam) override; }; #endif diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index d8a805615f38..004f56275dd6 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -50,10 +50,10 @@ class ScOrcusGlobalSettings : public orcus::spreadsheet::iface::import_global_se public: ScOrcusGlobalSettings(ScDocumentImport& rDoc); - virtual void set_origin_date(int year, int month, int day) SAL_OVERRIDE; + virtual void set_origin_date(int year, int month, int day) override; - virtual void set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) SAL_OVERRIDE; - virtual orcus::spreadsheet::formula_grammar_t get_default_formula_grammar() const SAL_OVERRIDE; + virtual void set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) override; + virtual orcus::spreadsheet::formula_grammar_t get_default_formula_grammar() const override; }; class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_strings @@ -64,21 +64,21 @@ class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_str public: ScOrcusSharedStrings(ScOrcusFactory& rFactory); - virtual size_t append(const char* s, size_t n) SAL_OVERRIDE; - virtual size_t add(const char* s, size_t n) SAL_OVERRIDE; + virtual size_t append(const char* s, size_t n) override; + virtual size_t add(const char* s, size_t n) override; - virtual void set_segment_bold(bool b) SAL_OVERRIDE; - virtual void set_segment_italic(bool b) SAL_OVERRIDE; - virtual void set_segment_font(size_t font_index) SAL_OVERRIDE; - virtual void set_segment_font_name(const char* s, size_t n) SAL_OVERRIDE; - virtual void set_segment_font_size(double point) SAL_OVERRIDE; + virtual void set_segment_bold(bool b) override; + virtual void set_segment_italic(bool b) override; + virtual void set_segment_font(size_t font_index) override; + virtual void set_segment_font_name(const char* s, size_t n) override; + virtual void set_segment_font_size(double point) override; virtual void set_segment_font_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; - virtual void append_segment(const char* s, size_t n) SAL_OVERRIDE; + orcus::spreadsheet::color_elem_t blue) override; + virtual void append_segment(const char* s, size_t n) override; - virtual size_t commit_segments() SAL_OVERRIDE; + virtual size_t commit_segments() override; }; class ScOrcusConditionalFormat : public orcus::spreadsheet::iface::import_conditional_format @@ -88,50 +88,50 @@ public: virtual ~ScOrcusConditionalFormat(); virtual void set_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, - orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; - virtual void set_formula(const char* p, size_t n) SAL_OVERRIDE; + virtual void set_formula(const char* p, size_t n) override; - virtual void set_condition_type(orcus::spreadsheet::condition_type_t type) SAL_OVERRIDE; + virtual void set_condition_type(orcus::spreadsheet::condition_type_t type) override; - virtual void set_date(orcus::spreadsheet::condition_date_t date) SAL_OVERRIDE; + virtual void set_date(orcus::spreadsheet::condition_date_t date) override; - virtual void commit_condition() SAL_OVERRIDE; + virtual void commit_condition() override; - virtual void set_icon_name(const char* p, size_t n) SAL_OVERRIDE; + virtual void set_icon_name(const char* p, size_t n) override; - virtual void set_databar_gradient(bool gradient) SAL_OVERRIDE; + virtual void set_databar_gradient(bool gradient) override; - virtual void set_databar_axis(orcus::spreadsheet::databar_axis_t axis) SAL_OVERRIDE; + virtual void set_databar_axis(orcus::spreadsheet::databar_axis_t axis) override; virtual void set_databar_color_positive(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, - orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; virtual void set_databar_color_negative(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, - orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; - virtual void set_min_databar_length(double length) SAL_OVERRIDE; + virtual void set_min_databar_length(double length) override; - virtual void set_max_databar_length(double length) SAL_OVERRIDE; + virtual void set_max_databar_length(double length) override; - virtual void set_show_value(bool show) SAL_OVERRIDE; + virtual void set_show_value(bool show) override; - virtual void set_iconset_reverse(bool reverse) SAL_OVERRIDE; + virtual void set_iconset_reverse(bool reverse) override; - virtual void set_xf_id(size_t xf) SAL_OVERRIDE; + virtual void set_xf_id(size_t xf) override; - virtual void set_operator(orcus::spreadsheet::condition_operator_t condition_type) SAL_OVERRIDE; + virtual void set_operator(orcus::spreadsheet::condition_operator_t condition_type) override; - virtual void set_type(orcus::spreadsheet::conditional_format_t type) SAL_OVERRIDE; + virtual void set_type(orcus::spreadsheet::conditional_format_t type) override; - virtual void commit_entry() SAL_OVERRIDE; + virtual void commit_entry() override; - virtual void set_range(const char* p, size_t n) SAL_OVERRIDE; + virtual void set_range(const char* p, size_t n) override; virtual void set_range(orcus::spreadsheet::row_t row_start, orcus::spreadsheet::col_t col_start, - orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end) SAL_OVERRIDE; + orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end) override; - virtual void commit_format() SAL_OVERRIDE; + virtual void commit_format() override; private: @@ -151,15 +151,15 @@ public: virtual ~ScOrcusAutoFilter(); - virtual void set_range(const char* p_ref, size_t n_ref) SAL_OVERRIDE; + virtual void set_range(const char* p_ref, size_t n_ref) override; - virtual void set_column(orcus::spreadsheet::col_t col) SAL_OVERRIDE; + virtual void set_column(orcus::spreadsheet::col_t col) override; - virtual void append_column_match_value(const char* p, size_t n) SAL_OVERRIDE; + virtual void append_column_match_value(const char* p, size_t n) override; - virtual void commit_column() SAL_OVERRIDE; + virtual void commit_column() override; - virtual void commit() SAL_OVERRIDE; + virtual void commit() override; private: ScDocument& mrDoc; @@ -175,15 +175,15 @@ public: ScOrcusSheetProperties(SCTAB nTab, ScDocumentImport& rDoc); virtual ~ScOrcusSheetProperties(); - virtual void set_column_width(orcus::spreadsheet::col_t col, double width, orcus::length_unit_t unit) SAL_OVERRIDE; + virtual void set_column_width(orcus::spreadsheet::col_t col, double width, orcus::length_unit_t unit) override; - virtual void set_column_hidden(orcus::spreadsheet::col_t col, bool hidden) SAL_OVERRIDE; + virtual void set_column_hidden(orcus::spreadsheet::col_t col, bool hidden) override; - virtual void set_row_height(orcus::spreadsheet::row_t row, double height, orcus::length_unit_t unit) SAL_OVERRIDE; + virtual void set_row_height(orcus::spreadsheet::row_t row, double height, orcus::length_unit_t unit) override; - virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) SAL_OVERRIDE; + virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) override; - virtual void set_merge_cell_range(const char* p_range, size_t n_range) SAL_OVERRIDE; + virtual void set_merge_cell_range(const char* p_range, size_t n_range) override; }; class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet @@ -207,44 +207,44 @@ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet public: ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& rFactory); - virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() SAL_OVERRIDE { return &maAutoFilter; } - virtual orcus::spreadsheet::iface::import_table* get_table() SAL_OVERRIDE; - virtual orcus::spreadsheet::iface::import_sheet_properties* get_sheet_properties() SAL_OVERRIDE; - virtual orcus::spreadsheet::iface::import_conditional_format* get_conditional_format() SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() override { return &maAutoFilter; } + virtual orcus::spreadsheet::iface::import_table* get_table() override; + virtual orcus::spreadsheet::iface::import_sheet_properties* get_sheet_properties() override; + virtual orcus::spreadsheet::iface::import_conditional_format* get_conditional_format() override; // Orcus import interface - virtual void set_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE; - virtual void set_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) SAL_OVERRIDE; - virtual void set_value(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double value) SAL_OVERRIDE; - virtual void set_bool(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, bool value) SAL_OVERRIDE; + virtual void set_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) override; + virtual void set_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) override; + virtual void set_value(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double value) override; + virtual void set_bool(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, bool value) override; virtual void set_date_time( - orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second) SAL_OVERRIDE; + orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second) override; - virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index) SAL_OVERRIDE; + virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index) override; virtual void set_format(orcus::spreadsheet::row_t row_start, orcus::spreadsheet::col_t col_start, - orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end, size_t xf_index) SAL_OVERRIDE; + orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end, size_t xf_index) override; - virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) SAL_OVERRIDE; - virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE; - virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double val) SAL_OVERRIDE; + virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) override; + virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) override; + virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double val) override; virtual void set_shared_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, - const char* p_formula, size_t n_formula) SAL_OVERRIDE; + const char* p_formula, size_t n_formula) override; virtual void set_shared_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, - const char* p_formula, size_t n_formula, const char* p_range, size_t n_range) SAL_OVERRIDE; + const char* p_formula, size_t n_formula, const char* p_range, size_t n_range) override; - virtual void set_shared_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) SAL_OVERRIDE; + virtual void set_shared_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) override; virtual void set_array_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, - const char* p, size_t n, orcus::spreadsheet::row_t array_rows, orcus::spreadsheet::col_t array_cols) SAL_OVERRIDE; + const char* p, size_t n, orcus::spreadsheet::row_t array_rows, orcus::spreadsheet::col_t array_cols) override; virtual void set_array_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, - const char* p, size_t n, const char* p_range, size_t n_range) SAL_OVERRIDE; + const char* p, size_t n, const char* p_range, size_t n_range) override; SCTAB getIndex() const { return mnTab; } }; @@ -357,81 +357,81 @@ public: // font - virtual void set_font_count(size_t n) SAL_OVERRIDE; - virtual void set_font_bold(bool b) SAL_OVERRIDE; - virtual void set_font_italic(bool b) SAL_OVERRIDE; - virtual void set_font_name(const char* s, size_t n) SAL_OVERRIDE; - virtual void set_font_size(double point) SAL_OVERRIDE; - virtual void set_font_underline(orcus::spreadsheet::underline_t e) SAL_OVERRIDE; + virtual void set_font_count(size_t n) override; + virtual void set_font_bold(bool b) override; + virtual void set_font_italic(bool b) override; + virtual void set_font_name(const char* s, size_t n) override; + virtual void set_font_size(double point) override; + virtual void set_font_underline(orcus::spreadsheet::underline_t e) override; virtual void set_font_color( orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; - virtual size_t commit_font() SAL_OVERRIDE; + orcus::spreadsheet::color_elem_t blue) override; + virtual size_t commit_font() override; // fill - virtual void set_fill_count(size_t n) SAL_OVERRIDE; - virtual void set_fill_pattern_type(const char* s, size_t n) SAL_OVERRIDE; - virtual void set_fill_fg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; - virtual void set_fill_bg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; - virtual size_t commit_fill() SAL_OVERRIDE; + virtual void set_fill_count(size_t n) override; + virtual void set_fill_pattern_type(const char* s, size_t n) override; + virtual void set_fill_fg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; + virtual void set_fill_bg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; + virtual size_t commit_fill() override; // border - virtual void set_border_count(size_t n) SAL_OVERRIDE; - virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) SAL_OVERRIDE; + virtual void set_border_count(size_t n) override; + virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override; virtual void set_border_color(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; - virtual size_t commit_border() SAL_OVERRIDE; + orcus::spreadsheet::color_elem_t blue) override; + virtual size_t commit_border() override; // cell protection - virtual void set_cell_hidden(bool b) SAL_OVERRIDE; - virtual void set_cell_locked(bool b) SAL_OVERRIDE; - virtual size_t commit_cell_protection() SAL_OVERRIDE; + virtual void set_cell_hidden(bool b) override; + virtual void set_cell_locked(bool b) override; + virtual size_t commit_cell_protection() override; // number format - virtual void set_number_format_count(size_t n) SAL_OVERRIDE; - virtual void set_number_format_identifier(size_t n) SAL_OVERRIDE; - virtual void set_number_format_code(const char* s, size_t n) SAL_OVERRIDE; - virtual size_t commit_number_format() SAL_OVERRIDE; + virtual void set_number_format_count(size_t n) override; + virtual void set_number_format_identifier(size_t n) override; + virtual void set_number_format_code(const char* s, size_t n) override; + virtual size_t commit_number_format() override; // cell style xf - virtual void set_cell_style_xf_count(size_t n) SAL_OVERRIDE; - virtual size_t commit_cell_style_xf() SAL_OVERRIDE; + virtual void set_cell_style_xf_count(size_t n) override; + virtual size_t commit_cell_style_xf() override; // cell xf - virtual void set_cell_xf_count(size_t n) SAL_OVERRIDE; - virtual size_t commit_cell_xf() SAL_OVERRIDE; + virtual void set_cell_xf_count(size_t n) override; + virtual size_t commit_cell_xf() override; // dxf - virtual void set_dxf_count(size_t count) SAL_OVERRIDE; - virtual size_t commit_dxf() SAL_OVERRIDE; + virtual void set_dxf_count(size_t count) override; + virtual size_t commit_dxf() override; // xf (cell format) - used both by cell xf and cell style xf. - virtual void set_xf_number_format(size_t index) SAL_OVERRIDE; - virtual void set_xf_font(size_t index) SAL_OVERRIDE; - virtual void set_xf_fill(size_t index) SAL_OVERRIDE; - virtual void set_xf_border(size_t index) SAL_OVERRIDE; - virtual void set_xf_protection(size_t index) SAL_OVERRIDE; - virtual void set_xf_style_xf(size_t index) SAL_OVERRIDE; - virtual void set_xf_apply_alignment(bool b) SAL_OVERRIDE; - virtual void set_xf_horizontal_alignment(orcus::spreadsheet::hor_alignment_t align) SAL_OVERRIDE; - virtual void set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_t align) SAL_OVERRIDE; + virtual void set_xf_number_format(size_t index) override; + virtual void set_xf_font(size_t index) override; + virtual void set_xf_fill(size_t index) override; + virtual void set_xf_border(size_t index) override; + virtual void set_xf_protection(size_t index) override; + virtual void set_xf_style_xf(size_t index) override; + virtual void set_xf_apply_alignment(bool b) override; + virtual void set_xf_horizontal_alignment(orcus::spreadsheet::hor_alignment_t align) override; + virtual void set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_t align) override; // cell style entry - virtual void set_cell_style_count(size_t n) SAL_OVERRIDE; - virtual void set_cell_style_name(const char* s, size_t n) SAL_OVERRIDE; - virtual void set_cell_style_xf(size_t index) SAL_OVERRIDE; - virtual void set_cell_style_builtin(size_t index) SAL_OVERRIDE; - virtual size_t commit_cell_style() SAL_OVERRIDE; + virtual void set_cell_style_count(size_t n) override; + virtual void set_cell_style_name(const char* s, size_t n) override; + virtual void set_cell_style_xf(size_t index) override; + virtual void set_cell_style_builtin(size_t index) override; + virtual size_t commit_cell_style() override; }; class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory @@ -465,13 +465,13 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory public: ScOrcusFactory(ScDocument& rDoc); - virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) SAL_OVERRIDE; - virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) SAL_OVERRIDE; - virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) SAL_OVERRIDE; - virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() SAL_OVERRIDE; - virtual orcus::spreadsheet::iface::import_shared_strings* get_shared_strings() SAL_OVERRIDE; - virtual orcus::spreadsheet::iface::import_styles* get_styles() SAL_OVERRIDE; - virtual void finalize() SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) override; + virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) override; + virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) override; + virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() override; + virtual orcus::spreadsheet::iface::import_shared_strings* get_shared_strings() override; + virtual orcus::spreadsheet::iface::import_styles* get_styles() override; + virtual void finalize() override; size_t appendString(const OUString& rStr); size_t addString(const OUString& rStr); @@ -497,33 +497,33 @@ public: ScOrcusTable(SCTAB nTab, ScDocument& rDoc); virtual ~ScOrcusTable(); - virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() override; - virtual void set_identifier(size_t id) SAL_OVERRIDE; + virtual void set_identifier(size_t id) override; - virtual void set_range(const char* p_ref, size_t n_ref) SAL_OVERRIDE; + virtual void set_range(const char* p_ref, size_t n_ref) override; - virtual void set_totals_row_count(size_t row_count) SAL_OVERRIDE; + virtual void set_totals_row_count(size_t row_count) override; - virtual void set_name(const char* p, size_t n) SAL_OVERRIDE; + virtual void set_name(const char* p, size_t n) override; - virtual void set_display_name(const char* p, size_t n) SAL_OVERRIDE; + virtual void set_display_name(const char* p, size_t n) override; - virtual void set_column_count(size_t n) SAL_OVERRIDE; + virtual void set_column_count(size_t n) override; - virtual void set_column_identifier(size_t id) SAL_OVERRIDE; - virtual void set_column_name(const char* p, size_t n) SAL_OVERRIDE; - virtual void set_column_totals_row_label(const char* p, size_t n) SAL_OVERRIDE; - virtual void set_column_totals_row_function(orcus::spreadsheet::totals_row_function_t func) SAL_OVERRIDE; - virtual void commit_column() SAL_OVERRIDE; + virtual void set_column_identifier(size_t id) override; + virtual void set_column_name(const char* p, size_t n) override; + virtual void set_column_totals_row_label(const char* p, size_t n) override; + virtual void set_column_totals_row_function(orcus::spreadsheet::totals_row_function_t func) override; + virtual void commit_column() override; - virtual void set_style_name(const char* p, size_t n) SAL_OVERRIDE; - virtual void set_style_show_first_column(bool b) SAL_OVERRIDE; - virtual void set_style_show_last_column(bool b) SAL_OVERRIDE; - virtual void set_style_show_row_stripes(bool b) SAL_OVERRIDE; - virtual void set_style_show_column_stripes(bool b) SAL_OVERRIDE; + virtual void set_style_name(const char* p, size_t n) override; + virtual void set_style_show_first_column(bool b) override; + virtual void set_style_show_last_column(bool b) override; + virtual void set_style_show_row_stripes(bool b) override; + virtual void set_style_show_column_stripes(bool b) override; - virtual void commit() SAL_OVERRIDE; + virtual void commit() override; }; #endif diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index 6def209da0fd..1de3815064a7 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -36,10 +36,10 @@ public: PivotCacheField& rCacheField ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: PivotCacheField& mrCacheField; @@ -54,10 +54,10 @@ public: PivotCache& rPivotCache ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void finalizeImport() override; private: PivotCache& mrPivotCache; @@ -72,9 +72,9 @@ public: const PivotCache& rPivotCache ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; private: void startCacheRecord(); @@ -97,7 +97,7 @@ public: PivotCache& rPivotCache ); /** Imports the entire fragment, returns true, if EOF record has been reached. */ - virtual bool importFragment() SAL_OVERRIDE; + virtual bool importFragment() override; private: PivotCache& mrPivotCache; @@ -112,7 +112,7 @@ public: /** Reads the current record from stream and tries to insert a cell into the source data sheet. */ - virtual void importRecord( BiffInputStream& rStrm ) SAL_OVERRIDE; + virtual void importRecord( BiffInputStream& rStrm ) override; private: void startNextRow(); diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index dd195a463ddb..74f893b63da9 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -38,10 +38,10 @@ public: PivotTableField& rTableField ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: PivotTableField& mrTableField; @@ -55,10 +55,10 @@ public: PivotTableFilter& rTableFilter ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: PivotTableFilter& mrTableFilter; @@ -72,9 +72,9 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; private: PivotTable& mrPivotTable; diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index ebd9913398db..10d60242f0b2 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -35,10 +35,10 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; private: QueryTable& mrQueryTable; diff --git a/sc/source/filter/inc/revisionfragment.hxx b/sc/source/filter/inc/revisionfragment.hxx index f16a9e996f65..ee4e2757e334 100644 --- a/sc/source/filter/inc/revisionfragment.hxx +++ b/sc/source/filter/inc/revisionfragment.hxx @@ -29,13 +29,13 @@ public: protected: virtual oox::core::ContextHandlerRef onCreateContext( - sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + sal_Int32 nElement, const AttributeList& rAttribs ) override; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual void finalizeImport() SAL_OVERRIDE; + virtual void finalizeImport() override; private: void importHeader( const AttributeList& rAttribs ); @@ -54,13 +54,13 @@ public: protected: virtual oox::core::ContextHandlerRef onCreateContext( - sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + sal_Int32 nElement, const AttributeList& rAttribs ) override; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual void finalizeImport() SAL_OVERRIDE; + virtual void finalizeImport() override; private: void importCommon( const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index e9abc4f56f86..67685c8f9c93 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -34,8 +34,8 @@ public: explicit RichStringContext( ParentType& rParent, RichStringRef xString ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; private: RichStringRef mxString; /// Processed string. diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index 857ed87fe0f3..cdc5dde1c9eb 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -72,7 +72,7 @@ private: public: ScRTFParser( EditEngine* ); virtual ~ScRTFParser(); - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) SAL_OVERRIDE; + virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) override; }; #endif diff --git a/sc/source/filter/inc/scenariocontext.hxx b/sc/source/filter/inc/scenariocontext.hxx index f783be067751..300e61f3f83b 100644 --- a/sc/source/filter/inc/scenariocontext.hxx +++ b/sc/source/filter/inc/scenariocontext.hxx @@ -34,11 +34,11 @@ public: explicit ScenarioContext( WorksheetContextBase& rParent, SheetScenarios& rSheetScenarios ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: Scenario& mrScenario; @@ -50,11 +50,11 @@ public: explicit ScenariosContext( WorksheetFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: SheetScenarios& mrSheetScenarios; diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 73b26f4b64df..9e0457fd6b58 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -595,7 +595,7 @@ public: FaceName[sizeof(FaceName)-1] = 0; } Sc10FontData( SvStream& rStream ); - virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10FontData(*this); } + virtual ScDataObject* Clone() const override { return new Sc10FontData(*this); } }; // Font-Collection @@ -629,7 +629,7 @@ public: memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10NameData(SvStream& rStream); - virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10NameData(*this); } + virtual ScDataObject* Clone() const override { return new Sc10NameData(*this); } }; // Range-Collection @@ -680,7 +680,7 @@ public: memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10PatternData(SvStream& rStream); -virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10PatternData(*this); } +virtual ScDataObject* Clone() const override { return new Sc10PatternData(*this); } }; // Template-Collection @@ -708,7 +708,7 @@ public: memcpy(&DataBaseRec, &rData.DataBaseRec, sizeof(DataBaseRec)); } Sc10DataBaseData(SvStream& rStream); -virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10DataBaseData(*this); } +virtual ScDataObject* Clone() const override { return new Sc10DataBaseData(*this); } }; // DataBank-Collection @@ -732,7 +732,7 @@ public: Sc10PageData( const Sc10PageFormat& rFormat ) : aPageFormat(rFormat) {} bool operator==( const Sc10PageData& rData ) const { return aPageFormat == rData.aPageFormat; } - virtual ScDataObject* Clone() const SAL_OVERRIDE; + virtual ScDataObject* Clone() const override; }; // PageFormat-Collection diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index f7c321ef784a..f0cf30ae5ac1 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -33,11 +33,11 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void finalizeImport() override; }; } // namespace xls diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 206d36500f65..98d251e4bf85 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -65,11 +65,11 @@ public: virtual ~SheetDataContext(); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; private: /** Different types of cell records. */ diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index a71cecd01f82..93e5b0c870a9 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -82,9 +82,9 @@ public: explicit ExcelGraphicHelper( const WorkbookHelper& rHelper ); /** Derived classes may implement to resolve a scheme color from the passed XML token identifier. */ - virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE; + virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const override; /** Derived classes may implement to resolve a palette index to an RGB color. */ - virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const SAL_OVERRIDE; + virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const override; }; class Color : public ::oox::drawingml::Color diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index 9c1836d976db..878c91943879 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -32,8 +32,8 @@ public: explicit IndexedColorsContext( WorkbookFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; }; class FontContext : public WorkbookContextBase @@ -44,7 +44,7 @@ public: WorkbookContextBase( rParent ), mxFont( rxFont ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: FontRef mxFont; @@ -58,8 +58,8 @@ public: WorkbookContextBase( rParent ), mxBorder( rxBorder ) {} protected: - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: BorderRef mxBorder; @@ -73,7 +73,7 @@ public: WorkbookContextBase( rParent ), mxFill( rxFill ), mfGradPos( -1.0 ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: FillRef mxFill; @@ -88,8 +88,8 @@ public: WorkbookContextBase( rParent ), mxXf( rxXf ), mbCellXf( bCellXf ) {} protected: - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: XfRef mxXf; @@ -104,7 +104,7 @@ public: WorkbookContextBase( rParent ), mxDxf( rxDxf ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: DxfRef mxDxf; @@ -118,11 +118,11 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void finalizeImport() override; }; } // namespace xls diff --git a/sc/source/filter/inc/tablecolumnscontext.hxx b/sc/source/filter/inc/tablecolumnscontext.hxx index 513af5eea461..8d25ce9e28b5 100644 --- a/sc/source/filter/inc/tablecolumnscontext.hxx +++ b/sc/source/filter/inc/tablecolumnscontext.hxx @@ -34,11 +34,11 @@ public: explicit TableColumnContext( WorksheetContextBase& rParent, TableColumn& rTableColumn ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: TableColumn& mrTableColumn; @@ -50,11 +50,11 @@ public: explicit TableColumnsContext( WorksheetFragmentBase& rFragment, TableColumns& rTableColumns ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: TableColumns& mrTableColumns; diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index 43fe8c5923f0..67760683d56c 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -35,10 +35,10 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; private: Table& mrTable; diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx index b67feaf275cb..4a28034c4b9f 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -36,13 +36,13 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void finalizeImport() override; private: void importExternalReference( const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index 5c68ff55f185..0cd02b3f5d74 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -31,11 +31,11 @@ public: explicit DataValidationsContext( WorksheetFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; private: /** Imports the dataValidation element containing data validation settings. */ @@ -55,14 +55,14 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void initializeImport() SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void initializeImport() override; + virtual void finalizeImport() override; private: /** Imports page settings from a pageSetUpPr element. */ diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 2cc94f53390e..76e09398976a 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -38,7 +38,7 @@ public: private: /** Override to create a new temporary file and return its stream. */ - virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE; + virtual SvStream* ImplQueryPictureStream() override; private: ::std::unique_ptr< ::utl::TempFile > mxPicTempFile; @@ -93,9 +93,9 @@ public: virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, - const Rectangle* pChildAnchor ) SAL_OVERRIDE; - virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) SAL_OVERRIDE; - virtual EscherExHostAppData* EnterAdditionalTextGroup() SAL_OVERRIDE; + const Rectangle* pChildAnchor ) override; + virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) override; + virtual EscherExHostAppData* EnterAdditionalTextGroup() override; /// Flush and merge PicStream into EscherStream void EndDocument(); @@ -153,7 +153,7 @@ class XclEscherClientData : public EscherExClientRecord_Base { public: XclEscherClientData() {} - virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; + virtual void WriteData( EscherEx& rEx ) const override; }; // --- class XclEscherClientTextbox ---------------------------------- @@ -175,7 +175,7 @@ public: //! ONLY for the AdditionalText mimic inline void SetXclObj( XclObj* p ) { pXclObj = p; } - virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; + virtual void WriteData( EscherEx& rEx ) const override; }; #endif // _XCL97ESC_HXX diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index d9c4aafe8d68..e227170d5d35 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -65,8 +65,8 @@ public: /// close groups and DgContainer opened in ctor void EndSheet(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; static void ResetCounters(); @@ -108,7 +108,7 @@ protected: void ImplWriteAnchor( const XclExpRoot& rRoot, const SdrObject* pSdrObj, const Rectangle* pChildAnchor ); // overwritten for writing MSODRAWING record - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; virtual void WriteSubRecs( XclExpStream& rStrm ); void SaveTextRecs( XclExpStream& rStrm ); @@ -149,7 +149,7 @@ public: //! actually writes ESCHER_ClientTextbox void SetText( const XclExpRoot& rRoot, const SdrTextObj& rObj ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; }; // --- class XclObjComment ------------------------------------------- @@ -173,8 +173,8 @@ public: void ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle& rRect, SdrObject* pCaption, bool bVisible ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // --- class XclObjDropDown ------------------------------------------ @@ -184,7 +184,7 @@ class XclObjDropDown : public XclObj private: bool bIsFiltered; - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; protected: public: @@ -206,13 +206,13 @@ public: inline void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; } inline void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; } - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; private: XclExpStringRef mpString; /// Text and formatting data. @@ -230,13 +230,13 @@ private: const SdrObject& rOleObj; SotStorage* pRootStorage; - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; public: XclObjOle( XclExpObjectManager& rObjMgr, const SdrObject& rObj ); virtual ~XclObjOle(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; }; // --- class XclObjAny ----------------------------------------------- @@ -244,7 +244,7 @@ public: class XclObjAny : public XclObj { protected: - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; public: XclObjAny( XclExpObjectManager& rObjMgr, @@ -255,8 +255,8 @@ public: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > GetShape() const { return mxShape; } - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ); static void WriteFromTo( XclExpXmlStream& rStrm, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, SCTAB nTab ); @@ -274,13 +274,13 @@ protected: sal_uInt32 nFileHistory; // bfh sal_uInt32 nLowestBiffVer; // sfo - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: ExcBof8_Base(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // --- class ExcBofW8 ------------------------------------------------ @@ -309,15 +309,15 @@ private: OUString sUnicodeName; XclExpString GetName() const { return XclExpString( sUnicodeName, EXC_STR_8BITLENGTH );} - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: ExcBundlesheet8( RootData& rRootData, SCTAB nTab ); ExcBundlesheet8( const OUString& rString ); - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // --- class XclObproj ----------------------------------------------- @@ -325,8 +325,8 @@ public: class XclObproj : public ExcRecord { public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // ---- class XclCodename -------------------------------------------- @@ -335,12 +335,12 @@ class XclCodename : public ExcRecord { private: XclExpString aName; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclCodename( const OUString& ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // ---- Scenarios ---------------------------------------------------- @@ -381,17 +381,17 @@ private: bool Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt ); - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; protected: public: ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ); virtual ~ExcEScenario(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class ExcEScenarioManager : public ExcRecord @@ -400,18 +400,18 @@ private: sal_uInt16 nActive; std::vector<ExcEScenario*> aScenes; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; protected: public: ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ); virtual ~ExcEScenarioManager(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; /** Represents a FEATHDR (SHEETPROTECTION) record that stores sheet protection @@ -423,7 +423,7 @@ public: explicit XclExpSheetProtectOptions( const XclExpRoot& rRoot, SCTAB nTab ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnOptions; /// Encoded sheet protection options. @@ -437,7 +437,7 @@ public: explicit XclExpSheetEnhancedProtection( const XclExpRoot& rRoot, const ScEnhancedProtection& rProt ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const XclExpRoot& mrRoot; @@ -449,14 +449,14 @@ class XclCalccount : public ExcRecord private: sal_uInt16 nCount; protected: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclCalccount( const ScDocument& ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclIteration : public ExcRecord @@ -464,14 +464,14 @@ class XclIteration : public ExcRecord private: sal_uInt16 nIter; protected: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclIteration( const ScDocument& ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclDelta : public ExcRecord @@ -479,14 +479,14 @@ class XclDelta : public ExcRecord private: double fDelta; protected: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclDelta( const ScDocument& ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclRefmode : public XclExpBoolRecord @@ -494,7 +494,7 @@ class XclRefmode : public XclExpBoolRecord public: XclRefmode( const ScDocument& ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpFileEncryption : public XclExpRecord @@ -504,7 +504,7 @@ public: virtual ~XclExpFileEncryption(); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const XclExpRoot& mrRoot; @@ -517,7 +517,7 @@ public: explicit XclExpInterfaceHdr( sal_uInt16 nCodePage ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; /** End of User Interface Records */ @@ -528,7 +528,7 @@ public: virtual ~XclExpInterfaceEnd(); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; /** Write Access User Name - This record contains the user name, which is @@ -540,7 +540,7 @@ public: virtual ~XclExpWriteAccess(); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; class XclExpFileSharing : public XclExpRecord @@ -548,10 +548,10 @@ class XclExpFileSharing : public XclExpRecord public: explicit XclExpFileSharing( const XclExpRoot& rRoot, sal_uInt16 nPasswordHash, bool bRecommendReadOnly ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpString maUserName; @@ -566,7 +566,7 @@ public: virtual ~XclExpProt4Rev(); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; class XclExpProt4RevPass : public XclExpRecord @@ -576,7 +576,7 @@ public: virtual ~XclExpProt4RevPass(); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; class XclExpRecalcId : public XclExpDummyRecord diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 4de16588ed5e..35dd574675dc 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -167,7 +167,7 @@ public: virtual ~XclExpChGroupBase(); /** Saves the header record. Calls WriteSubRecords() to let derived classes write sub records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; /** Derived classes return whether there are any records embedded in this group. */ virtual bool HasSubRecords() const; /** Derived classes implement writing any records embedded in this group. */ @@ -192,7 +192,7 @@ public: XclFutureRecType eRecType, sal_uInt16 nRecId, sal_Size nRecSize = 0 ); /** Writes missing CHFRBLOCKBEGIN records and this record. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; }; // Frame formatting =========================================================== @@ -206,7 +206,7 @@ public: inline XclChFramePos& GetFramePosData() { return maData; } private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChFramePos maData; /// Position of the frame. @@ -238,7 +238,7 @@ public: bool IsDefault( XclChFrameType eDefFrameType ) const; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChLineFormat maData; /// Contents of the CHLINEFORMAT record. @@ -269,7 +269,7 @@ public: bool IsDefault( XclChFrameType eDefFrameType ) const; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChAreaFormat maData; /// Contents of the CHAREAFORMAT record. @@ -291,17 +291,17 @@ public: bool IsValid() const; /** Writes the CHESCHERFORMAT record group to the stream, if complex formatting is extant. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; /** Returns true, if this record group contains a CHPICFORMAT record. */ - virtual bool HasSubRecords() const SAL_OVERRIDE; + virtual bool HasSubRecords() const override; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: /** Inserts a color from the contained Escher property set into the color palette. */ sal_uInt32 RegisterColor( sal_uInt16 nPropId ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChEscherFormat maData; /// Fill properties for complex areas (CHESCHERFORMAT record). @@ -365,12 +365,12 @@ public: bool IsDeleteable() const; /** Writes the entire record group. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChFrame maData; /// Contents of the CHFRAME record. @@ -401,10 +401,10 @@ public: inline bool HasString() const { return mxString && !mxString->IsEmpty(); } /** Writes the CHSOURCELINK record and optionally a CHSTRING record with explicit string data. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChSourceLink maData; /// Contents of the CHSOURCELINK record. @@ -432,7 +432,7 @@ public: explicit XclExpChObjectLink( sal_uInt16 nLinkTarget, const XclChDataPointPos& rPointPos ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChObjectLink maData; /// Contents of the CHOBJECTLINK record. @@ -453,7 +453,7 @@ public: bool bShowPercent, bool bShowBubble ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChFrLabelProps maData; /// Contents of the CHFRLABELPROPS record. @@ -491,9 +491,9 @@ public: explicit XclExpChText( const XclExpChRoot& rRoot ); /** Sets font color and color identifier to internal data structures. */ - virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ) SAL_OVERRIDE; + virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ) override; /** Sets text rotation to internal data structures. */ - virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE; + virtual void SetRotation( sal_uInt16 nRotation ) override; /** Converts all text settings of the passed title text object. */ void ConvertTitle( css::uno::Reference< css::chart2::XTitle > xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = NULL ); @@ -511,10 +511,10 @@ public: sal_uInt16 GetAttLabelFlags() const; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChText maData; /// Contents of the CHTEXT record. @@ -555,7 +555,7 @@ private: /** Registers marker colors in palette and stores color identifiers. */ void RegisterColors( const XclExpChRoot& rRoot ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChMarkerFormat maData; /// Contents of the CHMARKERFORMAT record. @@ -587,7 +587,7 @@ public: void Convert( const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclCh3dDataFormat maData; /// Contents of the CH3DDATAFORMAT record. @@ -627,10 +627,10 @@ public: inline bool IsSeriesFormat() const { return maData.maPointPos.mnPointIdx == EXC_CHDATAFORMAT_ALLPOINTS; } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChDataFormat maData; /// Contents of the CHDATAFORMAT record. @@ -659,7 +659,7 @@ public: inline XclExpChTextRef GetDataLabel() const { return mxLabel; } private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChSerTrendLine maData; /// Contents of the CHSERTRENDLINE record. @@ -679,7 +679,7 @@ public: bool Convert( XclExpChSourceLink& rValueLink, sal_uInt16& rnValueCount, const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChSerErrorBar maData; /// Contents of the CHSERERRORBAR record. @@ -718,7 +718,7 @@ public: void ConvertCategSequence( css::uno::Reference< css::chart2::data::XLabeledDataSequence > xCategSeq ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: /** Initializes members of this series to represent a child of the passed series. */ @@ -733,7 +733,7 @@ private: void CreateErrorBar( const ScfPropertySet& rPropSet, const OUString& rShowPropName, sal_uInt8 nBarId ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpChDataFormat > XclExpChDataFormatList; @@ -776,7 +776,7 @@ public: inline const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; } private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChType maData; /// Contents of the chart type record. @@ -798,7 +798,7 @@ public: inline bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); } private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChChart3d maData; /// Contents of the CHCHART3D record. @@ -820,10 +820,10 @@ public: void Convert( const ScfPropertySet& rPropSet ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChLegend maData; /// Contents of the CHLEGEND record. @@ -848,10 +848,10 @@ public: void Convert( const ScfPropertySet& rPropSet ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChObjectType meObjType; /// Type of the dropbar. @@ -901,7 +901,7 @@ public: inline bool IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: /** Returns an unused format index to be used for the next created series. */ @@ -916,7 +916,7 @@ private: bool CreateStockSeries( css::uno::Reference< css::chart2::XDataSeries > xDataSeries, const OUString& rValueRole, bool bCloseSymbol ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpChSeries > XclExpChSeriesList; @@ -952,8 +952,8 @@ public: { ::set_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_BETWEEN, bTicksBetween ); } private: - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChLabelRange maLabelData; /// Contents of the CHLABELRANGE record. @@ -973,7 +973,7 @@ public: void ConvertAxisPosition( const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChValueRange maData; /// Contents of the CHVALUERANGE record. @@ -994,7 +994,7 @@ public: void SetRotation( sal_uInt16 nRotation ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChTick maData; /// Contents of the CHTICK record. @@ -1015,9 +1015,9 @@ public: explicit XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType ); /** Sets font color and color identifier to internal data structures. */ - virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ) SAL_OVERRIDE; + virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ) override; /** Sets text rotation to internal data structures. */ - virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE; + virtual void SetRotation( sal_uInt16 nRotation ) override; /** Converts formatting and scaling settings from the passed axis. */ void Convert( css::uno::Reference< css::chart2::XAxis > xAxis, @@ -1033,10 +1033,10 @@ public: inline sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChAxis maData; /// Contents of the CHAXIS record. @@ -1079,7 +1079,7 @@ public: bool Is3dChart() const; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: /** Returns first inserted chart type group. */ @@ -1094,7 +1094,7 @@ private: const XclChExtTypeInfo& rTypeInfo, sal_Int32 nCrossingAxisDim ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpChTypeGroup > XclExpChTypeGroupList; @@ -1138,10 +1138,10 @@ public: void SetManualPlotArea(); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpChSeries > XclExpChSeriesList; @@ -1169,7 +1169,7 @@ public: const Size& rChartSize ); virtual ~XclExpChartDrawing(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: std::shared_ptr< XclExpObjectManager > mxObjMgr; diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 5567dc1119ff..e735b0fe6d80 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -60,8 +60,8 @@ public: sal_uInt32 Insert( XclExpStringRef xString ); /** Writes the complete SST and EXTSST records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef std::unique_ptr< XclExpSstImpl > XclExpSstImplPtr; @@ -82,8 +82,8 @@ public: sal_uInt32 GetBaseXFId( const ScAddress& rPos ) const; /** Writes the record, if it contains at least one merged cell range. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: ScRangeList maMergedRanges; /// All merged cell ranges of the sheet. @@ -106,7 +106,7 @@ public: /** Returns the cell representation text or 0, if not available. */ inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? 0 : &m_Repr; } - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; void WriteEmbeddedData( XclExpStream& rStrm ); @@ -120,7 +120,7 @@ public: private: /** Writes the body of the HLINK record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef std::unique_ptr< SvStream > SvStreamPtr; @@ -146,7 +146,7 @@ public: explicit XclExpLabelranges( const XclExpRoot& rRoot ); /** Writes the LABELRANGES record if it contains at least one range. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: /** Fills the specified range list with all label headers of the current sheet. @@ -173,11 +173,11 @@ public: explicit XclExpCF( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority ); virtual ~XclExpCF(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the CF record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef std::unique_ptr< XclExpCFImpl > XclExpCFImplPtr; @@ -190,7 +190,7 @@ public: explicit XclExpDateFormat( const XclExpRoot& rRoot, const ScCondDateFormatEntry& rFormatEntry, sal_Int32 nPriority ); virtual ~XclExpDateFormat(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: const ScCondDateFormatEntry& mrFormatEntry; @@ -203,7 +203,7 @@ public: explicit XclExpCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rFormatEntry, const ScAddress& rPos, bool bFirst = true); virtual ~XclExpCfvo() {} - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: const ScColorScaleEntry& mrEntry; ScAddress maSrcPos; @@ -216,7 +216,7 @@ public: explicit XclExpColScaleCol( const XclExpRoot& rRoot, const Color& rColor); virtual ~XclExpColScaleCol(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: const Color& mrColor; }; @@ -235,12 +235,12 @@ public: bool IsValid() const; /** Writes the CONDFMT record with following CF records, if there is valid data. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the CONDFMT record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpRecord > XclExpCFList; @@ -255,7 +255,7 @@ class XclExpColorScale: public XclExpRecord, protected XclExpRoot public: explicit XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpCfvo > XclExpCfvoList; typedef XclExpRecordList< XclExpColScaleCol > XclExpColScaleColList; @@ -270,7 +270,7 @@ class XclExpDataBar : public XclExpRecord, protected XclExpRoot public: explicit XclExpDataBar( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, sal_Int32 nPriority, const OString& rGUID); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: std::unique_ptr<XclExpCfvo> mpCfvoLowerLimit; std::unique_ptr<XclExpCfvo> mpCfvoUpperLimit; @@ -286,7 +286,7 @@ class XclExpIconSet : public XclExpRecord, protected XclExpRoot public: explicit XclExpIconSet( const XclExpRoot& rRoot, const ScIconSetFormat& rFormat, sal_Int32 nPriority ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpCfvo > XclExpCfvoList; @@ -303,8 +303,8 @@ public: explicit XclExpCondFormatBuffer( const XclExpRoot& rRoot, XclExtLstRef xExtLst ); /** Writes all contained CONDFMT records with their CF records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpCondfmt > XclExpCondfmtList; @@ -332,11 +332,11 @@ public: @return false = Resulting range list empty - do not write this record. */ bool Finalize(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the DV record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: ScRangeList maScRanges; /// Calc range list with all affected cells. @@ -365,15 +365,15 @@ public: void InsertCellRange( const ScRange& rRange, sal_uLong nScHandle ); /** Writes the DVAL record and the DV record list. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Searches for or creates a XclExpDV record object with the specified handle. */ XclExpDV& SearchOrCreateDv( sal_uLong nScHandle ); /** Writes the body of the DVAL record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpDV > XclExpDVList; @@ -401,7 +401,7 @@ public: virtual ~XclExpWebQuery(); /** Writes all needed records for this web query. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: XclExpString maDestRange; /// Destination range. diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index a20bdd962947..33b992d10e02 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -54,7 +54,7 @@ public: /** Called from SVX DFF converter. @param rRect The object anchor rectangle to be exported (in twips). */ - virtual void WriteData( EscherEx& rEscherEx, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void WriteData( EscherEx& rEscherEx, const Rectangle& rRect ) override; private: virtual void ImplSetFlags( const SdrObject& rSdrObj ); @@ -72,8 +72,8 @@ public: explicit XclExpDffSheetAnchor( const XclExpRoot& rRoot ); private: - virtual void ImplSetFlags( const SdrObject& rSdrObj ) SAL_OVERRIDE; - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) SAL_OVERRIDE; + virtual void ImplSetFlags( const SdrObject& rSdrObj ) override; + virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) override; private: SCTAB mnScTab; /// Calc sheet index. @@ -87,8 +87,8 @@ public: const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ); private: - virtual void ImplSetFlags( const SdrObject& rSdrObj ) SAL_OVERRIDE; - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) SAL_OVERRIDE; + virtual void ImplSetFlags( const SdrObject& rSdrObj ) override; + virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) override; private: Size maPageSize; @@ -119,7 +119,7 @@ public: explicit XclExpMsoDrawingBase( XclEscherEx& rEscherEx, sal_uInt16 nRecId ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; protected: XclEscherEx& mrEscherEx; /// Reference to the DFF converter containing the DFF stream. @@ -151,8 +151,8 @@ public: explicit XclExpImgData( const Graphic& rGraphic, sal_uInt16 nRecId ); /** Writes the BITMAP record. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: Graphic maGraphic; /// The VCL graphic. @@ -214,7 +214,7 @@ public: explicit XclExpShapeObj( XclExpObjectManager& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, ScDocument* pDoc ); virtual ~XclExpShapeObj(); private: - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; }; //delete for exporting OCX @@ -232,7 +232,7 @@ public: sal_uInt32 nStrmStart, sal_uInt32 nStrmSize ); private: - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; private: OUString maClassName; /// Class name of the control. @@ -256,7 +256,7 @@ public: bool SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent ); private: - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; /** Writes a subrecord containing a cell link, or nothing, if no link present. */ void WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId ); @@ -296,8 +296,8 @@ public: virtual ~XclExpChartObj(); /** Writes the OBJ record and the entire chart substream. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; const css::uno::Reference<css::chart::XChartDocument>& GetChartDoc() const; @@ -333,14 +333,14 @@ public: const OUString& rAddText ); /** Writes the NOTE record, if the respective Escher object is present. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; void WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm ); const XclExpString& GetAuthor() const { return maAuthor; } private: /** Writes the body of the NOTE record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpString maAuthor; /// Name of the author. @@ -370,7 +370,7 @@ public: XclExpComments( SCTAB nTab, XclExpNoteList& rNotes ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: SCTAB mnTab; @@ -435,7 +435,7 @@ public: /** Creates a new DFF client anchor object for embedded objects according to the scaling data passed to the constructor. Caller takes ownership! */ - virtual XclExpDffAnchorBase* CreateDffAnchor() const SAL_OVERRIDE; + virtual XclExpDffAnchorBase* CreateDffAnchor() const override; private: Size maPageSize; diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx index fcb9a1d8a7ba..3a5270027424 100644 --- a/sc/source/filter/inc/xeextlst.hxx +++ b/sc/source/filter/inc/xeextlst.hxx @@ -49,7 +49,7 @@ class XclExpExtCfvo : public XclExpRecordBase, protected XclExpRoot { public: XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, const ScAddress& rPos, bool bFirst ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: ScColorScaleEntryType meType; @@ -81,7 +81,7 @@ class XclExpExtIcon : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpExtIcon( const XclExpRoot& rRoot, const std::pair<ScIconSetType, sal_Int32>& rCustomEntry); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: const char* pIconSetName; @@ -92,7 +92,7 @@ class XclExpExtDataBar : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpExtDataBar( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: databar::ScAxisPosition meAxisPosition; @@ -111,7 +111,7 @@ class XclExpExtIconSet : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpExtIconSet(const XclExpRoot& rRoot, const ScIconSetFormat& rFormat, const ScAddress& rPos); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: XclExpRecordList<XclExpExtCfvo> maCfvos; @@ -128,7 +128,7 @@ class XclExpExtCfRule : public XclExpRecordBase, protected XclExpRoot { public: XclExpExtCfRule( const XclExpRoot& rRoot, const ScFormatEntry& rFormat, const ScAddress& rPos, const OString& rId, sal_Int32 nPriority ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: XclExpRecordRef mxEntry; @@ -144,7 +144,7 @@ class XclExpExtConditionalFormatting : public XclExpRecordBase, protected XclExp { public: explicit XclExpExtConditionalFormatting( const XclExpRoot& rRoot, std::vector<XclExpExtCondFormatData>& rData, const ScRangeList& rRange); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: XclExpRecordList<XclExpExtCfRule> maCfRules; @@ -157,9 +157,9 @@ class XclExpExtCondFormat : public XclExpExt { public: XclExpExtCondFormat( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; - virtual XclExpExtType GetType() SAL_OVERRIDE { return XclExpExtDataBarType; } + virtual XclExpExtType GetType() override { return XclExpExtDataBarType; } void AddRecord( XclExpExtConditionalFormattingRef aFormat ); @@ -171,9 +171,9 @@ class XclExpExtCalcPr : public XclExpExt { public: XclExpExtCalcPr( const XclExpRoot& rRoot, formula::FormulaGrammar::AddressConvention eConv ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; - virtual XclExpExtType GetType() SAL_OVERRIDE { return XclExpExtDataFooType; } + virtual XclExpExtType GetType() override { return XclExpExtDataFooType; } private: formula::FormulaGrammar::AddressConvention meConv; @@ -184,7 +184,7 @@ class XclExtLst : public XclExpRecordBase, public XclExpRoot { public: explicit XclExtLst( const XclExpRoot& rRoot); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; void AddRecord( XclExpExtRef aEntry ); diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index fd3a8374d2d7..9112a9c7192a 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -198,10 +198,10 @@ public: const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ); /** Writes the entire Link table. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; /** Writes the entire Link table to OOXML. */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef std::shared_ptr< XclExpLinkManagerImpl > XclExpLinkMgrImplPtr; diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index 48188dbfc6e7..f779affc7a34 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -64,8 +64,8 @@ public: bool IsVolatile( sal_uInt16 nNameIdx ) const; /** Writes the entire list of NAME records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef std::shared_ptr< XclExpNameManagerImpl > XclExpNameMgrImplRef; diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index 3f1d161edcdb..fe05987c39be 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -36,10 +36,10 @@ class XclExpHeaderFooter : public XclExpRecord public: explicit XclExpHeaderFooter( sal_uInt16 nRecId, const OUString& rHdrString ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the header or footer string. Writes an empty record, if no header/footer present. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: OUString maHdrString; /// Header or footer contents. @@ -53,10 +53,10 @@ class XclExpSetup : public XclExpRecord public: explicit XclExpSetup( const XclPageData& rPageData ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the SETUP record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const XclPageData& mrData; /// Page settings data of current sheet. @@ -74,12 +74,12 @@ public: sal_uInt16 nMaxPos ); /** Writes the record, if the list is not empty. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the page break list. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const ScfUInt16Vec& mrPageBreaks; /// Page settings data of current sheet. @@ -99,8 +99,8 @@ public: inline const XclPageData& GetPageData() const { return maData; } /** Writes all page settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; XclExpImgData* getGraphicExport(); @@ -116,7 +116,7 @@ public: explicit XclExpChartPageSettings( const XclExpRoot& rRoot ); /** Writes all page settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: XclPageData maData; /// Page settings data. diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 450c3a411c1a..1683f3f7ee15 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -53,7 +53,7 @@ public: bool EqualsBool( bool bValue ) const; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnTypeFlag; /// Data type flag. @@ -94,7 +94,7 @@ public: void WriteIndex( XclExpStream& rStrm, sal_uInt32 nSrcRow ) const; /** Writes the pivot cache field and all items and other related records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpPCItem > XclExpPCItemList; @@ -147,7 +147,7 @@ private: void WriteSxgroupinfo( XclExpStream& rStrm ); /** Writes the contents of the SXFIELD record for this field. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpPCItemList maOrigItemList; /// List with original items. @@ -247,7 +247,7 @@ public: private: /** Writes the SXVI record body describing the pivot table item. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const XclExpPCItem* mpCacheItem; /// The referred pivot cache item. @@ -293,7 +293,7 @@ public: void WriteSxdi( XclExpStream& rStrm, sal_uInt16 nDataInfoIdx ) const; /** Writes the entire pivot table field. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: /** Returns an item by its name. */ @@ -342,7 +342,7 @@ public: sal_uInt16 GetDataFieldIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; /** Writes the entire pivot table. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: /** Returns a pivot table field by its name. */ diff --git a/sc/source/filter/inc/xepivotxml.hxx b/sc/source/filter/inc/xepivotxml.hxx index 0b34f2528241..d04f5b79b24e 100644 --- a/sc/source/filter/inc/xepivotxml.hxx +++ b/sc/source/filter/inc/xepivotxml.hxx @@ -33,7 +33,7 @@ public: }; XclExpXmlPivotCaches( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; void SetCaches( const std::vector<Entry>& rCaches ); bool HasCaches() const; @@ -64,7 +64,7 @@ class XclExpXmlPivotTables : public XclExpRecordBase, protected XclExpRoot public: XclExpXmlPivotTables( const XclExpRoot& rRoot, const XclExpXmlPivotCaches& rCaches ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; void AppendTable( const ScDPObject* pTable, sal_Int32 nCacheId, sal_Int32 nPivotId ); diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 7bbdd3655cdc..cca2c0aeaeac 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -49,7 +49,7 @@ public: XclExpDelegatingRecord( XclExpRecordBase* pRecord ); virtual ~XclExpDelegatingRecord(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: XclExpRecordBase* mpRecord; }; @@ -71,7 +71,7 @@ public: virtual ~XclExpXmlStartElementRecord(); /** Starts the element nElement */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpXmlEndElementRecord : public XclExpXmlElementRecord @@ -81,7 +81,7 @@ public: virtual ~XclExpXmlEndElementRecord(); /** Ends the element nElement */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpXmlStartSingleElementRecord : public XclExpXmlElementRecord @@ -91,7 +91,7 @@ public: virtual ~XclExpXmlStartSingleElementRecord(); /** Starts the single element nElement */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpXmlEndSingleElementRecord : public XclExpRecordBase @@ -101,7 +101,7 @@ public: virtual ~XclExpXmlEndSingleElementRecord(); /** Ends the single element nElement */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; /** Base class for single records with any content. @@ -139,7 +139,7 @@ public: void SetRecHeader( sal_uInt16 nRecId, sal_Size nRecSize ); /** Writes the record header and calls WriteBody(). */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; protected: /** Writes the body of the record (without record header). @@ -185,11 +185,11 @@ public: XclExpValueRecord* SetAttribute( sal_Int32 nId ); /** Write the OOXML attribute and its value */ - void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE { rStrm << maValue; } + virtual void WriteBody( XclExpStream& rStrm ) override { rStrm << maValue; } // inlining prevents warning in wntmsci10 private: @@ -239,11 +239,11 @@ public: /** Returns the Boolean value of the record. */ inline bool GetBool() const { return mbValue; } - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: bool mbValue; /// The record data. @@ -265,7 +265,7 @@ public: private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const void* mpData; /// The record data. @@ -280,7 +280,7 @@ public: sal_uInt16 nRecId, sal_Size nRecSize = 0 ); /** Writes the extended record header and calls WriteBody(). */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: XclFutureRecType meRecType; @@ -340,14 +340,14 @@ public: inline void RemoveAllRecords() { maRecs.clear(); } /** Writes the complete record list. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE + virtual void Save( XclExpStream& rStrm ) override { // inlining prevents warning in wntmsci10 for( typename RecordVec::iterator aIt = maRecs.begin(), aEnd = maRecs.end(); aIt != aEnd; ++aIt ) (*aIt)->Save( rStrm ); } - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE + virtual void SaveXml( XclExpXmlStream& rStrm ) override { // inlining prevents warning in wntmsci10 for( typename RecordVec::iterator aIt = maRecs.begin(), aEnd = maRecs.end(); aIt != aEnd; ++aIt ) @@ -366,7 +366,7 @@ public: explicit XclExpSubStream( sal_uInt16 nSubStrmType ); /** Writes the complete substream, including leading BOF and trailing EOF. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: sal_uInt16 mnSubStrmType; /// Substream type, stored in leading BOF record. diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 57838a58cd9a..5b95a74bcd0e 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -323,14 +323,14 @@ public: virtual bool exportDocument() throw (css::uno::RuntimeException, css::ucb::ContentCreationException, - std::exception) SAL_OVERRIDE; + std::exception) override; // only needed for import; ignore - virtual bool importDocument() throw() SAL_OVERRIDE; - virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; - virtual const oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; - virtual oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; + virtual bool importDocument() throw() override; + virtual oox::vml::Drawing* getVmlDrawing() override; + virtual const oox::drawingml::Theme* getCurrentTheme() const override; + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() override; + virtual oox::drawingml::chart::ChartConverter* getChartConverter() override; /* Now create all the overloads in a typesafe way (i.e. without varargs) by creating a number of overloads @@ -362,8 +362,8 @@ public: #undef SAX_ARGS_FUNC private: - virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; ScDocShell *getDocShell(); sax_fastparser::FSHelperPtr& WriteAttributesInternal( sal_Int32 nAttribute, ... ); diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index f08b71c61e61..1a8ca7114464 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -110,12 +110,12 @@ public: { return Color( GetColorData( nXclIndex ) ); } /** Saves the PALETTE record, if it differs from the default palette. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the PALETTE record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef std::shared_ptr< XclExpPaletteImpl > XclExpPaletteImplRef; @@ -174,11 +174,11 @@ public: @param nHash The hash value calculated from the font data. */ virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the FONT record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclFontData maData; /// All font attributes. @@ -191,7 +191,7 @@ class XclExpDxfFont : public XclExpRecordBase, protected XclExpRoot public: XclExpDxfFont(const XclExpRoot& rRoot, const SfxItemSet& rItemSet); - virtual void SaveXml(XclExpXmlStream& rStrm) SAL_OVERRIDE; + virtual void SaveXml(XclExpXmlStream& rStrm) override; private: ScDxfFont maDxfData; @@ -204,10 +204,10 @@ public: explicit XclExpBlindFont( const XclExpRoot& rRoot ); /** Returns always false to never find this font while searching the font list. */ - virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const SAL_OVERRIDE; + virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const override; /** Skips writing this record. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; }; class ScPatternAttr; @@ -246,8 +246,8 @@ public: XclExpColorType eColorType, bool bAppFont = false ); /** Writes all FONT records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Initializes the default fonts for the current BIFF version. */ @@ -297,8 +297,8 @@ public: sal_uInt16 Insert( sal_uLong nScNumFmt ); /** Writes all FORMAT records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the FORMAT record with index nXclIx and format string rFormatStr. */ @@ -482,7 +482,7 @@ public: void SetXmlIds( sal_uInt32 nBorderId, sal_uInt32 nFillId ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; protected: explicit XclExpXF( const XclExpRoot& rRoot, bool bCellXF ); @@ -526,7 +526,7 @@ private: void WriteBody8( XclExpStream& rStrm ); /** Writes the contents of the XF record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; /** Represents a default XF record. Supports methods to set attributes directly. */ @@ -552,11 +552,11 @@ public: /** Returns true, if this record represents an Excel built-in style. */ inline bool IsBuiltIn() const { return mnStyleId != EXC_STYLE_USERDEF; } - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the STYLE record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: OUString maName; /// Name of the cell style. @@ -633,8 +633,8 @@ public: sal_Int32 GetXmlCellIndex( sal_uInt32 nXFId ) const; /** Writes all XF records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpXF > XclExpXFList; @@ -714,7 +714,7 @@ public: XclExpDxfFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpColor* pColor); virtual ~XclExpDxf(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: std::unique_ptr<XclExpCellAlign> mpAlign; @@ -733,7 +733,7 @@ public: sal_Int32 GetDxfId(const OUString& rName); - virtual void SaveXml( XclExpXmlStream& rStrm) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm) override; private: typedef boost::ptr_vector<XclExpDxf> DxfContainer; std::map<OUString, sal_Int32> maStyleNameToDxfId; @@ -747,7 +747,7 @@ class XclExpXmlStyleSheet : public XclExpRecordBase, protected XclExpRoot public: explicit XclExpXmlStyleSheet( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; #endif diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 31e879dffc86..3a29f3582f4d 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -53,7 +53,7 @@ public: explicit XclExpStringRec( const XclExpRoot& rRoot, const OUString& rResult ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpStringRef mxResult; @@ -111,12 +111,12 @@ public: explicit XclExpArray( XclTokenArrayRef xTokArr, const ScRange& rScRange ); /** Creates and returns the token array for a corresponding FORMULA cell record. */ - virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const SAL_OVERRIDE; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const override; /** Returns true, if the array formula contains volatile functions. */ - virtual bool IsVolatile() const SAL_OVERRIDE; + virtual bool IsVolatile() const override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclTokenArrayRef mxTokArr; /// The token array of a matrix formula. @@ -159,12 +159,12 @@ public: void ExtendRange( const ScAddress& rScPos ); /** Creates and returns the token array for a corresponding FORMULA cell record. */ - virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const SAL_OVERRIDE; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const override; /** Returns true, if the shared formula contains volatile functions. */ - virtual bool IsVolatile() const SAL_OVERRIDE; + virtual bool IsVolatile() const override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclTokenArrayRef mxTokArr; /// The token array of a shared formula. @@ -221,18 +221,18 @@ public: void Finalize(); /** Creates and returns the token array for a corresponding FORMULA cell record. */ - virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const SAL_OVERRIDE; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const override; /** Returns true, if the multiple operations range is volatile. */ - virtual bool IsVolatile() const SAL_OVERRIDE; + virtual bool IsVolatile() const override; /** Writes the record if it is valid. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: /** Returns true, if the passed cell position can be appended to this record. */ bool IsAppendable( sal_uInt16 nXclCol, sal_uInt16 nXclRow ) const; /** Writes the contents of the TABLEOP record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnLastAppXclCol;/// Column index of last appended cell. @@ -323,15 +323,15 @@ class XclExpSingleCellBase : public XclExpCellBase { public: /** Returns the last column, which is equal to the first column for single cells. */ - virtual sal_uInt16 GetLastXclCol() const SAL_OVERRIDE; + virtual sal_uInt16 GetLastXclCol() const override; /** Return the XF identifier of the cell. */ - virtual sal_uInt32 GetFirstXFId() const SAL_OVERRIDE; + virtual sal_uInt32 GetFirstXFId() const override; /** Returns true, if this record does not contain at least one valid cell. */ - virtual bool IsEmpty() const SAL_OVERRIDE; + virtual bool IsEmpty() const override; /** Converts the XF identifier into the Excel XF index. */ - virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) SAL_OVERRIDE; + virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) override; /** Writes cell address, XF index, and calls WriteContents() for each cell. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; protected: explicit XclExpSingleCellBase( sal_uInt16 nRecId, sal_Size nContSize, @@ -349,7 +349,7 @@ protected: private: /** Writes cell address, XF index, and calls WriteContents() for each cell. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; /** Derived classes write the contents of the specified cell (without XF index). */ virtual void WriteContents( XclExpStream& rStrm ) = 0; @@ -368,9 +368,9 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, double fValue ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteContents( XclExpStream& rStrm ) override; private: double mfValue; /// The cell value. @@ -386,9 +386,9 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, bool bValue ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteContents( XclExpStream& rStrm ) override; private: bool mbValue; /// The cell value. @@ -419,15 +419,15 @@ public: const EditTextObject* pEditText, XclExpHyperlinkHelper& rHlinkHelper ); /** Returns true if the cell contains multi-line text. */ - virtual bool IsMultiLineText() const SAL_OVERRIDE; + virtual bool IsMultiLineText() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Initializes the record contents. Called from constructors. */ void Init( const XclExpRoot& rRoot, const ScPatternAttr* pPattern, XclExpStringRef xText ); - virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteContents( XclExpStream& rStrm ) override; private: XclExpStringRef mxText; /// The cell text. @@ -451,11 +451,11 @@ public: XclExpTableopBuffer& rTableopBfr ); /** Writes the FORMULA record and additional records related to the formula. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteContents( XclExpStream& rStrm ) override; private: ScFormulaCell& mrScFmlaCell; /// The Calc formula cell. @@ -479,18 +479,18 @@ class XclExpMultiCellBase : public XclExpCellBase { public: /** Returns the column index of the last cell this record describes. */ - virtual sal_uInt16 GetLastXclCol() const SAL_OVERRIDE; + virtual sal_uInt16 GetLastXclCol() const override; /** Return the XF identifier of the first contained cell. */ - virtual sal_uInt32 GetFirstXFId() const SAL_OVERRIDE; + virtual sal_uInt32 GetFirstXFId() const override; /** Returns true, if this record does not contain at least one valid cell. */ - virtual bool IsEmpty() const SAL_OVERRIDE; + virtual bool IsEmpty() const override; /** Convert all XF identifiers into the Excel XF indexes. */ - virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) SAL_OVERRIDE; + virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) override; /** Writes the record, calls WriteContents() for each contained cell. @descr May write several records, if unused XF indexes are contained. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; protected: explicit XclExpMultiCellBase( sal_uInt16 nRecId, sal_uInt16 nMulRecId, @@ -542,16 +542,16 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId ); /** Tries to merge the contents of the passed cell to own data. */ - virtual bool TryMerge( const XclExpCellBase& rCell ) SAL_OVERRIDE; + virtual bool TryMerge( const XclExpCellBase& rCell ) override; /** Inserts the Excel XF index(es) into the passed vector. */ - virtual void GetBlankXFIndexes( ScfUInt16Vec& rXFIndexes ) const SAL_OVERRIDE; + virtual void GetBlankXFIndexes( ScfUInt16Vec& rXFIndexes ) const override; /** Tries to remove unused Excel XF index(es). */ - virtual void RemoveUnusedBlankCells( const ScfUInt16Vec& rXFIndexes ) SAL_OVERRIDE; + virtual void RemoveUnusedBlankCells( const ScfUInt16Vec& rXFIndexes ) override; private: /** Writes the remaining contents of the specified cell (without XF index). */ - virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) SAL_OVERRIDE; - virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) SAL_OVERRIDE; + virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) override; + virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) override; }; /** Represents an RK or MULRK record that describes cells with a compressed double values. */ @@ -565,12 +565,12 @@ public: sal_Int32 nRkValue ); /** Tries to merge the contents of the passed cell to own data. */ - virtual bool TryMerge( const XclExpCellBase& rCell ) SAL_OVERRIDE; + virtual bool TryMerge( const XclExpCellBase& rCell ) override; private: /** Writes the remaining contents of the specified cell (without XF index). */ - virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) SAL_OVERRIDE; - virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) SAL_OVERRIDE; + virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) override; + virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) override; private: ScfInt32Vec maRkValues; /// The cell values. @@ -644,7 +644,7 @@ public: explicit XclExpGuts( const XclExpRoot& rRoot ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnColLevels; /// Number of visible column outline levels. @@ -664,10 +664,10 @@ public: sal_uInt16 nFirstUsedXclCol, sal_uInt32 nFirstUsedXclRow, sal_uInt16 nFirstFreeXclCol, sal_uInt32 nFirstFreeXclRow ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the DIMENSIONS record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt32 mnFirstUsedXclRow; /// First used row. @@ -732,11 +732,11 @@ public: /** Returns true, if the column has default format and width. */ bool IsDefault( const XclExpDefcolwidth& rDefColWidth ) const; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of this COLINFO record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpXFId maXFId; /// The XF identifier for column default format. @@ -767,8 +767,8 @@ public: void Finalize( ScfUInt16Vec& rXFIndexes ); /** Writes all COLINFO records of this buffer. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpColinfo > XclExpColinfoList; @@ -807,7 +807,7 @@ public: XclExpDefaultRowData& GetDefaultData() { return maDefData; } private: /** Writes the contents of the record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpDefaultRowData maDefData; /// Record data. @@ -874,8 +874,8 @@ public: void WriteCellList( XclExpStream& rStrm ); /** Writes the ROW record if the row is not disabled (see DisableIfDefault() function). */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; inline sal_uInt32 GetXclRowRpt() const { return mnXclRowRpt; } inline void SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; } @@ -884,7 +884,7 @@ private: void InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase ); /** Writes the contents of the ROW record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpCellBase > XclExpCellList; @@ -924,8 +924,8 @@ public: void Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt16Vec& rColXFIndexes ); /** Writes the DIMENSIONS record, all ROW records and all cell records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; XclExpDimensions& GetDimensions() { return maDimensions;} @@ -989,8 +989,8 @@ public: EXC_ID_MERGEDCELLS, EXC_ID_HLINK, EXC_ID_DVAL. */ XclExpRecordRef CreateRecord( sal_uInt16 nRecId ) const; /** Saves the entire cell table. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpNote > XclExpNoteList; diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index 87f7e182b791..0e4176e98083 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -32,11 +32,11 @@ class XclExpWindow1 : public XclExpRecord public: explicit XclExpWindow1( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the WINDOW1 record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnFlags; /// Option flags. @@ -54,7 +54,7 @@ public: private: /** Writes the contents of the WINDOW2 record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: Color maGridColor; /// Grid color (<=BIFF5). @@ -75,7 +75,7 @@ private: /** Tries to shorten numerator and denominator by the passed value. */ void Shorten( sal_uInt16 nFactor ); /** Writes the contents of the SCL record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnNum; /// Numerator of the zoom factor. @@ -88,11 +88,11 @@ class XclExpPane : public XclExpRecord public: explicit XclExpPane( const XclTabViewData& rData ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the PANE record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnSplitX; /// Split X position, or frozen column. @@ -108,10 +108,10 @@ class XclExpSelection : public XclExpRecord public: explicit XclExpSelection( const XclTabViewData& rData, sal_uInt8 nPane ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the SELECTION record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclSelectionData maSelData; /// Selection data. @@ -126,7 +126,7 @@ public: /* virtual void SaveXml( XclExpXmlStream& rStrm ); TODO Fix XML Saving Stream */ private: /** Writes the contents of the SHEETEXT record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const XclTabViewData& mrTabViewData; /// view settings data of current sheet. @@ -142,8 +142,8 @@ public: explicit XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nScTab ); /** Writes all view settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Creates selection data for the specified pane. */ diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 9d1dfff38453..038db9d51e13 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -280,9 +280,9 @@ public: explicit XclImpChEscherFormat( const XclImpRoot& rRoot ); /** Reads the CHESCHERFORMAT record (complex fill data) (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHESCHERFORMAT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Converts and writes the contained data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, @@ -311,7 +311,7 @@ public: explicit XclImpChFrameBase( const XclChFormatInfo& rFmtInfo ); /** Reads a frame formatting record (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Returns true, if the line format is set to automatic. */ inline bool IsAutoLine() const { return !mxLineFmt || mxLineFmt->IsAuto(); } @@ -357,7 +357,7 @@ public: XclChObjectType eObjType ); /** Reads the CHFRAME record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Sets formatting from BIFF3-BIFF5 OBJ record, if own formatting is invisible. */ void UpdateObjFrame( const XclObjLineData& rLineData, const XclObjFillData& rFillData ); @@ -469,16 +469,16 @@ public: explicit XclImpChText( const XclImpChRoot& rRoot ); /** Reads the CHTEXT record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHTEXT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Returns the leading font index for the text object. */ - virtual sal_uInt16 GetFontIndex() const SAL_OVERRIDE; + virtual sal_uInt16 GetFontIndex() const override; /** Returns the leading font color for the text object. */ - virtual Color GetFontColor() const SAL_OVERRIDE; + virtual Color GetFontColor() const override; /** Returns the rotation value for the text object. */ - virtual sal_uInt16 GetRotation() const SAL_OVERRIDE; + virtual sal_uInt16 GetRotation() const override; /** Sets explicit string data for this text object. */ void SetString( const OUString& rString ); @@ -633,9 +633,9 @@ public: explicit XclImpChDataFormat( const XclImpChRoot& rRoot ); /** Reads the CHDATAFORMAT record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHDATAFORMAT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Sets this object to the specified data point position. */ void SetPointPos( const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx ); @@ -757,9 +757,9 @@ public: explicit XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx ); /** Reads the CHSERIES record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHSERIES group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Sets a data point or series format (CHDATAFORMAT group) for this series. */ void SetDataFormat( const XclImpChDataFormatRef& xDataFmt ); @@ -904,9 +904,9 @@ public: explicit XclImpChLegend( const XclImpChRoot& rRoot ); /** Reads the CHLEGEND record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHLEGEND group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Final processing after reading the entire chart. */ void Finalize(); @@ -934,7 +934,7 @@ public: explicit XclImpChDropBar( sal_uInt16 nDropBar ); /** Reads the CHDROPBAR record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Converts and writes the contained frame data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet ) const; @@ -960,9 +960,9 @@ public: explicit XclImpChTypeGroup( const XclImpChRoot& rRoot ); /** Reads the CHTYPEGROUP record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHTYPEGROUP group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Final processing after reading the entire chart. */ void Finalize(); @@ -1132,18 +1132,18 @@ public: explicit XclImpChAxis( const XclImpChRoot& rRoot, sal_uInt16 nAxisType = EXC_CHAXIS_NONE ); /** Reads the CHAXIS record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHAXIS group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Final processing after reading the entire chart. */ void Finalize(); /** Returns the font index for the axis labels. */ - virtual sal_uInt16 GetFontIndex() const SAL_OVERRIDE; + virtual sal_uInt16 GetFontIndex() const override; /** Returns the font color for the axis labels. */ - virtual Color GetFontColor() const SAL_OVERRIDE; + virtual Color GetFontColor() const override; /** Returns the rotation value for axis labels. */ - virtual sal_uInt16 GetRotation() const SAL_OVERRIDE; + virtual sal_uInt16 GetRotation() const override; /** Returns the type of this axis. */ inline sal_uInt16 GetAxisType() const { return maData.mnType; } @@ -1199,9 +1199,9 @@ public: explicit XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId ); /** Reads the CHAXESSET record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHAXESSET group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Final processing after reading the entire chart. */ void Finalize(); @@ -1283,9 +1283,9 @@ public: virtual ~XclImpChChart(); /** Reads the CHCHART record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHCHART group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Reads a CHDEFAULTTEXT group (default text formats). */ void ReadChDefaultText( XclImpStream& rStrm ); /** Reads a CHDATAFORMAT group describing a series format or a data point format. */ @@ -1366,9 +1366,9 @@ public: const Rectangle& rChartRect ); /** Calculate the resulting rectangle of the passed anchor. */ - virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const SAL_OVERRIDE; + virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const override; /** Called whenever an object has been inserted into the draw page. */ - virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) SAL_OVERRIDE; + virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) override; private: Rectangle maChartRect; /// Position and size of the chart shape in 1/100 mm. diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 6e55d35b188e..989afd934d72 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -245,15 +245,15 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Returns a progress bar size that takes all group children into account. */ - virtual sal_Size DoGetProgressSize() const SAL_OVERRIDE; + virtual sal_Size DoGetProgressSize() const override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; protected: XclImpDrawObjVector maChildren; /// Grouped objects. @@ -268,13 +268,13 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; protected: XclObjLineData maLineData; /// BIFF5 line formatting. @@ -296,13 +296,13 @@ protected: void ConvertRectStyle( SdrObject& rSdrObj ) const; /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; protected: XclObjFillData maFillData; /// BIFF5 fill formatting. @@ -318,7 +318,7 @@ public: protected: /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; }; /** An arc object. */ @@ -329,13 +329,13 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; protected: XclObjFillData maFillData; /// BIFF5 fill formatting. @@ -354,11 +354,11 @@ protected: void ReadCoordList( XclImpStream& rStrm ); /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; protected: typedef std::vector< Point > PointVector; @@ -389,15 +389,15 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; /** Inserts the contained text data at the passed object. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; protected: XclImpObjTextData maTextData; /// Textbox data from BIFF5 OBJ or BIFF8 TXO record. @@ -415,19 +415,19 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Returns the needed size on the progress bar. */ - virtual sal_Size DoGetProgressSize() const SAL_OVERRIDE; + virtual sal_Size DoGetProgressSize() const override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; /** Converts the chart document. */ - virtual void DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; + virtual void DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; private: /** Calculates the object anchor of a sheet chart (chart fills one page). */ @@ -451,7 +451,7 @@ public: protected: /** Inserts the note into the document, sets visibility. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; private: ScAddress maScPos; /// Cell position of the note object. @@ -523,9 +523,9 @@ protected: void ConvertLabel( ScfPropertySet& rPropSet ) const; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; /** Additional processing on the SdrObject, calls new virtual function DoProcessControl(). */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; /** Derived classes return the service name of the control component to be created. */ virtual OUString DoGetServiceName() const = 0; @@ -541,11 +541,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; }; /** A checkbox control. */ @@ -556,15 +556,15 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: sal_uInt16 mnState; @@ -579,15 +579,15 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: sal_uInt16 mnNextInGroup; /// Next option button in a group. @@ -602,11 +602,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; }; /** A groupbox control. */ @@ -617,15 +617,15 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: sal_uInt16 mnGroupBoxFlags; @@ -639,11 +639,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; }; /** An edit control. */ @@ -657,15 +657,15 @@ protected: bool IsNumeric() const; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: sal_uInt16 mnContentType; @@ -685,7 +685,7 @@ protected: void ReadSbs( XclImpStream& rStrm ); /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; protected: sal_uInt16 mnValue; @@ -706,13 +706,13 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; }; /** A scrollbar control. */ @@ -723,13 +723,13 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; }; /** Base class for list controls (listbox, dropdown). */ @@ -763,15 +763,15 @@ protected: void ReadFullLbsData( XclImpStream& rStrm, sal_Size nRecLeft ); /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: ScfUInt8Vec maSelection; @@ -791,15 +791,15 @@ protected: void ReadFullLbsData( XclImpStream& rStrm ); /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: sal_uInt16 mnLeft; @@ -817,7 +817,7 @@ class XclImpPictureObj : public XclImpRectObj, public XclImpControlHelper public: explicit XclImpPictureObj( const XclImpRoot& rRoot ); /** Returns the ObjectName - can use non-obvious lookup for override in the associated vba document module stream**/ - virtual OUString GetObjName() const SAL_OVERRIDE; + virtual OUString GetObjName() const override; /** Returns the graphic imported from the IMGDATA record. */ inline const Graphic& GetGraphic() const { return maGraphic; } @@ -838,17 +838,17 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; /** Override to do additional processing on the SdrObject. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; private: /** Reads and sets the picture flags from a BIFF3-BIFF5 OBJ picture record. */ @@ -921,7 +921,7 @@ public: protected: /** Returns a color from the Excel color palette. */ - virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const SAL_OVERRIDE; + virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const override; }; /** This is the central instance for converting binary DFF data into shape @@ -971,14 +971,14 @@ private: SvStream& rDffStrm, DffRecordHeader& rHeader, void* pClientData, - DffObjData& rObjData ) SAL_OVERRIDE; + DffObjData& rObjData ) override; /** Processes an DFF object, reads properties from DFF stream. */ virtual SdrObject* ProcessObj( SvStream& rDffStrm, DffObjData& rDffObjData, void* pClientData, Rectangle& rTextRect, - SdrObject* pOldSdrObj = 0 ) SAL_OVERRIDE; + SdrObject* pOldSdrObj = 0 ) override; // virtual functions of SvxMSConvertOCXControls @@ -989,7 +989,7 @@ private: const ::com::sun::star::awt::Size& rSize, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >* pxShape, - bool bFloatingCtrl ) SAL_OVERRIDE; + bool bFloatingCtrl ) override; private: /** Data per registered drawing manager, will be stacked for recursive calls. */ @@ -1132,9 +1132,9 @@ public: void ConvertObjects( XclImpDffConverter& rDffConv ); /** Calculate the resulting rectangle of the passed anchor. */ - virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const SAL_OVERRIDE; + virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const override; /** On call, updates the used area of the sheet. */ - virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) SAL_OVERRIDE; + virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) override; private: /** Reads a BIFF3-BIFF5 NOTE record. */ diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 0843cd187b3b..c575c4ead6ab 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -55,8 +55,8 @@ public: XclImpDecrypterRef Clone() const; /** Implementation of the ::comphelper::IDocPasswordVerifier interface */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; /** Updates the decrypter on start of a new record or after seeking stream. */ void Update( SvStream& rStrm, sal_uInt16 nRecSize ); @@ -99,15 +99,15 @@ private: explicit XclImpBiff5Decrypter( const XclImpBiff5Decrypter& rSrc ); /** Implementation of cloning this object. */ - virtual XclImpBiff5Decrypter* OnClone() const SAL_OVERRIDE; + virtual XclImpBiff5Decrypter* OnClone() const override; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; + OnVerifyPassword( const OUString& rPassword ) override; + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) SAL_OVERRIDE; + virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) override; /** Implementation of the decryption. */ - virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) SAL_OVERRIDE; + virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) override; private: ::msfilter::MSCodec_XorXLS95 maCodec; /// Crypto algorithm implementation. @@ -128,15 +128,15 @@ private: explicit XclImpBiff8Decrypter( const XclImpBiff8Decrypter& rSrc ); /** Implementation of cloning this object. */ - virtual XclImpBiff8Decrypter* OnClone() const SAL_OVERRIDE; + virtual XclImpBiff8Decrypter* OnClone() const override; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; + OnVerifyPassword( const OUString& rPassword ) override; + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) SAL_OVERRIDE; + virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) override; /** Implementation of the decryption. */ - virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) SAL_OVERRIDE; + virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) override; /** Returns the block number corresponding to the passed stream position. */ static sal_uInt32 GetBlock( sal_Size nStrmPos ); diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 293551cb2c45..6481ba339b2b 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -331,7 +331,7 @@ public: virtual ~WorkerThread() {} protected: - virtual void execute() SAL_OVERRIDE + virtual void execute() override { processSheetFormulaCells(mrDoc, mrItem, *mpFormatter, mrExternalLinks); } diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 2ace00d246d9..e5e88722225b 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -541,8 +541,8 @@ private: private: // finalize token sequence ------------------------------------------------ - virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const SAL_OVERRIDE; - virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const SAL_OVERRIDE; + virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const override; + virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const override; protected: const sal_Int32 mnMaxApiCol; /// Maximum column index in own document. @@ -1239,12 +1239,12 @@ public: virtual ApiTokenSequence importOoxFormula( const CellAddress& rBaseAddr, - const OUString& rFormulaString ) SAL_OVERRIDE; + const OUString& rFormulaString ) override; virtual ApiTokenSequence importBiff12Formula( const CellAddress& rBaseAddr, FormulaType eType, - SequenceInputStream& rStrm ) SAL_OVERRIDE; + SequenceInputStream& rStrm ) override; private: // import token contents and create API formula token --------------------- @@ -1845,7 +1845,7 @@ public: virtual ApiTokenSequence importBiffFormula( const CellAddress& rBaseAddr, FormulaType eType, - BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ) SAL_OVERRIDE; + BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ) override; private: // import token contents and create API formula token --------------------- diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index d681c9cefcd5..2abcb9a279ee 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -43,7 +43,7 @@ public: Sequence< FormulaToken > parseFormula( const OUString& rFormula, const CellAddress& rReferencePos ); protected: - virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const SAL_OVERRIDE; + virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const override; private: ApiParserWrapper maApiParser; diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx index db151934a30d..1a00c6f56065 100644 --- a/sc/source/filter/oox/revisionfragment.cxx +++ b/sc/source/filter/oox/revisionfragment.cxx @@ -71,7 +71,7 @@ public: protected: virtual oox::core::ContextHandlerRef onCreateContext( - sal_Int32 nElement, const AttributeList& /*rAttribs*/ ) SAL_OVERRIDE + sal_Int32 nElement, const AttributeList& /*rAttribs*/ ) override { if (nElement == XLS_TOKEN(is)) { @@ -82,7 +82,7 @@ protected: return this; } - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE + virtual void onStartElement( const AttributeList& rAttribs ) override { switch (getCurrentElement()) { @@ -95,7 +95,7 @@ protected: } } - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE + virtual void onCharacters( const OUString& rChars ) override { switch (getCurrentElement()) { @@ -133,7 +133,7 @@ protected: } } - virtual void onEndElement() SAL_OVERRIDE + virtual void onEndElement() override { switch (getCurrentElement()) { diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 681883f9f222..08ca758dd428 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -226,7 +226,7 @@ public: { } - virtual void doWork() SAL_OVERRIDE + virtual void doWork() override { // We hold the solar mutex in all threads except for // the small safe section of the inner loop in @@ -264,11 +264,11 @@ class ProgressBarTimer : Timer } virtual ~ProgressWrapper() {} // IProgressBar - virtual double getPosition() const SAL_OVERRIDE { return mfPosition; } - virtual void setPosition( double fPosition ) SAL_OVERRIDE { mfPosition = fPosition; } + virtual double getPosition() const override { return mfPosition; } + virtual void setPosition( double fPosition ) override { mfPosition = fPosition; } // ISegmentProgressBar - virtual double getFreeLength() const SAL_OVERRIDE { return 0.0; } - virtual ISegmentProgressBarRef createSegment( double /* fLength */ ) SAL_OVERRIDE + virtual double getFreeLength() const override { return 0.0; } + virtual ISegmentProgressBarRef createSegment( double /* fLength */ ) override { return ISegmentProgressBarRef(); } @@ -292,7 +292,7 @@ public: aSegments.push_back( ISegmentProgressBarRef( new ProgressWrapper( xProgress ) ) ); return aSegments.back(); } - virtual void Invoke() SAL_OVERRIDE + virtual void Invoke() override { for( size_t i = 0; i < aSegments.size(); i++) static_cast< ProgressWrapper *>( aSegments[ i ].get() )->UpdateBar(); diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 4effbefaa5ca..3dcaf1cea886 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -320,11 +320,11 @@ public: void finalizeDrawingImport(); /// Allow the threaded importer to override our progress bar impl. - virtual ISegmentProgressBarRef getRowProgress() SAL_OVERRIDE + virtual ISegmentProgressBarRef getRowProgress() override { return mxRowProgress; } - virtual void setCustomRowProgress( const ISegmentProgressBarRef &rxRowProgress ) SAL_OVERRIDE + virtual void setCustomRowProgress( const ISegmentProgressBarRef &rxRowProgress ) override { mxRowProgress = rxRowProgress; mbFastRowProgress = true; diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx index 7273df5759ca..c671d464f8f7 100644 --- a/sc/source/filter/orcus/filterdetect.cxx +++ b/sc/source/filter/orcus/filterdetect.cxx @@ -30,17 +30,17 @@ public: virtual ~OrcusFormatDetect(); virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; private: }; diff --git a/sc/source/filter/starcalc/collect.hxx b/sc/source/filter/starcalc/collect.hxx index 45f1e093db8e..b96ac763a926 100644 --- a/sc/source/filter/starcalc/collect.hxx +++ b/sc/source/filter/starcalc/collect.hxx @@ -42,7 +42,7 @@ public: ScCollection(const ScCollection& rCollection); virtual ~ScCollection(); - virtual ScDataObject* Clone() const SAL_OVERRIDE; + virtual ScDataObject* Clone() const override; bool AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject); bool Insert(ScDataObject* pScDataObject); diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 6a7e67b71e0f..2c4bb45cac39 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -1399,7 +1399,7 @@ class EndXmlElement : public ExcXmlRecord sal_Int32 mnElement; public: EndXmlElement( sal_Int32 nElement ) : mnElement( nElement) {} - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; void EndXmlElement::SaveXml( XclExpXmlStream& rStrm ) diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index c64a78837afa..189574c73303 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -584,11 +584,11 @@ class VmlCommentExporter : public VMLExport public: VmlCommentExporter ( sax_fastparser::FSHelperPtr p, ScAddress aScPos, SdrCaptionObj* pCaption, bool bVisible, Rectangle &aFrom, Rectangle &aTo ); protected: - virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) override; using VMLExport::StartShape; - virtual sal_Int32 StartShape() SAL_OVERRIDE; + virtual sal_Int32 StartShape() override; using VMLExport::EndShape; - virtual void EndShape( sal_Int32 nShapeElement ) SAL_OVERRIDE; + virtual void EndShape( sal_Int32 nShapeElement ) override; }; VmlCommentExporter::VmlCommentExporter( sax_fastparser::FSHelperPtr p, ScAddress aScPos, SdrCaptionObj* pCaption, @@ -1137,14 +1137,14 @@ public: { } - virtual OUString getTransformedString(const OUString& rURL) const SAL_OVERRIDE + virtual OUString getTransformedString(const OUString& rURL) const override { OUString aNewURL; transformURL(rURL, aNewURL, &mrDoc); return aNewURL; } - virtual bool isExternalURL(const OUString& rURL) const SAL_OVERRIDE + virtual bool isExternalURL(const OUString& rURL) const override { OUString aNewURL; return transformURL(rURL, aNewURL, &mrDoc); diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 3788c3cac8d9..e5a21029165e 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -51,13 +51,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; void SetNullDate(const com::sun::star::util::Date& aDate) { aNullDate = aDate; } void SetIterationStatus(const bool bValue) { bIsIterationEnabled = bValue; } void SetIterationCount(const sal_Int32 nValue) { nIterationCount = nValue; } void SetIterationEpsilon(const double fValue) { fIterationEpsilon = fValue; } - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLNullDateContext : public SvXMLImportContext @@ -75,9 +75,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLIterationContext : public SvXMLImportContext @@ -95,9 +95,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 1801db63e891..0f35c6e53c19 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -57,8 +57,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ) override; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 2b18aafa56d9..78d18e7f6bf5 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -39,21 +39,21 @@ public: virtual ~XMLCodeNameProvider(); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception ) override; static void set( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& xNameAccess, ScDocument *pDoc ); }; diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index 1c9bfd8d2844..57225c6c7c87 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -53,8 +53,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ) override; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index 184a4ced4ad9..aee1a06fbc35 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -39,9 +39,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; struct ScDDELinkCell @@ -79,7 +79,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; void SetApplication(const OUString& sValue) { sApplication = sValue; } void SetTopic(const OUString& sValue) { sTopic = sValue; } @@ -91,7 +91,7 @@ public: void AddCellToRow(const ScDDELinkCell& aCell); void AddRowsToTable(const sal_Int32 nRows); - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDDESourceContext : public SvXMLImportContext @@ -112,9 +112,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDDETableContext : public SvXMLImportContext @@ -135,9 +135,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDDEColumnContext : public SvXMLImportContext @@ -158,9 +158,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDDERowContext : public SvXMLImportContext @@ -182,9 +182,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDDECellContext : public SvXMLImportContext @@ -212,9 +212,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 38f22eaab528..dc2d0b071337 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -93,8 +93,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ) override; + virtual void EndElement() override; }; class ScXMLDetectiveHighlightedContext : public SvXMLImportContext @@ -121,8 +121,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ) override; + virtual void EndElement() override; }; class ScXMLDetectiveOperationContext : public SvXMLImportContext @@ -147,8 +147,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ) override; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index 20d6bd0ced77..b6b6597cc43d 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -38,9 +38,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 12225c2d116f..90f646531e91 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -77,7 +77,7 @@ class ScMyShapesContainer : ScMyIteratorBase private: ScMyShapeList aShapeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; public: ScMyShapesContainer(); virtual ~ScMyShapesContainer(); @@ -86,8 +86,8 @@ public: void AddNewShape(const ScMyShape& aShape); bool HasShapes() { return !aShapeList.empty(); } const ScMyShapeList& GetShapes() const { return aShapeList; } - virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; - virtual void Sort() SAL_OVERRIDE; + virtual void SetCellData( ScMyCell& rMyCell ) override; + virtual void Sort() override; void SkipTable(SCTAB nSkip); }; @@ -106,7 +106,7 @@ class ScMyNoteShapesContainer : ScMyIteratorBase private: ScMyNoteShapeList aNoteShapeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; public: ScMyNoteShapesContainer(); virtual ~ScMyNoteShapesContainer(); @@ -114,8 +114,8 @@ public: using ScMyIteratorBase::UpdateAddress; void AddNewNote(const ScMyNoteShape& aNote); const ScMyNoteShapeList& GetNotes() const { return aNoteShapeList; } - virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; - virtual void Sort() SAL_OVERRIDE; + virtual void SetCellData( ScMyCell& rMyCell ) override; + virtual void Sort() override; void SkipTable(SCTAB nSkip); }; @@ -134,15 +134,15 @@ class ScMyMergedRangesContainer : ScMyIteratorBase private: ScMyMergedRangeList aRangeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; public: ScMyMergedRangesContainer(); virtual ~ScMyMergedRangesContainer(); void AddRange(const com::sun::star::table::CellRangeAddress& rMergedRange); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; - virtual void Sort() SAL_OVERRIDE; // + remove doublets + virtual void SetCellData( ScMyCell& rMyCell ) override; + virtual void Sort() override; // + remove doublets void SkipTable(SCTAB nSkip); }; @@ -171,7 +171,7 @@ class ScMyAreaLinksContainer : ScMyIteratorBase private: ScMyAreaLinkList aAreaLinkList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; public: ScMyAreaLinksContainer(); virtual ~ScMyAreaLinksContainer(); @@ -180,8 +180,8 @@ public: { aAreaLinkList.push_back( rAreaLink ); } using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; - virtual void Sort() SAL_OVERRIDE; + virtual void SetCellData( ScMyCell& rMyCell ) override; + virtual void Sort() override; void SkipTable(SCTAB nSkip); }; @@ -198,15 +198,15 @@ class ScMyEmptyDatabaseRangesContainer : ScMyIteratorBase private: ScMyEmptyDatabaseRangeList aDatabaseList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; public: ScMyEmptyDatabaseRangesContainer(); virtual ~ScMyEmptyDatabaseRangesContainer(); void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; - virtual void Sort() SAL_OVERRIDE; + virtual void SetCellData( ScMyCell& rMyCell ) override; + virtual void Sort() override; void SkipTable(SCTAB nSkip); }; @@ -227,7 +227,7 @@ class ScMyDetectiveObjContainer : ScMyIteratorBase private: ScMyDetectiveObjList aDetectiveObjList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; public: ScMyDetectiveObjContainer(); virtual ~ScMyDetectiveObjContainer(); @@ -240,8 +240,8 @@ public: bool bHasError ); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; - virtual void Sort() SAL_OVERRIDE; + virtual void SetCellData( ScMyCell& rMyCell ) override; + virtual void Sort() override; void SkipTable(SCTAB nSkip); }; @@ -261,7 +261,7 @@ class ScMyDetectiveOpContainer : ScMyIteratorBase private: ScMyDetectiveOpList aDetectiveOpList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; public: ScMyDetectiveOpContainer(); virtual ~ScMyDetectiveOpContainer(); @@ -269,8 +269,8 @@ public: void AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex ); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; - virtual void Sort() SAL_OVERRIDE; + virtual void SetCellData( ScMyCell& rMyCell ) override; + virtual void Sort() override; void SkipTable(SCTAB nSkip); }; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index d6d49bb78837..ad2288e04ebc 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -242,7 +242,7 @@ public: ScColumnStyles(); virtual ~ScColumnStyles(); - virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) SAL_OVERRIDE; + virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) override; sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField, bool& bIsVisible); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex, const bool bIsVisible); @@ -268,7 +268,7 @@ public: ScRowStyles(); virtual ~ScRowStyles(); - virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) SAL_OVERRIDE; + virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) override; sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nStartField, const sal_Int32 nStringIndex, const sal_Int32 nEndField); diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 3f89046cf2e2..737ec96f7e68 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -67,9 +67,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class XMLHeaderFooterRegionContext: public SvXMLImportContext @@ -94,9 +94,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx index a541d3ed819b..4c8db3b83174 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx @@ -41,12 +41,12 @@ protected: virtual void exportHeaderFooterContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rText, - bool bAutoStyles, bool bProgress ) SAL_OVERRIDE; + bool bAutoStyles, bool bProgress ) override; virtual void exportMasterPageContent( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, - bool bAutoStyles ) SAL_OVERRIDE; + bool bAutoStyles ) override; public: XMLTableMasterPageExport( ScXMLExport& rExp ); diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index 41634f06d9f7..e94e3bb4d411 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -40,7 +40,7 @@ public: static void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType); virtual void finishShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) SAL_OVERRIDE; + com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) override; void SetCell (const ::com::sun::star::table::CellAddress& rAddress) { aStartCell = rAddress; } void SetOnTable (const bool bTempOnTable) { bOnTable = bTempOnTable; } diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index 857ebc8683d3..bf62f5f4bd76 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -38,9 +38,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 1c97efa3a138..e3ea662a5341 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -46,9 +46,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 9bed201e5277..db152cede361 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -59,9 +59,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLBigRangeContext : public SvXMLImportContext @@ -80,9 +80,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLCellContentDeletionContext : public SvXMLImportContext @@ -116,9 +116,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDependenceContext : public SvXMLImportContext @@ -137,9 +137,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDependingsContext : public SvXMLImportContext @@ -158,9 +158,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLChangeDeletionContext : public SvXMLImportContext @@ -179,9 +179,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDeletionsContext : public SvXMLImportContext @@ -200,9 +200,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLChangeCellContext; @@ -231,11 +231,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLChangeCellContext : public SvXMLImportContext @@ -269,13 +269,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; void CreateTextPContext(bool bIsNewParagraph); bool IsEditCell() { return pEditTextObj != 0; } void SetText(const OUString& sTempText) { sText = sTempText; } - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLPreviousContext : public SvXMLImportContext @@ -306,9 +306,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLContentChangeContext : public SvXMLImportContext @@ -328,8 +328,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; }; class ScXMLInsertionContext : public SvXMLImportContext @@ -348,8 +348,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; }; class ScXMLInsertionCutOffContext : public SvXMLImportContext @@ -368,8 +368,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; }; class ScXMLMovementCutOffContext : public SvXMLImportContext @@ -388,8 +388,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; }; class ScXMLCutOffsContext : public SvXMLImportContext @@ -408,8 +408,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; }; class ScXMLDeletionContext : public SvXMLImportContext @@ -428,8 +428,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; }; class ScXMLMovementContext : public SvXMLImportContext @@ -450,8 +450,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; }; class ScXMLRejectionContext : public SvXMLImportContext @@ -470,8 +470,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; }; ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index da8e03a81b6b..14d0d73ee84a 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -45,8 +45,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/celltextparacontext.hxx b/sc/source/filter/xml/celltextparacontext.hxx index d45ece194b3d..3112e31bcbc9 100644 --- a/sc/source/filter/xml/celltextparacontext.hxx +++ b/sc/source/filter/xml/celltextparacontext.hxx @@ -25,11 +25,11 @@ class ScXMLCellTextParaContext : public ScXMLImportContext public: ScXMLCellTextParaContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, ScXMLTableRowCellContext& rParent); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void Characters(const OUString& rChars) SAL_OVERRIDE; + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void EndElement() override; + virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; void PushSpan(const OUString& rSpan, const OUString& rStyleName); void PushFieldSheetName(const OUString& rStyleName); @@ -49,11 +49,11 @@ class ScXMLCellTextSpanContext : public ScXMLImportContext public: ScXMLCellTextSpanContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, ScXMLCellTextParaContext& rParent); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void Characters(const OUString& rChars) SAL_OVERRIDE; + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void EndElement() override; + virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -68,11 +68,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void Characters(const OUString& rChars) SAL_OVERRIDE; + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void EndElement() override; + virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -87,11 +87,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void Characters(const OUString& rChars) SAL_OVERRIDE; + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void EndElement() override; + virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -106,11 +106,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void Characters(const OUString& rChars) SAL_OVERRIDE; + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void EndElement() override; + virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -127,11 +127,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void Characters(const OUString& rChars) SAL_OVERRIDE; + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void EndElement() override; + virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -149,10 +149,10 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; }; #endif diff --git a/sc/source/filter/xml/datastreamimport.hxx b/sc/source/filter/xml/datastreamimport.hxx index 29f93fee0e4e..711cc7cda9aa 100644 --- a/sc/source/filter/xml/datastreamimport.hxx +++ b/sc/source/filter/xml/datastreamimport.hxx @@ -30,7 +30,7 @@ public: virtual ~ScXMLDataStreamContext(); - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index 837f855d9f89..9f6a364f7f6b 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -78,13 +78,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void SetShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 09bcd460f179..ce2450102e3c 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -48,9 +48,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; + virtual void Characters( const OUString& rChars ) override; }; #endif diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 14f605e790b9..69df58e3c624 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -139,7 +139,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; void PushParagraphSpan(const OUString& rSpan, const OUString& rStyleName); void PushParagraphFieldDate(const OUString& rStyleName); @@ -152,7 +152,7 @@ public: void SetDetectiveObj( const ScAddress& rPosition ); void SetCellRangeSource( const ScAddress& rPosition ); - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 9c99afab9f99..9e3771ec3ff3 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -46,9 +46,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLTableColsContext : public SvXMLImportContext @@ -77,9 +77,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index b209254bd1b3..4a3c2a80ca1a 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -34,9 +34,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLConditionalFormatContext : public SvXMLImportContext @@ -54,9 +54,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; private: std::unique_ptr<ScConditionalFormat> mxFormat; @@ -78,7 +78,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; private: ScColorScaleFormat* pColorScaleFormat; @@ -100,7 +100,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; private: ScDataBarFormat* mpDataBarFormat; @@ -127,7 +127,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; }; class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index bedbc7da46b3..913ab765cbe8 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -44,11 +44,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 0c616f1b5cc8..01f393d980ae 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -71,9 +71,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void SetHelpMessage(const OUString& sTitle, const OUString& sMessage, const bool bDisplay); void SetErrorMessage(const OUString& sTitle, const OUString& sMessage, const OUString& sMessageType, const bool bDisplay); @@ -104,9 +104,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLErrorMessageContext : public SvXMLImportContext @@ -134,9 +134,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLErrorMacroContext : public SvXMLImportContext @@ -161,8 +161,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual void EndElement() override; }; ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index c97f174e97a8..d2a6afe0882b 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -44,9 +44,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 809453655170..b54681b6d7d4 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -64,9 +64,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDataPilotTableContext : public SvXMLImportContext @@ -133,9 +133,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const OUString& rDisplayName); void SetDatabaseName(const OUString& sValue) { sDatabaseName = sValue; } @@ -178,9 +178,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDPSourceTableContext : public SvXMLImportContext @@ -203,9 +203,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDPSourceQueryContext : public SvXMLImportContext @@ -228,9 +228,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLSourceServiceContext : public SvXMLImportContext @@ -253,9 +253,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext @@ -281,9 +281,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLSourceCellRangeContext : public SvXMLImportContext @@ -306,9 +306,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; struct ScXMLDataPilotGroup @@ -356,9 +356,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void SetShowEmpty(const bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); } void SetRepeatItemLabels(const bool bSet) { if (pDim) pDim->SetRepeatItemLabels(bSet); } @@ -423,9 +423,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext @@ -505,9 +505,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void AddFunction(sal_Int16 nFunction); void SetDisplayName(const OUString& rName); }; @@ -532,9 +532,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDataPilotMembersContext : public SvXMLImportContext @@ -557,9 +557,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDataPilotMemberContext : public SvXMLImportContext @@ -588,9 +588,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDataPilotGroupsContext : public SvXMLImportContext @@ -613,9 +613,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDataPilotGroupContext : public SvXMLImportContext @@ -641,9 +641,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void AddMember(const OUString& sMember) { aMembers.push_back(sMember); } }; @@ -670,9 +670,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 48dee6f9f1ef..b197e2b03182 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -55,9 +55,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; struct ScSubTotalRule @@ -117,9 +117,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void SetDatabaseName(const OUString& sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } void SetConnectionResource(const OUString& sTempConRes) { sConnectionResource = sTempConRes; } @@ -160,9 +160,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLSourceTableContext : public SvXMLImportContext @@ -186,9 +186,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLSourceQueryContext : public SvXMLImportContext @@ -212,9 +212,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLConResContext : public SvXMLImportContext @@ -237,9 +237,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLSubTotalRulesContext : public SvXMLImportContext @@ -262,9 +262,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLSortGroupsContext : public SvXMLImportContext @@ -287,9 +287,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLSubTotalRuleContext : public SvXMLImportContext @@ -313,9 +313,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void AddSubTotalColumn(const com::sun::star::sheet::SubTotalColumn& rSubTotalColumn) { aSubTotalRule.aSubTotalColumns.realloc(aSubTotalRule.aSubTotalColumns.getLength() + 1); @@ -344,9 +344,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index e1ddb0ddfc87..9ec4c0c41f41 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -311,7 +311,7 @@ public: virtual ~ScXMLShapeExport(); /** is called before a shape element for the given XShape is exported */ - virtual void onExport( const uno::Reference < drawing::XShape >& xShape ) SAL_OVERRIDE; + virtual void onExport( const uno::Reference < drawing::XShape >& xShape ) override; }; ScXMLShapeExport::~ScXMLShapeExport() diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index c2ca5f5c2f6d..beb35f3db0bf 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -135,13 +135,13 @@ class ScXMLExport : public SvXMLExport sal_Int32 GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const; void CollectSharedData(SCTAB& nTableCount, sal_Int32& nShapesCount); void CollectShapesAutoStyles(SCTAB nTableCount); - virtual void _ExportFontDecls() SAL_OVERRIDE; - virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE; - virtual void _ExportAutoStyles() SAL_OVERRIDE; - virtual void _ExportMasterStyles() SAL_OVERRIDE; - virtual void SetBodyAttributes() SAL_OVERRIDE; - virtual void _ExportContent() SAL_OVERRIDE; - virtual void _ExportMeta() SAL_OVERRIDE; + virtual void _ExportFontDecls() override; + virtual void _ExportStyles( bool bUsed ) override; + virtual void _ExportAutoStyles() override; + virtual void _ExportMasterStyles() override; + virtual void SetBodyAttributes() override; + virtual void _ExportContent() override; + virtual void _ExportMeta() override; void CollectInternalShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); @@ -228,10 +228,10 @@ class ScXMLExport : public SvXMLExport const ScXMLEditAttributeMap& GetEditAttributeMap() const; protected: - virtual SvXMLAutoStylePoolP* CreateAutoStylePool() SAL_OVERRIDE; - virtual XMLPageExport* CreatePageExport() SAL_OVERRIDE; - virtual XMLShapeExport* CreateShapeExport() SAL_OVERRIDE; - virtual XMLFontAutoStylePool* CreateFontAutoStylePool() SAL_OVERRIDE; + virtual SvXMLAutoStylePoolP* CreateAutoStylePool() override; + virtual XMLPageExport* CreatePageExport() override; + virtual XMLShapeExport* CreateShapeExport() override; + virtual XMLFontAutoStylePool* CreateFontAutoStylePool() override; public: ScXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, @@ -251,10 +251,10 @@ public: void SetSourceStream( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xNewStream ); void GetChangeTrackViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps); - virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) SAL_OVERRIDE; - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) SAL_OVERRIDE; + virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) override; + virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) override; - virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape) SAL_OVERRIDE; + virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape) override; void CreateSharedData(const sal_Int32 nTableCount); void SetSharedData(ScMySharedData* pTemp) { pSharedData = pTemp; } @@ -262,22 +262,22 @@ public: XMLNumberFormatAttributesExportHelper* GetNumberFormatAttributesExportHelper(); // Export the document. - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE; + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void DisposingModel() SAL_OVERRIDE; + virtual void DisposingModel() override; }; #endif diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 22fbd966f8e8..51a0006a077c 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -40,9 +40,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; @@ -67,9 +67,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; @@ -89,9 +89,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; @@ -112,9 +112,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void SetCellString(const OUString& rStr); @@ -144,11 +144,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void Characters(const OUString& rChar) SAL_OVERRIDE; + virtual void Characters(const OUString& rChar) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; private: ScXMLExternalRefCellContext& mrParent; diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 2df7a49d20e7..75415b1555d3 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -73,9 +73,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void OpenConnection(bool b); void CloseConnection(); @@ -104,9 +104,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLOrContext : public SvXMLImportContext @@ -131,9 +131,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLConditionContext : public SvXMLImportContext @@ -165,9 +165,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; static void GetOperator(const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry); void AddSetItem(const ScQueryEntry::Item& rItem); @@ -190,9 +190,9 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; // Datapilot (Core) @@ -230,9 +230,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void SetIsCaseSensitive(const bool bTemp) { bIsCaseSensitive = bTemp; } void SetUseRegularExpressions(const bool bTemp) { if (!bUseRegularExpressions) bUseRegularExpressions = bTemp;} @@ -283,9 +283,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDPOrContext : public SvXMLImportContext @@ -308,9 +308,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLDPConditionContext : public SvXMLImportContext @@ -339,11 +339,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; static void getOperatorXML( const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions); - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 7ddf1482405d..70a1443c2e7e 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -245,7 +245,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference<xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + const uno::Reference<xml::sax::XAttributeList>& xAttrList ) override; }; ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -274,7 +274,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, - const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) SAL_OVERRIDE; + const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) override; }; ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, @@ -318,7 +318,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override; }; ScXMLBodyContext_Impl::ScXMLBodyContext_Impl( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 2d67be1ed616..b7e98b37737b 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -974,8 +974,8 @@ protected: virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual XMLShapeImportHelper* CreateShapeImport() SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual XMLShapeImportHelper* CreateShapeImport() override; public: ScXMLImport( @@ -986,7 +986,7 @@ public: // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // namespace office // NB: in contrast to other CreateFooContexts, this particular one handles @@ -1004,7 +1004,7 @@ public: const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE; + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) override; ScDocumentImport& GetDoc(); @@ -1142,8 +1142,8 @@ public: void InsertStyles(); void SetChangeTrackingViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rChangeProps); - virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) SAL_OVERRIDE; - virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) SAL_OVERRIDE; + virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override; + virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) override; void SetTableStyle(const OUString& rValue) { aTableStyles.push_back(rValue); } ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper; } @@ -1174,16 +1174,16 @@ public: void SetStylesToRangesFinished(); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL startDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; - virtual void DisposingModel() SAL_OVERRIDE; + virtual void DisposingModel() override; /** * Use this class to manage solar mutex locking instead of calling @@ -1251,7 +1251,7 @@ public: ScEditEngineDefaulter* GetEditEngine(); const ScXMLEditAttributeMap& GetEditAttributeMap() const; - virtual void NotifyEmbeddedFontRead() SAL_OVERRIDE; + virtual void NotifyEmbeddedFontRead() override; }; #endif diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index 590fc037aa78..d12155e5203d 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -41,8 +41,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList - ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ) override; + virtual void EndElement() override; }; class ScXMLLabelRangeContext : public SvXMLImportContext @@ -68,8 +68,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList - ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + ) override; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index 46925b125a86..dae6c93ad68d 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -51,7 +51,7 @@ public: { public: GlobalInserter(ScXMLImport& rImport); - virtual void insert(ScMyNamedExpression* pExp) SAL_OVERRIDE; + virtual void insert(ScMyNamedExpression* pExp) override; private: ScXMLImport& mrImport; }; @@ -65,7 +65,7 @@ public: { public: SheetLocalInserter(ScXMLImport& rImport, SCTAB nTab); - virtual void insert(ScMyNamedExpression* pExp) SAL_OVERRIDE; + virtual void insert(ScMyNamedExpression* pExp) override; private: ScXMLImport& mrImport; SCTAB mnTab; @@ -82,9 +82,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; private: std::shared_ptr<Inserter> mpInserter; @@ -108,9 +108,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; private: ScXMLNamedExpressionsContext::Inserter* mpInserter; @@ -134,9 +134,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; private: ScXMLNamedExpressionsContext::Inserter* mpInserter; diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index c770218de1a7..e8bdabec4604 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -47,9 +47,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLTableRowsContext : public SvXMLImportContext @@ -76,9 +76,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index dd3b7b9548f0..5bd4935a5929 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -54,9 +54,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index 97ff19ebea71..0f1db462a628 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -59,9 +59,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void AddSortField(const OUString& sFieldNumber, const OUString& sDataType, const OUString& sOrder); }; @@ -90,9 +90,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index 1b458b5343e8..cf2fc4089c11 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -110,7 +110,7 @@ protected: bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const SAL_OVERRIDE; + ::com::sun::star::beans::XPropertySet > rPropSet ) const override; public: ScXMLCellExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper ); @@ -120,7 +120,7 @@ public: const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; + sal_uInt32 nIdx = 0 ) const override; /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */ virtual void handleSpecialItem( @@ -129,7 +129,7 @@ public: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; + sal_uInt32 nIdx = 0 ) const override; }; class ScXMLRowExportPropertyMapper : public SvXMLExportPropertyMapper @@ -140,7 +140,7 @@ protected: bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const SAL_OVERRIDE; + ::com::sun::star::beans::XPropertySet > rPropSet ) const override; public: ScXMLRowExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper ); @@ -161,7 +161,7 @@ public: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; + sal_uInt32 nIdx = 0 ) const override; }; class ScXMLTableExportPropertyMapper : public SvXMLExportPropertyMapper @@ -179,7 +179,7 @@ public: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; + sal_uInt32 nIdx = 0 ) const override; }; class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP @@ -193,7 +193,7 @@ class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP const SvXMLExportPropertyMapper& rPropExp, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap - ) const SAL_OVERRIDE; + ) const override; virtual void exportStyleContent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, @@ -202,7 +202,7 @@ class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP const SvXMLExportPropertyMapper& rPropExp , const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap - ) const SAL_OVERRIDE; + ) const override; public: ScXMLAutoStylePoolP(ScXMLExport& rScXMLExport); @@ -213,10 +213,10 @@ class ScXMLStyleExport : public XMLStyleExport { virtual void exportStyleAttributes( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE; + ::com::sun::star::style::XStyle > & rStyle ) override; virtual void exportStyleContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE; + ::com::sun::star::style::XStyle > & rStyle ) override; public: ScXMLStyleExport( SvXMLExport& rExp, @@ -230,133 +230,133 @@ class XMLScPropHdlFactory : public XMLPropertyHandlerFactory public: XMLScPropHdlFactory(); virtual ~XMLScPropHdlFactory(); - virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const SAL_OVERRIDE; + virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const override; }; class XmlScPropHdl_CellProtection : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_CellProtection(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_PrintContent : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_PrintContent(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_JustifyMethod(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_HoriJustify : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustify(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustifySource(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustifyRepeat(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_Orientation : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_Orientation(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_RotateAngle : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_RotateAngle(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_RotateReference : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_RotateReference(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_VertJustify : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_VertJustify(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_BreakBefore : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_BreakBefore(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_IsTextWrapped(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_IsEqual : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_IsEqual() {} - virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const SAL_OVERRIDE { return true; } - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const override { return true; } + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_Vertical : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_Vertical(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 0f9b7f26e7d5..c23b949954fc 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -291,7 +291,7 @@ class XMLTableCellPropsContext : public SvXMLPropertySetContext const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, - const XMLPropertyState& rProp ) SAL_OVERRIDE; + const XMLPropertyState& rProp ) override; }; XMLTableCellPropsContext::XMLTableCellPropsContext( diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index ca856bdd6d05..d03227c94052 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -48,7 +48,7 @@ public: /** This method is called when all attributes have been processed. It may be used to remove items that are incomplete */ virtual void finished( - ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const SAL_OVERRIDE; + ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const override; }; class ScXMLRowImportPropertyMapper : public SvXMLImportPropertyMapper @@ -64,7 +64,7 @@ public: /** This method is called when all attributes have been processed. It may be used to remove items that are incomplete */ virtual void finished( - ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const SAL_OVERRIDE; + ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const override; }; class XMLTableStyleContext : public XMLPropStyleContext @@ -85,7 +85,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ) SAL_OVERRIDE; + const OUString& rValue ) override; public: @@ -100,12 +100,12 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; virtual void FillPropertySet(const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; + ::com::sun::star::beans::XPropertySet > & rPropSet ) override; - virtual void SetDefaults() SAL_OVERRIDE; + virtual void SetDefaults() override; void AddProperty(sal_Int16 nContextID, const com::sun::star::uno::Any& aValue); XMLPropertyState* FindProperty(const sal_Int16 nContextID); @@ -156,13 +156,13 @@ protected: sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; public: @@ -172,14 +172,14 @@ public: const bool bAutoStyles ); virtual ~XMLTableStylesContext(); - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper( - sal_uInt16 nFamily ) const SAL_OVERRIDE; + sal_uInt16 nFamily ) const override; virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > - GetStylesContainer( sal_uInt16 nFamily ) const SAL_OVERRIDE; - virtual OUString GetServiceName( sal_uInt16 nFamily ) const SAL_OVERRIDE; + GetStylesContainer( sal_uInt16 nFamily ) const override; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const override; sal_Int32 GetIndex(const sal_Int16 nContextID); }; @@ -190,14 +190,14 @@ protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; - virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override; public: TYPEINFO_OVERRIDE(); @@ -208,7 +208,7 @@ public: ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~ScXMLMasterStylesContext(); - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; namespace com { namespace sun { namespace star { @@ -236,7 +236,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, @@ -244,9 +244,9 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const bool bFooter, const bool bLeft, - const bool bFirst ) SAL_OVERRIDE; + const bool bFirst ) override; - virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; + virtual void Finish( bool bOverwrite ) override; }; class ScCellTextStyleContext : public XMLTextStyleContext @@ -268,7 +268,7 @@ public: // override FillPropertySet to store style information virtual void FillPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; + ::com::sun::star::beans::XPropertySet > & rPropSet ) override; }; #endif diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index eec6553d4e0b..6217427ec0ad 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -60,9 +60,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; class ScXMLTableProtectionContext : public SvXMLImportContext @@ -80,9 +80,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; #endif diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 7740c1963f52..d2776a3581cb 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -257,7 +257,7 @@ public: ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ///===== IAccessibleParent =============================================== @@ -266,16 +266,16 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + ) throw (::com::sun::star::uno::RuntimeException) override; virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel (::com::sun::star::beans::XPropertySet* pSet) - throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetAccessibleCaption (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException) override; ///===== Internal ======================================================== void SetDrawBroadcaster(); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 9ce45910a396..2ad40efd65fe 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -491,9 +491,9 @@ public: ///===== IAccessibleViewForwarder ======================================== - virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; - virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; - virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; + virtual Rectangle GetVisibleArea() const override; + virtual Point LogicToPixel (const Point& rPoint) const override; + virtual Size LogicToPixel (const Size& rSize) const override; private: ScPreviewShell* mpViewShell; @@ -625,7 +625,7 @@ public: ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ///===== IAccessibleParent ============================================== @@ -634,7 +634,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + ) throw (::com::sun::star::uno::RuntimeException) override; ///===== Internal ======================================================== diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 33d5a8e5a790..ca348a921e56 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -52,10 +52,10 @@ public: ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell); virtual ~ScViewForwarder(); - virtual bool IsValid() const SAL_OVERRIDE; - virtual Rectangle GetVisArea() const SAL_OVERRIDE; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual bool IsValid() const override; + virtual Rectangle GetVisArea() const override; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override; void SetInvalid(); }; @@ -150,10 +150,10 @@ public: const EditView* _pEditView); virtual ~ScEditObjectViewForwarder(); - virtual bool IsValid() const SAL_OVERRIDE; - virtual Rectangle GetVisArea() const SAL_OVERRIDE; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual bool IsValid() const override; + virtual Rectangle GetVisArea() const override; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override; void SetInvalid(); }; @@ -249,10 +249,10 @@ public: ScPreviewViewForwarder(ScPreviewShell* pViewShell); virtual ~ScPreviewViewForwarder(); - virtual bool IsValid() const SAL_OVERRIDE; - virtual Rectangle GetVisArea() const SAL_OVERRIDE; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual bool IsValid() const override; + virtual Rectangle GetVisArea() const override; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override; void SetInvalid(); @@ -380,7 +380,7 @@ public: ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, bool bHeader); virtual ~ScPreviewHeaderFooterViewForwarder(); - virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const override; }; ScPreviewHeaderFooterViewForwarder::ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, bool bHeader) @@ -422,7 +422,7 @@ public: ScAddress aCellPos); virtual ~ScPreviewCellViewForwarder(); - virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const override; }; ScPreviewCellViewForwarder::ScPreviewCellViewForwarder(ScPreviewShell* pViewShell, @@ -464,7 +464,7 @@ public: bool bColHeader); virtual ~ScPreviewHeaderCellViewForwarder(); - virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const override; }; ScPreviewHeaderCellViewForwarder::ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell, @@ -508,7 +508,7 @@ public: bool bNoteMark); virtual ~ScPreviewNoteViewForwarder(); - virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const override; }; ScPreviewNoteViewForwarder::ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell, @@ -550,15 +550,15 @@ public: ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin); virtual ~ScEditViewForwarder(); - virtual bool IsValid() const SAL_OVERRIDE; - virtual Rectangle GetVisArea() const SAL_OVERRIDE; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; - virtual bool GetSelection( ESelection& rSelection ) const SAL_OVERRIDE; - virtual bool SetSelection( const ESelection& rSelection ) SAL_OVERRIDE; - virtual bool Copy() SAL_OVERRIDE; - virtual bool Cut() SAL_OVERRIDE; - virtual bool Paste() SAL_OVERRIDE; + virtual bool IsValid() const override; + virtual Rectangle GetVisArea() const override; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override; + virtual bool GetSelection( ESelection& rSelection ) const override; + virtual bool SetSelection( const ESelection& rSelection ) override; + virtual bool Copy() override; + virtual bool Cut() override; + virtual bool Paste() override; void SetInvalid(); }; @@ -1632,10 +1632,10 @@ class ScCsvViewForwarder : public SvxViewForwarder public: explicit ScCsvViewForwarder( vcl::Window* pWindow, const Rectangle& rBoundBox ); - virtual bool IsValid() const SAL_OVERRIDE; - virtual Rectangle GetVisArea() const SAL_OVERRIDE; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual bool IsValid() const override; + virtual Rectangle GetVisArea() const override; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const override; void SetInvalid(); }; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index aa3cad460a85..5f83f0fddbdc 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -64,7 +64,7 @@ public: \ : pDlg(p) \ {} \ virtual ~Class(); \ - virtual short Execute() SAL_OVERRIDE ; + virtual short Execute() override ; #define DECL_ABSTDLG2_BASE(Class,DialogClass) \ ScopedVclPtr<DialogClass> pDlg; \ @@ -73,8 +73,8 @@ public: \ : pDlg(p) \ {} \ virtual ~Class(); \ - virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; \ - long GetResult() SAL_OVERRIDE; + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) override; \ + long GetResult() override; #define IMPL_ABSTDLG_BASE(Class) \ Class::~Class() \ @@ -106,65 +106,65 @@ class ScVclAbstractDialog_Impl : public VclAbstractDialog class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg { DECL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl, ScImportAsciiDlg) - virtual void GetOptions( ScAsciiOptions& rOpt ) SAL_OVERRIDE; - virtual void SaveParameters() SAL_OVERRIDE; + virtual void GetOptions( ScAsciiOptions& rOpt ) override; + virtual void SaveParameters() override; }; class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg { DECL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl, ScAutoFormatDlg) - virtual sal_uInt16 GetIndex() const SAL_OVERRIDE; - virtual OUString GetCurrFormatName() SAL_OVERRIDE; + virtual sal_uInt16 GetIndex() const override; + virtual OUString GetCurrFormatName() override; }; class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg { DECL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl,ScColRowLabelDlg) - virtual bool IsCol() SAL_OVERRIDE; - virtual bool IsRow() SAL_OVERRIDE; + virtual bool IsCol() override; + virtual bool IsRow() override; }; class AbstractScCondFormatManagerDlg_Impl : public AbstractScCondFormatManagerDlg { DECL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_Impl, ScCondFormatManagerDlg) - virtual ScConditionalFormatList* GetConditionalFormatList() SAL_OVERRIDE; + virtual ScConditionalFormatList* GetConditionalFormatList() override; - virtual bool CondFormatsChanged() SAL_OVERRIDE; + virtual bool CondFormatsChanged() override; - virtual ScConditionalFormat* GetCondFormatSelected() SAL_OVERRIDE; + virtual ScConditionalFormat* GetCondFormatSelected() override; }; class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl, ScDataPilotDatabaseDlg) - virtual void GetValues( ScImportSourceDesc& rDesc ) SAL_OVERRIDE; + virtual void GetValues( ScImportSourceDesc& rDesc ) override; }; class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl, ScDataPilotSourceTypeDlg) - virtual bool IsDatabase() const SAL_OVERRIDE; - virtual bool IsExternal() const SAL_OVERRIDE; - virtual bool IsNamedRange() const SAL_OVERRIDE; - virtual OUString GetSelectedNamedRange() const SAL_OVERRIDE; - virtual void AppendNamedRange(const OUString& rName) SAL_OVERRIDE; + virtual bool IsDatabase() const override; + virtual bool IsExternal() const override; + virtual bool IsNamedRange() const override; + virtual OUString GetSelectedNamedRange() const override; + virtual void AppendNamedRange(const OUString& rName) override; }; class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl, ScDataPilotServiceDlg) - virtual OUString GetServiceName() const SAL_OVERRIDE; - virtual OUString GetParSource() const SAL_OVERRIDE; - virtual OUString GetParName() const SAL_OVERRIDE; - virtual OUString GetParUser() const SAL_OVERRIDE; - virtual OUString GetParPass() const SAL_OVERRIDE; + virtual OUString GetServiceName() const override; + virtual OUString GetParSource() const override; + virtual OUString GetParName() const override; + virtual OUString GetParUser() const override; + virtual OUString GetParPass() const override; }; class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg { DECL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl,ScDeleteCellDlg) - virtual DelCellCmd GetDelCellCmd() const SAL_OVERRIDE; + virtual DelCellCmd GetDelCellCmd() const override; }; //for dataform @@ -176,67 +176,67 @@ class AbstractScDataFormDlg_Impl : public AbstractScDataFormDlg class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg { DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg) - virtual void DisableObjects() SAL_OVERRIDE; - virtual InsertDeleteFlags GetDelContentsCmdBits() const SAL_OVERRIDE; + virtual void DisableObjects() override; + virtual InsertDeleteFlags GetDelContentsCmdBits() const override; }; class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg { DECL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl, ScFillSeriesDlg) - virtual FillDir GetFillDir() const SAL_OVERRIDE; - virtual FillCmd GetFillCmd() const SAL_OVERRIDE; - virtual FillDateCmd GetFillDateCmd() const SAL_OVERRIDE; - virtual double GetStart() const SAL_OVERRIDE; - virtual double GetStep() const SAL_OVERRIDE; - virtual double GetMax() const SAL_OVERRIDE; - virtual OUString GetStartStr() const SAL_OVERRIDE; - virtual void SetEdStartValEnabled(bool bFlag=false) SAL_OVERRIDE; + virtual FillDir GetFillDir() const override; + virtual FillCmd GetFillCmd() const override; + virtual FillDateCmd GetFillDateCmd() const override; + virtual double GetStart() const override; + virtual double GetStep() const override; + virtual double GetMax() const override; + virtual OUString GetStartStr() const override; + virtual void SetEdStartValEnabled(bool bFlag=false) override; }; class AbstractScGroupDlg_Impl : public AbstractScGroupDlg { DECL_ABSTDLG_BASE( AbstractScGroupDlg_Impl, ScGroupDlg) - virtual bool GetColsChecked() const SAL_OVERRIDE; + virtual bool GetColsChecked() const override; }; class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg { DECL_ABSTDLG_BASE( AbstractScInsertCellDlg_Impl, ScInsertCellDlg) - virtual InsCellCmd GetInsCellCmd() const SAL_OVERRIDE ; + virtual InsCellCmd GetInsCellCmd() const override ; }; class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg { DECL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl, ScInsertContentsDlg) - virtual InsertDeleteFlags GetInsContentsCmdBits() const SAL_OVERRIDE; - virtual ScPasteFunc GetFormulaCmdBits() const SAL_OVERRIDE; - virtual bool IsSkipEmptyCells() const SAL_OVERRIDE; - virtual bool IsLink() const SAL_OVERRIDE; - virtual void SetFillMode( bool bSet ) SAL_OVERRIDE; - virtual void SetOtherDoc( bool bSet ) SAL_OVERRIDE; - virtual bool IsTranspose() const SAL_OVERRIDE; - virtual void SetChangeTrack( bool bSet ) SAL_OVERRIDE; - virtual void SetCellShiftDisabled( int nDisable ) SAL_OVERRIDE; - virtual InsCellCmd GetMoveMode() SAL_OVERRIDE; + virtual InsertDeleteFlags GetInsContentsCmdBits() const override; + virtual ScPasteFunc GetFormulaCmdBits() const override; + virtual bool IsSkipEmptyCells() const override; + virtual bool IsLink() const override; + virtual void SetFillMode( bool bSet ) override; + virtual void SetOtherDoc( bool bSet ) override; + virtual bool IsTranspose() const override; + virtual void SetChangeTrack( bool bSet ) override; + virtual void SetCellShiftDisabled( int nDisable ) override; + virtual InsCellCmd GetMoveMode() override; }; class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg { DECL_ABSTDLG_BASE( AbstractScInsertTableDlg_Impl, ScInsertTableDlg) - virtual bool GetTablesFromFile() SAL_OVERRIDE; - virtual bool GetTablesAsLink() SAL_OVERRIDE; - virtual const OUString* GetFirstTable( sal_uInt16* pN = NULL ) SAL_OVERRIDE; - virtual ScDocShell* GetDocShellTables() SAL_OVERRIDE; - virtual bool IsTableBefore() SAL_OVERRIDE; - virtual sal_uInt16 GetTableCount() SAL_OVERRIDE; - virtual const OUString* GetNextTable( sal_uInt16* pN = NULL ) SAL_OVERRIDE; + virtual bool GetTablesFromFile() override; + virtual bool GetTablesAsLink() override; + virtual const OUString* GetFirstTable( sal_uInt16* pN = NULL ) override; + virtual ScDocShell* GetDocShellTables() override; + virtual bool IsTableBefore() override; + virtual sal_uInt16 GetTableCount() override; + virtual const OUString* GetNextTable( sal_uInt16* pN = NULL ) override; }; class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg { DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg ) - virtual OUString GetSelectEntry() const SAL_OVERRIDE; + virtual OUString GetSelectEntry() const override; }; class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg @@ -245,101 +245,101 @@ class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg virtual void InitFromOldLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, - sal_uLong nRefresh ) SAL_OVERRIDE; - virtual OUString GetURL() SAL_OVERRIDE; - virtual OUString GetFilter() SAL_OVERRIDE; // may be empty - virtual OUString GetOptions() SAL_OVERRIDE; // filter options - virtual OUString GetSource() SAL_OVERRIDE; // separated by ";" - virtual sal_uLong GetRefresh() SAL_OVERRIDE; // 0 if disabled + sal_uLong nRefresh ) override; + virtual OUString GetURL() override; + virtual OUString GetFilter() override; // may be empty + virtual OUString GetOptions() override; // filter options + virtual OUString GetSource() override; // separated by ";" + virtual sal_uLong GetRefresh() override; // 0 if disabled }; class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg { DECL_ABSTDLG_BASE( AbstractScMetricInputDlg_Impl, ScMetricInputDlg) - virtual long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const SAL_OVERRIDE; + virtual long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const override; }; class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg { DECL_ABSTDLG_BASE( AbstractScMoveTableDlg_Impl, ScMoveTableDlg) - virtual sal_uInt16 GetSelectedDocument () const SAL_OVERRIDE; - virtual sal_uInt16 GetSelectedTable () const SAL_OVERRIDE; - virtual bool GetCopyTable () const SAL_OVERRIDE; - virtual bool GetRenameTable () const SAL_OVERRIDE; - virtual void GetTabNameString( OUString& rString ) const SAL_OVERRIDE; - virtual void SetForceCopyTable () SAL_OVERRIDE; - virtual void EnableRenameTable (bool bFlag=true) SAL_OVERRIDE; + virtual sal_uInt16 GetSelectedDocument () const override; + virtual sal_uInt16 GetSelectedTable () const override; + virtual bool GetCopyTable () const override; + virtual bool GetRenameTable () const override; + virtual void GetTabNameString( OUString& rString ) const override; + virtual void SetForceCopyTable () override; + virtual void EnableRenameTable (bool bFlag=true) override; }; class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg { DECL_ABSTDLG_BASE( AbstractScNameCreateDlg_Impl, ScNameCreateDlg) - virtual sal_uInt16 GetFlags() const SAL_OVERRIDE; + virtual sal_uInt16 GetFlags() const override; }; class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg { DECL_ABSTDLG_BASE( AbstractScNamePasteDlg_Impl, ScNamePasteDlg ) - virtual std::vector<OUString> GetSelectedNames() const SAL_OVERRIDE; + virtual std::vector<OUString> GetSelectedNames() const override; }; class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg { DECL_ABSTDLG_BASE( AbstractScPivotFilterDlg_Impl, ScPivotFilterDlg) - virtual const ScQueryItem& GetOutputItem() SAL_OVERRIDE; + virtual const ScQueryItem& GetOutputItem() override; }; class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg { DECL_ABSTDLG_BASE( AbstractScDPFunctionDlg_Impl, ScDPFunctionDlg) - virtual sal_uInt16 GetFuncMask() const SAL_OVERRIDE; - virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const SAL_OVERRIDE; + virtual sal_uInt16 GetFuncMask() const override; + virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const override; }; class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg { DECL_ABSTDLG_BASE( AbstractScDPSubtotalDlg_Impl, ScDPSubtotalDlg) - virtual sal_uInt16 GetFuncMask() const SAL_OVERRIDE; - virtual void FillLabelData( ScDPLabelData& rLabelData ) const SAL_OVERRIDE; + virtual sal_uInt16 GetFuncMask() const override; + virtual void FillLabelData( ScDPLabelData& rLabelData ) const override; }; class AbstractScDPNumGroupDlg_Impl : public AbstractScDPNumGroupDlg { DECL_ABSTDLG_BASE( AbstractScDPNumGroupDlg_Impl, ScDPNumGroupDlg ) - virtual ScDPNumGroupInfo GetGroupInfo() const SAL_OVERRIDE; + virtual ScDPNumGroupInfo GetGroupInfo() const override; }; class AbstractScDPDateGroupDlg_Impl : public AbstractScDPDateGroupDlg { DECL_ABSTDLG_BASE( AbstractScDPDateGroupDlg_Impl, ScDPDateGroupDlg ) - virtual ScDPNumGroupInfo GetGroupInfo() const SAL_OVERRIDE; - virtual sal_Int32 GetDatePart() const SAL_OVERRIDE; + virtual ScDPNumGroupInfo GetGroupInfo() const override; + virtual sal_Int32 GetDatePart() const override; }; class AbstractScDPShowDetailDlg_Impl : public AbstractScDPShowDetailDlg { DECL_ABSTDLG_BASE( AbstractScDPShowDetailDlg_Impl, ScDPShowDetailDlg) - virtual OUString GetDimensionName() const SAL_OVERRIDE; + virtual OUString GetDimensionName() const override; }; class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg { DECL_ABSTDLG_BASE( AbstractScNewScenarioDlg_Impl, ScNewScenarioDlg ) virtual void SetScenarioData( const OUString& rName, const OUString& rComment, - const Color& rColor, sal_uInt16 nFlags ) SAL_OVERRIDE; + const Color& rColor, sal_uInt16 nFlags ) override; virtual void GetScenarioData( OUString& rName, OUString& rComment, - Color& rColor, sal_uInt16& rFlags ) const SAL_OVERRIDE; + Color& rColor, sal_uInt16& rFlags ) const override; }; class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg { DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg) - virtual void Insert( const OUString& rString, bool bSelected ) SAL_OVERRIDE; - virtual sal_Int32 GetSelectEntryCount() const SAL_OVERRIDE; - virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) SAL_OVERRIDE; - virtual OUString GetSelectEntry(sal_Int32 nPos) const SAL_OVERRIDE; - virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const SAL_OVERRIDE; + virtual void Insert( const OUString& rString, bool bSelected ) override; + virtual sal_Int32 GetSelectEntryCount() const override; + virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) override; + virtual OUString GetSelectEntry(sal_Int32 nPos) const override; + virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const override; }; class AbstractScSortWarningDlg_Impl : public AbstractScSortWarningDlg @@ -350,39 +350,39 @@ class AbstractScSortWarningDlg_Impl : public AbstractScSortWarningDlg class AbstractScStringInputDlg_Impl : public AbstractScStringInputDlg { DECL_ABSTDLG_BASE( AbstractScStringInputDlg_Impl, ScStringInputDlg ) - virtual OUString GetInputString() const SAL_OVERRIDE; + virtual OUString GetInputString() const override; }; class AbstractScTabBgColorDlg_Impl : public AbstractScTabBgColorDlg { DECL_ABSTDLG_BASE( AbstractScTabBgColorDlg_Impl, ScTabBgColorDlg ) - virtual void GetSelectedColor( Color& rColor ) const SAL_OVERRIDE; + virtual void GetSelectedColor( Color& rColor ) const override; }; class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg { DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg) - virtual void GetImportOptions( ScImportOptions& rOptions ) const SAL_OVERRIDE; + virtual void GetImportOptions( ScImportOptions& rOptions ) const override; }; class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDlg { DECL_ABSTDLG_BASE( AbstractScTextImportOptionsDlg_Impl, ScTextImportOptionsDlg) - virtual LanguageType GetLanguageType() const SAL_OVERRIDE; - virtual bool IsDateConversionSet() const SAL_OVERRIDE; + virtual LanguageType GetLanguageType() const override; + virtual bool IsDateConversionSet() const override; }; class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( ScAbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; - virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE; - virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; - virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; + virtual void SetCurPageId( sal_uInt16 nId ) override; + virtual void SetCurPageId( const OString &rName ) override; + virtual const SfxItemSet* GetOutputItemSet() const override; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override; + virtual void SetInputSet( const SfxItemSet* pInSet ) override; //From class Window. - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; }; //AbstractDialogFactory_Impl implementations @@ -394,39 +394,39 @@ public: virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, - ScImportAsciiCall eCall) SAL_OVERRIDE; + ScImportAsciiCall eCall) override; - virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(vcl::Window* pParent) override; virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(vcl::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, - ScViewData *pViewData) SAL_OVERRIDE; + ScViewData *pViewData) override; virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (vcl::Window* pParent, bool bCol = false, - bool bRow = false) SAL_OVERRIDE; + bool bRow = false) override; - virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) SAL_OVERRIDE; + virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) override; virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - const ScAddress& rPos, int nId ) SAL_OVERRIDE; + const ScAddress& rPos, int nId ) override; - virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) override; virtual AbstractScDataPilotSourceTypeDlg* CreateScDataPilotSourceTypeDlg(vcl::Window* pParent, - bool bEnableExternal) SAL_OVERRIDE; + bool bEnableExternal) override; virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices, - int nId ) SAL_OVERRIDE; - virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false ) SAL_OVERRIDE; + int nId ) override; + virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false ) override; //for dataform virtual AbstractScDataFormDlg* CreateScDataFormDlg(vcl::Window* pParent, - ScTabViewShell* pTabViewShell) SAL_OVERRIDE; + ScTabViewShell* pTabViewShell) override; virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(vcl::Window* pParent, - InsertDeleteFlags nCheckDefaults = IDF_NONE) SAL_OVERRIDE; + InsertDeleteFlags nCheckDefaults = IDF_NONE) override; virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, @@ -436,26 +436,26 @@ public: const OUString& aStartStr, double fStep, double fMax, - sal_uInt16 nPossDir) SAL_OVERRIDE; + sal_uInt16 nPossDir) override; virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( vcl::Window* pParent, bool bUnGroup = false, - bool bRows = true) SAL_OVERRIDE; + bool bRows = true) override; virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( vcl::Window* pParent, int nId, - bool bDisallowCellMove = false ) SAL_OVERRIDE; + bool bDisallowCellMove = false ) override; virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE, - const OUString* pStrTitle = NULL ) SAL_OVERRIDE; + const OUString* pStrTitle = NULL ) override; virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData, - SCTAB nTabCount, bool bFromFile) SAL_OVERRIDE; + SCTAB nTabCount, bool bFromFile) override; virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( vcl::Window* pParent, - const std::vector<OUString> &rEntryList ) SAL_OVERRIDE; + const std::vector<OUString> &rEntryList ) override; - virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(vcl::Window* pParent) override; virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( vcl::Window* pParent, const OString& sDialogName, @@ -466,60 +466,60 @@ public: long nMaximum = 1000, long nMinimum = 0, long nFirst = 1, - long nLast = 100 ) SAL_OVERRIDE; + long nLast = 100 ) override; virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(vcl::Window * pParent, - const OUString& rDefault) SAL_OVERRIDE; + const OUString& rDefault) override; virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(vcl::Window * pParent, - sal_uInt16 nFlags) SAL_OVERRIDE; + sal_uInt16 nFlags) override; - virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( vcl::Window * pParent, ScDocShell* pShell, bool bInsList=true ) SAL_OVERRIDE; + virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( vcl::Window * pParent, ScDocShell* pShell, bool bInsList=true ) override; virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(vcl::Window* pParent, - const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) SAL_OVERRIDE; + const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) override; virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, - const ScPivotFuncData& rFuncData ) SAL_OVERRIDE; + const ScPivotFuncData& rFuncData ) override; virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, - bool bEnableLayout ) SAL_OVERRIDE; + bool bEnableLayout ) override; virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( vcl::Window* pParent, int nId, - const ScDPNumGroupInfo& rInfo ) SAL_OVERRIDE; + const ScDPNumGroupInfo& rInfo ) override; virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, - const Date& rNullDate ) SAL_OVERRIDE; + const Date& rNullDate ) override; virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( vcl::Window* pParent, int nId, ScDPObject& rDPObj, - sal_uInt16 nOrient ) SAL_OVERRIDE; + sal_uInt16 nOrient ) override; virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( vcl::Window* pParent, const OUString& rName, - bool bEdit = false, bool bSheetProtected = false ) SAL_OVERRIDE; - virtual AbstractScShowTabDlg * CreateScShowTabDlg(vcl::Window* pParent) SAL_OVERRIDE; + bool bEdit = false, bool bSheetProtected = false ) override; + virtual AbstractScShowTabDlg * CreateScShowTabDlg(vcl::Window* pParent) override; virtual AbstractScStringInputDlg * CreateScStringInputDlg ( vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, - const OString& sHelpId, const OString& sEditHelpId ) SAL_OVERRIDE; + const OString& sHelpId, const OString& sEditHelpId ) override; virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( vcl::Window* pParent, const OUString& rTitle, //Dialog Title const OUString& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color - const OString& sHelpId ) SAL_OVERRIDE; + const OString& sHelpId ) override; virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( vcl::Window* pParent, bool bAscii = true, @@ -527,39 +527,39 @@ public: const OUString* pStrTitle = NULL, bool bMultiByte = false, bool bOnlyDbtoolsEncodings = false, - bool bImport = true ) SAL_OVERRIDE; + bool bImport = true ) override; virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, vcl::Window* pParent, - const SfxItemSet* pCellAttrs ) SAL_OVERRIDE; + const SfxItemSet* pCellAttrs ) override; virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, - sal_uInt16 nResId = RID_SCDLG_HFEDIT ) SAL_OVERRIDE; + sal_uInt16 nResId = RID_SCDLG_HFEDIT ) override; virtual SfxAbstractTabDialog * CreateScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, - int nId) SAL_OVERRIDE; + int nId) override; virtual SfxAbstractTabDialog * CreateScSubTotalDlg( vcl::Window* pParent, - const SfxItemSet* pArgSet ) SAL_OVERRIDE; + const SfxItemSet* pArgSet ) override; virtual SfxAbstractTabDialog * CreateScCharDlg(vcl::Window* pParent, - const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) SAL_OVERRIDE; + const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) override; virtual SfxAbstractTabDialog * CreateScParagraphDlg(vcl::Window* pParent, - const SfxItemSet* pAttr) SAL_OVERRIDE; + const SfxItemSet* pAttr) override; virtual SfxAbstractTabDialog * CreateScValidationDlg(vcl::Window* pParent, - const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) SAL_OVERRIDE; + const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) override; - virtual SfxAbstractTabDialog * CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) SAL_OVERRIDE; + virtual SfxAbstractTabDialog * CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) override; // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE; + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) override; - virtual GetTabPageRanges GetTabPageRangesFunc() SAL_OVERRIDE; + virtual GetTabPageRanges GetTabPageRangesFunc() override; }; diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index db4639c0f363..120e1d633a0d 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -1405,7 +1405,7 @@ class ScIconSetFrmtDataEntry : public Control ScIconSetFrmtDataEntry( vcl::Window* pParent, ScIconSetType eType, ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry = NULL ); virtual ~ScIconSetFrmtDataEntry(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const; diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index b847dddf48eb..f95425b2ebb6 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -213,7 +213,7 @@ public: } private: - virtual void execute() SAL_OVERRIDE + virtual void execute() override { while (!isTerminateRequested()) { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 3a91d52c3233..19bd2ca0e9d7 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2691,7 +2691,7 @@ public: RefCacheFiller( svl::SharedStringPool& rStrPool, ScExternalRefCache& rRefCache, sal_uInt16 nFileId ) : mrStrPool(rStrPool), mrRefCache(rRefCache), mnFileId(nFileId), mpCurCol(NULL) {} - virtual void startColumn( ScColumn* pCol ) SAL_OVERRIDE + virtual void startColumn( ScColumn* pCol ) override { mpCurCol = pCol; if (!mpCurCol) @@ -2701,7 +2701,7 @@ public: mpRefTab = mrRefCache.getCacheTable(mnFileId, mpCurCol->GetTab()); } - virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) SAL_OVERRIDE + virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) override { if (!mpCurCol || !bVal) return; diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 0e84f2da3246..fded9aca1f6b 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2209,27 +2209,27 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin { OSL_FAIL("Missing file filters"); } virtual ~ScFormatFilterMissing() {} - virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding ) SAL_OVERRIDE { return eERR_INTERN; } - virtual FltError ScImportQuattroPro( SfxMedium &, ScDocument * ) SAL_OVERRIDE { return eERR_INTERN; } - virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) SAL_OVERRIDE { return eERR_INTERN; } - virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) SAL_OVERRIDE { return eERR_INTERN; } + virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding ) override { return eERR_INTERN; } + virtual FltError ScImportQuattroPro( SfxMedium &, ScDocument * ) override { return eERR_INTERN; } + virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) override { return eERR_INTERN; } + virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) override { return eERR_INTERN; } virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress&, - const rtl_TextEncoding, sal_uInt32 ) SAL_OVERRIDE { return eERR_INTERN; } - virtual FltError ScImportRTF( SvStream&, const OUString&, ScDocument*, ScRange& ) SAL_OVERRIDE { return eERR_INTERN; } - virtual FltError ScImportHTML( SvStream&, const OUString&, ScDocument*, ScRange&, double, bool, SvNumberFormatter*, bool ) SAL_OVERRIDE { return eERR_INTERN; } + const rtl_TextEncoding, sal_uInt32 ) override { return eERR_INTERN; } + virtual FltError ScImportRTF( SvStream&, const OUString&, ScDocument*, ScRange& ) override { return eERR_INTERN; } + virtual FltError ScImportHTML( SvStream&, const OUString&, ScDocument*, ScRange&, double, bool, SvNumberFormatter*, bool ) override { return eERR_INTERN; } - virtual ScEEAbsImport *CreateRTFImport( ScDocument*, const ScRange& ) SAL_OVERRIDE { return NULL; } - virtual ScEEAbsImport *CreateHTMLImport( ScDocument*, const OUString&, const ScRange&, bool ) SAL_OVERRIDE { return NULL; } - virtual OUString GetHTMLRangeNameList( ScDocument*, const OUString& ) SAL_OVERRIDE { return OUString(); } + virtual ScEEAbsImport *CreateRTFImport( ScDocument*, const ScRange& ) override { return NULL; } + virtual ScEEAbsImport *CreateHTMLImport( ScDocument*, const OUString&, const ScRange&, bool ) override { return NULL; } + virtual OUString GetHTMLRangeNameList( ScDocument*, const OUString& ) override { return OUString(); } - virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel, rtl_TextEncoding ) SAL_OVERRIDE { return eERR_INTERN; } - virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress&, const rtl_TextEncoding, sal_uInt32 ) SAL_OVERRIDE { return eERR_INTERN; } - virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding, sal_uInt32 ) SAL_OVERRIDE { return eERR_INTERN; } + virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel, rtl_TextEncoding ) override { return eERR_INTERN; } + virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress&, const rtl_TextEncoding, sal_uInt32 ) override { return eERR_INTERN; } + virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding, sal_uInt32 ) override { return eERR_INTERN; } virtual FltError ScExportHTML( SvStream&, const OUString&, ScDocument*, const ScRange&, const rtl_TextEncoding, bool, - const OUString&, OUString&, const OUString& ) SAL_OVERRIDE { return eERR_INTERN; } - virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding ) SAL_OVERRIDE { return eERR_INTERN; } + const OUString&, OUString&, const OUString& ) override { return eERR_INTERN; } + virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding ) override { return eERR_INTERN; } - virtual ScOrcusFilters* GetOrcusFilters() SAL_OVERRIDE { return NULL; } + virtual ScOrcusFilters* GetOrcusFilters() override { return NULL; } }; extern "C" { static void SAL_CALL thisModule() {} } diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 5de9a78fd3d3..0470b7cd79b2 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -107,11 +107,11 @@ class VBAProjectListener : public ContainerListenerHelper public: VBAProjectListener( ScMacroManager* pMacroMgr ) : mpMacroMgr( pMacroMgr ) {} // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException, std::exception) override {} // XContainerListener - virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) throw(RuntimeException, std::exception) SAL_OVERRIDE + 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 { OUString sModuleName; Event.Accessor >>= sModuleName; @@ -119,7 +119,7 @@ public: mpMacroMgr->InitUserFuncData(); mpMacroMgr->BroadcastModuleUpdate(sModuleName); } - virtual void SAL_CALL elementRemoved( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL elementRemoved( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception) override {} }; diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index d5206a5fc60a..0006aa8d2af3 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -65,10 +65,10 @@ private: ScSplitPos eSplitPos, ScAccessibleDocument* pAccDoc); - virtual void Init() SAL_OVERRIDE; + virtual void Init() override; using ScAccessibleCellBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; protected: virtual ~ScAccessibleCell(); @@ -89,19 +89,19 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleContext ============================================== @@ -110,25 +110,25 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -136,22 +136,22 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // Override this method to handle cell's ParaIndent attribute specially. virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; private: ScTabViewShell* mpViewShell; ScAccessibleDocument* mpAccDoc; @@ -163,7 +163,7 @@ private: ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); virtual bool IsEditable( const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates) SAL_OVERRIDE; + ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates) override; bool IsOpaque( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 562afedcac2e..c0074270bed7 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -46,43 +46,43 @@ protected: public: virtual bool SAL_CALL isVisible() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () override; ///===== XAccessibleComponent ============================================ virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleContext ============================================== /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleValue ================================================ @@ -90,19 +90,19 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -110,20 +110,20 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /// returns the possible types virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: ScAddress maCellAddress; diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 012bf9b30b7e..333803693e2d 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -74,7 +74,7 @@ public: const sal_Int16 aRole); virtual void Init(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; protected: virtual ~ScAccessibleContextBase(); public: @@ -87,105 +87,105 @@ public: ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () override; ///===== XAccessible ===================================================== /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Return the parents locale or throw exception if this object has no parent yet/anymore. @@ -193,7 +193,7 @@ public: virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) override; ///===== XAccessibleEventBroadcaster ===================================== @@ -204,25 +204,25 @@ public: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; // Remove an existing event listener. virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleEventListener ======================================== virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -230,33 +230,33 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /// returns the possible types virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: /// Return this object's description. diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 5ebbf145bfa6..a979ffc15440 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -61,19 +61,19 @@ public: virtual ~ScAccessibleCsvControl(); using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; /** Returns true, if the control is visible. */ - virtual bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XAccessibleComponent --------------------------------------------------- /** Returns the child at the specified point (cell returns NULL). */ virtual XAccessibleRef SAL_CALL getAccessibleAtPoint( const AwtPoint& rPoint ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Sets the focus to this control. */ - virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // events ----------------------------------------------------------------- public: @@ -95,9 +95,9 @@ public: // helpers ---------------------------------------------------------------- protected: /** Returns this object's current bounding box relative to the desktop. */ - virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns this object's current bounding box relative to the parent object. */ - virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns whether the object is alive. Must be called with locked mutex. */ inline bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; } @@ -144,124 +144,124 @@ public: // XAccessibleComponent ----------------------------------------------------- virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleContext ----------------------------------------------------- /** Returns the child count (the ruler does not have children). */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Throws an exception (the ruler does not have children). */ virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the relation to the grid control. */ virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the current set of states. */ virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XAccessibleText -------------------------------------------------------- /** Return the position of the caret. */ - virtual sal_Int32 SAL_CALL getCaretPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCaretPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Sets the position of the caret. */ virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the specified character. */ virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the attributes of the specified character. */ virtual PropertyValueSeq SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the screen coordinates of the specified character. */ virtual AwtRectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the count of characters. */ - virtual sal_Int32 SAL_CALL getCharacterCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCharacterCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the character index at the specified coordinate (object's coordinate system). */ virtual sal_Int32 SAL_CALL getIndexAtPoint( const AwtPoint& rPoint ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the selected text (ruler returns empty string). */ - virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the start index of the selection (ruler returns -1). */ - virtual sal_Int32 SAL_CALL getSelectionStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the end index of the selection (ruler returns -1). */ - virtual sal_Int32 SAL_CALL getSelectionEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Selects a part of the text (ruler does nothing). */ virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the entire text. */ - virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the specified range [Start,End) of the text. */ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the specified text portion. */ - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) 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( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; // XInterface ------------------------------------------------------------- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() override; // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XTypeProvider ---------------------------------------------------------- /** Returns a sequence with all supported interface types. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns an implementation ID. */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // events ----------------------------------------------------------------- public: /** Sends a caret changed event to all listeners. */ - virtual void SendCaretEvent() SAL_OVERRIDE; + virtual void SendCaretEvent() override; // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Throws an exception, if the specified character position is invalid (outside 0..len-1). */ void ensureValidIndex( sal_Int32 nIndex ) const @@ -313,186 +313,186 @@ public: /** Returns the cell at the specified point. */ virtual XAccessibleRef SAL_CALL getAccessibleAtPoint( const AwtPoint& rPoint ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleContext ----------------------------------------------------- /** Returns the child count (count of cells in the table). */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the specified child cell. */ virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the relation to the ruler control. */ virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the current set of states. */ virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XAccessibleTable ------------------------------------------------------- /** Returns the number of rows in the table. */ virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the number of columns in the table. */ virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the description of the specified row in the table. */ virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the description text of the specified column in the table. */ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) 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( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) 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( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the row headers as an AccessibleTable. */ virtual XAccessibleTableRef SAL_CALL getAccessibleRowHeaders() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the column headers as an AccessibleTable. */ virtual XAccessibleTableRef SAL_CALL getAccessibleColumnHeaders() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the selected rows as a sequence. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the selected columns as a sequence. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns true, if the specified row is selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns true, if the specified column is selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the accessible cell object at the specified position. */ virtual XAccessibleRef SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the caption object of the table. */ virtual XAccessibleRef SAL_CALL getAccessibleCaption() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the summary description object of the table. */ virtual XAccessibleRef SAL_CALL getAccessibleSummary() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) 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( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the row index of the specified child. */ virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the column index of the specified child. */ virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; // XAccessibleSelection --------------------------------------------------- /** Selects the specified child (selects the entire column or the entire table). */ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns true, if the specified child is selected. */ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Deselects all cells. */ virtual void SAL_CALL clearAccessibleSelection() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Selects all cells. */ virtual void SAL_CALL selectAllAccessibleChildren() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the count of selected children. */ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the child with the specified index in all selected children. */ virtual XAccessibleRef SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Deselects the child with the specified index in all selected children. */ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; // XInterface ------------------------------------------------------------- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() override; // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XTypeProvider ---------------------------------------------------------- /** Returns a sequence with all supported interface types. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns an implementation ID. */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // events ----------------------------------------------------------------- public: /** Sends a GetFocus or LoseFocus event to all listeners. */ - virtual void SendFocusEvent( bool bFocused ) SAL_OVERRIDE; + virtual void SendFocusEvent( bool bFocused ) override; /** Sends a table model changed event for changed cell contents to all listeners. */ - virtual void SendTableUpdateEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn, bool bAllRows ) SAL_OVERRIDE; + virtual void SendTableUpdateEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn, bool bAllRows ) override; /** Sends a table model changed event for an inserted column to all listeners. */ - virtual void SendInsertColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn ) SAL_OVERRIDE; + virtual void SendInsertColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn ) override; /** Sends a table model changed event for a removed column to all listeners. */ - virtual void SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn ) SAL_OVERRIDE; + virtual void SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn ) override; // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Throws an exception, if nIndex is not a valid child index. */ void ensureValidIndex( sal_Int32 nIndex ) const @@ -555,40 +555,40 @@ public: virtual ~ScAccessibleCsvCell(); using ScAccessibleCsvControl::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XAccessibleComponent --------------------------------------------------- /** Sets the focus to the column of this cell. */ - virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleContext ----------------------------------------------------- /** Returns the child count. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the specified child. */ virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the index of this cell in the table. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the relation to the ruler control. */ virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns the current set of states. */ virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XInterface ------------------------------------------------------------- @@ -602,22 +602,22 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // helpers ---------------------------------------------------------------- protected: /** Returns this object's current bounding box relative to the desktop. */ - virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns this object's current bounding box relative to the parent object. */ - virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException ) 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 1c1b7539cafd..b2c208f489b1 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -65,7 +65,7 @@ public: void PreInit(); - virtual void Init() SAL_OVERRIDE; + virtual void Init() override; DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); protected: @@ -75,99 +75,99 @@ protected: public: - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () override; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; ///===== XAccessibleSelection =========================================== virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XSelectionListener ============================================= virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XServiceInfo =================================================== @@ -175,26 +175,26 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /// returns the possible types virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== IAccessibleViewForwarder ======================================== @@ -205,7 +205,7 @@ public: The rectangle of the visible part of the document. The values are, contrary to the base class, in internal coordinates. */ - virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; + virtual Rectangle GetVisibleArea() const override; /** Transform the specified point from internal coordinates to an absolute screen position. @@ -217,7 +217,7 @@ public: The same point but in screen coordinates relative to the upper left corner of the (current) screen. */ - virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; + virtual Point LogicToPixel (const Point& rPoint) const override; /** Transform the specified size from internal coordinates to a screen * oriented pixel size. @@ -228,7 +228,7 @@ public: @return The same size but in screen coordinates. */ - virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; + virtual Size LogicToPixel (const Size& rSize) const override; ///======== internal ===================================================== @@ -242,20 +242,20 @@ protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: ScTabViewShell* mpViewShell; @@ -293,13 +293,13 @@ public: //===== XAccessibleGetAccFromXShape ============================================ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 4c144f3e9e91..c982b2252b1a 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -49,56 +49,56 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== @@ -106,7 +106,7 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== internal ======================================================== @@ -114,22 +114,22 @@ protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; public: // needed in ScShapeChildren /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 4e6501929d18..4cae0a782321 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -63,7 +63,7 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; void LostFocus(); @@ -72,26 +72,26 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () override; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleContext ============================================== @@ -100,56 +100,56 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XAccessibleSelection ============================================ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; public: ///===== XAccessibleEventBroadcaster ===================================== @@ -161,14 +161,14 @@ public: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; // Remove an existing event listener. virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -176,7 +176,7 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== @@ -184,7 +184,7 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: accessibility::AccessibleTextHelper* mpTextHelper; @@ -203,10 +203,10 @@ private: ///===== XAccessibleComponent ============================================ virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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 74817c4a2ec6..01eebff0b94c 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -42,43 +42,43 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; //===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; //===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index bcd26b31ac3d..4cc234a828bf 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -48,18 +48,18 @@ public: const EditTextObject* GetEditTextObject() const { return mpEditObj; } using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleContext ============================================== @@ -67,20 +67,20 @@ public: /// override to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XServiceInfo ==================================================== @@ -88,14 +88,14 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== @@ -103,14 +103,14 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: EditTextObject* mpEditObj; diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index 8615b6386e76..7bf645fc626d 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -45,37 +45,37 @@ protected: public: using ScAccessibleCellBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; //===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== // override to calculate this on demand - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== @@ -83,11 +83,11 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; @@ -99,7 +99,7 @@ private: ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); virtual bool IsEditable( const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates) SAL_OVERRIDE; + ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates) override; bool IsOpaque( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 9d489c285c54..1aa83bc78e96 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -54,73 +54,73 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; //===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () override; //===== XAccessibleValue ================================================ - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index d4068a0ec1c1..1aaef208436e 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -46,134 +46,134 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; //===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () override; //===== XAccessibleTable ================================================ virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumnCount() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleRowHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleColumnHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleCaption() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleCaption() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleSummary() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleSummary() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index ad8fc59709c1..16fdaf30dfb0 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -85,7 +85,7 @@ protected: public: using ScAccessibleTableBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; void CompleteSelectionChanged(bool bNewState); @@ -97,47 +97,47 @@ public: private: ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ///===== XAccessibleTable ================================================ /// Returns the row headers as an AccessibleTable. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Returns the column headers as an AccessibleTable. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Returns the selected rows in a table. virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Returns the selected columns in a table. virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Returns a boolean value indicating whether the specified row is selected. virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; /// Returns a boolean value indicating whether the specified column is selected. virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; /// Returns the Accessible at a specified row and column in the table. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; rtl::Reference<ScAccessibleCell> GetAccessibleCellAt(sal_Int32 nRow, sal_Int32 nColumn); @@ -145,23 +145,23 @@ private: virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleContext ============================================== @@ -169,13 +169,13 @@ private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleSelection =========================================== @@ -183,31 +183,31 @@ private: selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; ///===== XServiceInfo ==================================================== @@ -215,13 +215,13 @@ private: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== @@ -229,7 +229,7 @@ private: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleEventBroadcaster ===================================== @@ -240,29 +240,29 @@ private: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; //===== XAccessibleTableSelection ============================================ virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: ScTabViewShell* mpViewShell; ScRangeList* mpMarkedRanges; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 3bfe62c54c57..9cab4afe0b0e 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -54,17 +54,17 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () override; ///===== XAccessibleTable ================================================ @@ -72,27 +72,27 @@ public: virtual sal_Int32 SAL_CALL getAccessibleRowCount( ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Returns the number of columns in the table. virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Returns the description of the specified row in the table. virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Returns the description text of the specified column in the table. virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) 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. @@ -101,7 +101,7 @@ public: getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) 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. @@ -110,65 +110,65 @@ public: getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Returns the row headers as an AccessibleTable. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Returns the column headers as an AccessibleTable. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Returns the selected rows in a table. virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Returns the selected columns in a table. virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Returns a boolean value indicating whether the specified row is selected. virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Returns a boolean value indicating whether the specified column is selected. virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Returns the Accessible at a specified row and column in the table. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Returns the caption for the table. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Returns the summary description of the table. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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 (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; ///===== XAccessibleExtendedTable ======================================== @@ -177,21 +177,21 @@ public: getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Returns the row number of an index in the table. virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Returns the column number of an index in the table. virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; //===== XAccessibleContext ============================================== @@ -200,7 +200,7 @@ public: virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand @@ -208,45 +208,45 @@ public: getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; public: /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// Return the set of current states. // perhaps sometimes to be implemented virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XAccessibleSelection =========================================== @@ -254,37 +254,37 @@ public: selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; ///===== XServiceInfo =================================================== @@ -292,20 +292,20 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; ///===== XTypeProvider =================================================== /// returns the possible types virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index cda6b52e2f18..9256f3152ffa 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -46,7 +46,7 @@ public: virtual ScAccessibleTextData* Clone() const = 0; - virtual void Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ ) SAL_OVERRIDE {} + virtual void Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ ) override {} virtual SvxTextForwarder* GetTextForwarder() = 0; virtual SvxViewForwarder* GetViewForwarder() = 0; @@ -69,9 +69,9 @@ public: const ScAddress& rP) : ScCellTextData(pDocShellP, rP) {} virtual ~ScAccessibleCellBaseTextData() {} - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE { ScCellTextData::Notify(rBC, rHint); } + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override { ScCellTextData::Notify(rBC, rHint); } - virtual void UpdateData() SAL_OVERRIDE { ScCellTextData::UpdateData(); } + virtual void UpdateData() override { ScCellTextData::UpdateData(); } }; // ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object @@ -83,16 +83,16 @@ public: const ScAddress& rP, ScSplitPos eSplitPos, ScAccessibleCell* pAccCell); virtual ~ScAccessibleCellTextData(); - virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; + virtual ScAccessibleTextData* Clone() const override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; - virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual SvxViewForwarder* GetViewForwarder() override; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) override; protected: - virtual void GetCellText(const ScAddress& rCellPos, OUString& rText) SAL_OVERRIDE; + virtual void GetCellText(const ScAddress& rCellPos, OUString& rText) override; private: ScViewForwarder* mpViewForwarder; ScEditViewForwarder* mpEditViewForwarder; @@ -111,15 +111,15 @@ public: ScAccessibleEditObjectTextData(EditView* pEditView, vcl::Window* pWin, bool isClone = false); virtual ~ScAccessibleEditObjectTextData(); - virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; + virtual ScAccessibleTextData* Clone() const override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; - virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual SvxViewForwarder* GetViewForwarder() override; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) override; - virtual void UpdateData() SAL_OVERRIDE { } + virtual void UpdateData() override { } DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); protected: @@ -138,10 +138,10 @@ public: ScAccessibleEditLineTextData(EditView* pEditView, vcl::Window* pWin); virtual ~ScAccessibleEditLineTextData(); - virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; + virtual ScAccessibleTextData* Clone() const override; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) override; void Dispose(); void TextChanged(); @@ -160,13 +160,13 @@ public: const ScAddress& rP); virtual ~ScAccessiblePreviewCellTextData(); - virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; + virtual ScAccessibleTextData* Clone() const override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; - virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) SAL_OVERRIDE { return NULL; } + virtual SvxTextForwarder* GetTextForwarder() override; + virtual SvxViewForwarder* GetViewForwarder() override; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) override { return NULL; } private: ScPreviewViewForwarder* mpViewForwarder; @@ -183,13 +183,13 @@ public: const OUString& rText, const ScAddress& rP, bool bColHeader, bool bRowHeader); virtual ~ScAccessiblePreviewHeaderCellTextData(); - virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; + virtual ScAccessibleTextData* Clone() const override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; - virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) SAL_OVERRIDE { return NULL; } + virtual SvxTextForwarder* GetTextForwarder() override; + virtual SvxViewForwarder* GetViewForwarder() override; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) override { return NULL; } private: ScPreviewViewForwarder* mpViewForwarder; @@ -209,15 +209,15 @@ public: const EditTextObject* pEditObj, bool bHeader, SvxAdjust eAdjust); virtual ~ScAccessibleHeaderTextData(); - virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; + virtual ScAccessibleTextData* Clone() const override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; - virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) SAL_OVERRIDE { return NULL; } + virtual SvxTextForwarder* GetTextForwarder() override; + virtual SvxViewForwarder* GetViewForwarder() override; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) override { return NULL; } - virtual void UpdateData() SAL_OVERRIDE { } + virtual void UpdateData() override { } private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; @@ -237,15 +237,15 @@ public: const OUString& sText, const ScAddress& aCellPos, bool bMarkNote); virtual ~ScAccessibleNoteTextData(); - virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; + virtual ScAccessibleTextData* Clone() const override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; - virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) SAL_OVERRIDE { return NULL; } + virtual SvxTextForwarder* GetTextForwarder() override; + virtual SvxViewForwarder* GetViewForwarder() override; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) override { return NULL; } - virtual void UpdateData() SAL_OVERRIDE { } + virtual void UpdateData() override { } private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; @@ -281,15 +281,15 @@ public: const Size& rCellSize ); virtual ~ScAccessibleCsvTextData(); - virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; + virtual ScAccessibleTextData* Clone() const override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; - virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual SvxViewForwarder* GetViewForwarder() override; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) override; - virtual void UpdateData() SAL_OVERRIDE {} + virtual void UpdateData() override {} }; #endif diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index 21da5a3bcd3c..0b00ab464bea 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -56,13 +56,13 @@ public: vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScAnalysisOfVarianceDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; - virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; + virtual sal_Int16 GetUndoNameId() override; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; #endif diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index 7760af0aee9b..65617cc58e32 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -43,25 +43,25 @@ protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // ____ XEventListener (base of XSelectionChangeListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: ScTabViewShell * m_pViewShell; diff --git a/sc/source/ui/inc/ChiSquareTestDialog.hxx b/sc/source/ui/inc/ChiSquareTestDialog.hxx index 199cbfa361e5..2f63a064752a 100644 --- a/sc/source/ui/inc/ChiSquareTestDialog.hxx +++ b/sc/source/ui/inc/ChiSquareTestDialog.hxx @@ -22,11 +22,11 @@ public: virtual ~ScChiSquareTestDialog(); - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; - virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; + virtual sal_Int16 GetUndoNameId() override; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; #endif diff --git a/sc/source/ui/inc/ChildWindowWrapper.hxx b/sc/source/ui/inc/ChildWindowWrapper.hxx index bfedab53af8d..ed41525bbf60 100644 --- a/sc/source/ui/inc/ChildWindowWrapper.hxx +++ b/sc/source/ui/inc/ChildWindowWrapper.hxx @@ -59,7 +59,7 @@ public: SfxChildWindow::RegisterChildWindow(pModule, pFactory); } - virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE + virtual SfxChildWinInfo GetInfo() const override { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); static_cast<SfxModelessDialog*>(GetWindow())->FillInfo( aInfo ); diff --git a/sc/source/ui/inc/CorrelationDialog.hxx b/sc/source/ui/inc/CorrelationDialog.hxx index ce2fee57ef48..ee2f433ed35d 100644 --- a/sc/source/ui/inc/CorrelationDialog.hxx +++ b/sc/source/ui/inc/CorrelationDialog.hxx @@ -20,11 +20,11 @@ public: SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent, ScViewData* pViewData); - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual const OUString getLabel() SAL_OVERRIDE; - virtual const OUString getTemplate() SAL_OVERRIDE; + virtual const OUString getLabel() override; + virtual const OUString getTemplate() override; }; #endif diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx index e3727ba35816..e127be99fc2e 100644 --- a/sc/source/ui/inc/CovarianceDialog.hxx +++ b/sc/source/ui/inc/CovarianceDialog.hxx @@ -20,12 +20,12 @@ public: SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent, ScViewData* pViewData); - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual const OUString getLabel() SAL_OVERRIDE; - virtual const OUString getTemplate() SAL_OVERRIDE; - virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; + virtual const OUString getLabel() override; + virtual const OUString getTemplate() override; + virtual sal_Int16 GetUndoNameId() override; }; #endif diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx index aa6a9126204b..ac49f6b9d919 100644 --- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx +++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx @@ -22,11 +22,11 @@ public: virtual ~ScDescriptiveStatisticsDialog(); - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; - virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; + virtual sal_Int16 GetUndoNameId() override; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; #endif diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index c16e0b5bf717..69eef5f7b06e 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -40,11 +40,11 @@ public: virtual ~ScDrawModelBroadcaster(); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; #endif diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx index 0f186b4f4252..798fbe8fc894 100644 --- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx +++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx @@ -32,13 +32,13 @@ public: vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScExponentialSmoothingDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; - virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; + virtual sal_Int16 GetUndoNameId() override; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; #endif diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx index 2a8c59711313..3bfee4538ebb 100644 --- a/sc/source/ui/inc/FTestDialog.hxx +++ b/sc/source/ui/inc/FTestDialog.hxx @@ -22,11 +22,11 @@ public: virtual ~ScFTestDialog(); - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; - virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; + virtual sal_Int16 GetUndoNameId() override; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; #endif diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx index 0fdd1abfa88d..c00f83e77143 100644 --- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx +++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx @@ -32,8 +32,8 @@ public: virtual ~ScMatrixComparisonGenerator(); protected: - virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; - virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; + virtual sal_Int16 GetUndoNameId() override; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; virtual const OUString getLabel() = 0; virtual const OUString getTemplate() = 0; diff --git a/sc/source/ui/inc/MovingAverageDialog.hxx b/sc/source/ui/inc/MovingAverageDialog.hxx index f6aa85eb079b..e2b3e270d10d 100644 --- a/sc/source/ui/inc/MovingAverageDialog.hxx +++ b/sc/source/ui/inc/MovingAverageDialog.hxx @@ -32,13 +32,13 @@ public: vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScMovingAverageDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; - virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; + virtual sal_Int16 GetUndoNameId() override; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; #endif diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 689cbd87dd8d..779211428774 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -98,7 +98,7 @@ private: DECL_LINK(SourceEditModified, void*); void ToggleSource(); void ToggleDestination(); - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; ScPivotParam maPivotParameters; @@ -114,11 +114,11 @@ public: ScPivotLayoutDialog(SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent, ScViewData* pViewData, const ScDPObject* pPivotTableObject, bool bCreateNewPivotTable); virtual ~ScPivotLayoutDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference(const ScRange& rReferenceRange, ScDocument* pDocument) SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetReference(const ScRange& rReferenceRange, ScDocument* pDocument) override; + virtual void SetActive() override; + virtual bool IsRefInputMode() const override; void ItemInserted(ScItemValue* pItemValue, ScPivotLayoutTreeList::SvPivotTreeListType eType); diff --git a/sc/source/ui/inc/PivotLayoutTreeList.hxx b/sc/source/ui/inc/PivotLayoutTreeList.hxx index 858d9afa1dcf..2ae1adb88410 100644 --- a/sc/source/ui/inc/PivotLayoutTreeList.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeList.hxx @@ -18,16 +18,16 @@ class ScPivotLayoutTreeList : public ScPivotLayoutTreeListBase public: ScPivotLayoutTreeList(vcl::Window* pParent, WinBits nBits); virtual ~ScPivotLayoutTreeList(); - virtual bool DoubleClickHdl() SAL_OVERRIDE; + virtual bool DoubleClickHdl() override; void Setup(ScPivotLayoutDialog* pParent, SvPivotTreeListType eType); void FillFields(ScPivotFieldVector& rFieldVector); protected: - virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget) SAL_OVERRIDE; - virtual void InsertEntryForItem(ScItemValue* pItemValue, sal_uLong nPosition) SAL_OVERRIDE; + virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget) override; + virtual void InsertEntryForItem(ScItemValue* pItemValue, sal_uLong nPosition) override; - virtual void KeyInput(const KeyEvent& rKeyEvent) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKeyEvent) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx index 4ce7740f2bb9..7505a4a06272 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx @@ -42,20 +42,20 @@ public: ScPivotLayoutTreeListBase(vcl::Window* pParent, WinBits nBits, SvPivotTreeListType eType = UNDEFINED); virtual ~ScPivotLayoutTreeListBase(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvent) SAL_OVERRIDE; - virtual bool NotifyAcceptDrop(SvTreeListEntry* pEntry) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvent) override; + virtual bool NotifyAcceptDrop(SvTreeListEntry* pEntry) override; virtual TriState NotifyMoving(SvTreeListEntry* pTarget, SvTreeListEntry* pSource, - SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) SAL_OVERRIDE; + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) override; virtual TriState NotifyCopying(SvTreeListEntry* pTarget, SvTreeListEntry* pSource, - SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) SAL_OVERRIDE; + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) override; virtual DragDropMode NotifyStartDrag(TransferDataContainer& aTransferDataContainer, - SvTreeListEntry* pEntry) SAL_OVERRIDE; - virtual void DragFinished(sal_Int8 nDropAction) SAL_OVERRIDE; + SvTreeListEntry* pEntry) override; + virtual void DragFinished(sal_Int8 nDropAction) override; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() override; void PushEntriesToPivotFieldVector(ScPivotFieldVector& rVector); diff --git a/sc/source/ui/inc/PivotLayoutTreeListData.hxx b/sc/source/ui/inc/PivotLayoutTreeListData.hxx index c8c83b469508..73c6f0c0cb7c 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListData.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListData.hxx @@ -22,18 +22,18 @@ private: public: ScPivotLayoutTreeListData(vcl::Window* pParent, WinBits nBits); virtual ~ScPivotLayoutTreeListData(); - virtual bool DoubleClickHdl() SAL_OVERRIDE; + virtual bool DoubleClickHdl() override; void FillDataField(ScPivotFieldVector& rDataFields); void PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames); protected: - virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget) SAL_OVERRIDE; - virtual void InsertEntryForItem(ScItemValue* pItemValue, sal_uLong nPosition) SAL_OVERRIDE; + virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget) override; + virtual void InsertEntryForItem(ScItemValue* pItemValue, sal_uLong nPosition) override; void AdjustDuplicateCount(ScItemValue* pInputItemValue); - virtual void KeyInput(const KeyEvent& rKeyEvent) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKeyEvent) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx b/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx index 168f6275c8dd..08de8d261228 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx @@ -28,8 +28,8 @@ public: bool IsDataElement(SCCOL nColumn); protected: - virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget) SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rKeyEvent) SAL_OVERRIDE; + virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget) override; + virtual void KeyInput(const KeyEvent& rKeyEvent) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index c8bbbbc5ab92..9aed84462d8d 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -29,11 +29,11 @@ public: vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScRandomNumberGeneratorDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetActive() override; + virtual bool Close() override; private: // Widgets diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 10507378f558..f61c4a6975cb 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -27,11 +27,11 @@ public: vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScSamplingDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetActive() override; + virtual bool Close() override; private: // Widgets diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 21510d6cf884..856f5d160574 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -33,10 +33,10 @@ public: const OUString& rID, const OUString& rUIXMLDescription ); virtual ~ScStatisticsInputOutputDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetActive() override; protected: void CalculateInputAndWriteToOutput(); diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index ebe8de00494d..fec0cbc7dfb5 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -33,10 +33,10 @@ public: const OUString& rID, const OUString& rUIXMLDescription ); virtual ~ScStatisticsTwoVariableDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetActive() override; protected: void CalculateInputAndWriteToOutput(); diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx index b56008a563d5..adc4e22fc651 100644 --- a/sc/source/ui/inc/TTestDialog.hxx +++ b/sc/source/ui/inc/TTestDialog.hxx @@ -22,11 +22,11 @@ public: virtual ~ScTTestDialog(); - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; - virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; + virtual sal_Int16 GetUndoNameId() override; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; #endif diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index 2009261d51a5..0a34fef41d96 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -136,11 +136,11 @@ protected: public: DataRangeByColumnIterator(ScRange aInputRange); - virtual bool hasNext() SAL_OVERRIDE; - virtual void next() SAL_OVERRIDE; - virtual ScRange get() SAL_OVERRIDE; - virtual void reset() SAL_OVERRIDE; - virtual DataCellIterator iterateCells() SAL_OVERRIDE; + virtual bool hasNext() override; + virtual void next() override; + virtual ScRange get() override; + virtual void reset() override; + virtual DataCellIterator iterateCells() override; }; class DataRangeByRowIterator : public DataRangeIterator @@ -151,11 +151,11 @@ protected: public: DataRangeByRowIterator(ScRange aInputRange); - virtual bool hasNext() SAL_OVERRIDE; - virtual void next() SAL_OVERRIDE; - virtual ScRange get() SAL_OVERRIDE; - virtual void reset() SAL_OVERRIDE; - virtual DataCellIterator iterateCells() SAL_OVERRIDE; + virtual bool hasNext() override; + virtual void next() override; + virtual ScRange get() override; + virtual void reset() override; + virtual DataCellIterator iterateCells() override; }; #endif diff --git a/sc/source/ui/inc/ZTestDialog.hxx b/sc/source/ui/inc/ZTestDialog.hxx index 8af6f14ee65a..50f774de4959 100644 --- a/sc/source/ui/inc/ZTestDialog.hxx +++ b/sc/source/ui/inc/ZTestDialog.hxx @@ -22,11 +22,11 @@ public: virtual ~ScZTestDialog(); - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; - virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; + virtual sal_Int16 GetUndoNameId() override; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; #endif diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 3516edc7c7b5..7b5e256d089e 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -165,14 +165,14 @@ public: ScViewData* ptrViewData); virtual ~ScAcceptChgDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ReInit(ScViewData* ptrViewData); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void Initialize (SfxChildWinInfo* pInfo); - virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; + virtual void FillInfo(SfxChildWinInfo&) const override; }; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 6f367a834c87..480499a27fce 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -130,8 +130,8 @@ protected: static void SetDispatcherLock( bool bLock ); - virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; - virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; + virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) override; + virtual void RefInputDone( bool bForced = false ) override; bool ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc ); @@ -142,23 +142,23 @@ public: ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef ); virtual ~ScRefHandler(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE = 0; - virtual void AddRefEntry() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override = 0; + virtual void AddRefEntry() override; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual bool IsTableLocked() const SAL_OVERRIDE; - virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const SAL_OVERRIDE; + virtual bool IsRefInputMode() const override; + virtual bool IsTableLocked() const override; + virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const override; - virtual void ShowReference(const OUString& rStr) SAL_OVERRIDE; - virtual void HideReference( bool bDoneRefMode = true ) SAL_OVERRIDE; + virtual void ShowReference(const OUString& rStr) override; + virtual void HideReference( bool bDoneRefMode = true ) override; - virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; - virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; + virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) override; + virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) override; - virtual void ViewShellChanged() SAL_OVERRIDE; + virtual void ViewShellChanged() override; void SwitchToDocument(); - virtual void SetActive() SAL_OVERRIDE = 0; + virtual void SetActive() override = 0; public: bool EnterRefMode(); @@ -246,7 +246,7 @@ struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef > SC_MOD()->RegisterRefWindow( static_cast<sal_uInt16>( TDerived::SLOTID ), this ); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { SC_MOD()->UnregisterRefWindow( static_cast<sal_uInt16>( TDerived::SLOTID ), this ); ScRefHdlrImplBase<TBase, bBindRef >::disposeRefHandler(); diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index a66efcf57c39..e7eb5aaf6118 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -34,16 +34,16 @@ class ScPrintAreasDlg : public ScAnyRefDlg public: ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent ); virtual ~ScPrintAreasDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual void AddRefEntry() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void AddRefEntry() override; - virtual bool IsTableLocked() const SAL_OVERRIDE; + virtual bool IsTableLocked() const override; - virtual void SetActive() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void SetActive() override; + virtual void Deactivate() override; + virtual bool Close() override; private: VclPtr<ListBox> pLbPrintArea; diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 4dfe6130507a..2056c99806d4 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -35,7 +35,7 @@ public: virtual ~ScAttrDlg(); protected: - virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) override; private: DECL_LINK_TYPED( OkHandler, SfxPoolItem*, void ); // for closing by double clicking in TabPages diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 4f0b96a876df..bb4e067e7023 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -46,13 +46,13 @@ public: ScAutoFmtPreview(vcl::Window* pParent); void DetectRTL(ScViewData *pViewData); virtual ~ScAutoFmtPreview(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void NotifyChange( ScAutoFormatData* pNewData ); protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Resize() override; private: ScAutoFormatData* pCurData; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index d8b3f442e199..cc93b4d1a36b 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -48,15 +48,15 @@ public: explicit ScMenuFloatingWindow(vcl::Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel = 0); virtual ~ScMenuFloatingWindow(); - void dispose() SAL_OVERRIDE; + void dispose() override; - virtual void PopupModeEnd() SAL_OVERRIDE; - virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; + virtual void PopupModeEnd() override; + virtual void MouseMove(const MouseEvent& rMEvt) override; + virtual void MouseButtonDown(const MouseEvent& rMEvt) override; + virtual void MouseButtonUp(const MouseEvent& rMEvt) override; + virtual void KeyInput(const KeyEvent& rKEvt) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; void addMenuItem(const OUString& rText, bool bEnabled, Action* pAction); void addSeparator(); @@ -200,7 +200,7 @@ class ScCheckListBox : public SvTreeListBox ScCheckListBox( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~ScCheckListBox() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE { delete mpCheckButton; SvTreeListBox::dispose(); } + virtual void dispose() override { delete mpCheckButton; SvTreeListBox::dispose(); } void Init(); void CheckEntry( const OUString& sName, SvTreeListEntry* pParent, bool bCheck = true ); void CheckEntry( SvTreeListEntry* pEntry, bool bCheck = true ); @@ -209,7 +209,7 @@ class ScCheckListBox : public SvTreeListBox SvTreeListEntry* FindEntry( SvTreeListEntry* pParent, const OUString& sNode ); sal_uInt16 GetCheckedEntryCount() const; void ExpandChildren( SvTreeListEntry* pParent ); - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; }; /** * This class implements a popup window for field button, for quick access @@ -242,13 +242,13 @@ public: explicit ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc); virtual ~ScCheckListMenuWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) override; + virtual bool Notify(NotifyEvent& rNEvt) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual vcl::Window* GetPreferredKeyInputWindow() override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; void setMemberSize(size_t n); void addDateMember(const OUString& rName, double nVal, bool bVisible); @@ -277,7 +277,7 @@ public: void setPopupEndAction(Action* p); protected: - virtual void handlePopupEnd() SAL_OVERRIDE; + virtual void handlePopupEnd() override; private: struct Member @@ -297,9 +297,9 @@ private: public: CancelButton(ScCheckListMenuWindow* pParent); virtual ~CancelButton(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Click() SAL_OVERRIDE; + virtual void Click() override; private: VclPtr<ScCheckListMenuWindow> mpParent; diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index 6bfd7c1931c5..cb7a863eaab4 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -33,9 +33,9 @@ private: SdrModel* pModel; SdrGrafObj* pGrafEdit; - virtual void ObjectAreaChanged() SAL_OVERRIDE; - virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; - virtual void ViewChanged() SAL_OVERRIDE; + virtual void ObjectAreaChanged() override; + virtual void RequestNewObjectArea( Rectangle& ) override; + virtual void ViewChanged() override; public: ScClient( ScTabViewShell* pViewShell, vcl::Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ); diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index bac09680793e..95239429f072 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -58,7 +58,7 @@ private: public: ScDataBarSettingsDlg(vcl::Window* pParent, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos); virtual ~ScDataBarSettingsDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; ScDataBarFormatData* GetData(); }; diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index 308d75591789..a21e3575dcc3 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -37,23 +37,23 @@ public: ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); virtual ~ScColBar(); - virtual SCCOLROW GetPos() const SAL_OVERRIDE; - virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const SAL_OVERRIDE; - virtual OUString GetEntryText( SCCOLROW nEntryNo ) const SAL_OVERRIDE; + virtual SCCOLROW GetPos() const override; + virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const override; + virtual OUString GetEntryText( SCCOLROW nEntryNo ) const override; - virtual bool IsLayoutRTL() const SAL_OVERRIDE; + virtual bool IsLayoutRTL() const override; - virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ) SAL_OVERRIDE; - virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) SAL_OVERRIDE; + virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ) override; + virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) override; - virtual void SetMarking( bool bSet ) SAL_OVERRIDE; - virtual void SelectWindow() SAL_OVERRIDE; - virtual bool IsDisabled() const SAL_OVERRIDE; - virtual bool ResizeAllowed() const SAL_OVERRIDE; + virtual void SetMarking( bool bSet ) override; + virtual void SelectWindow() override; + virtual bool IsDisabled() const override; + virtual bool ResizeAllowed() const override; - virtual void DrawInvert( long nDragPos ) SAL_OVERRIDE; + virtual void DrawInvert( long nDragPos ) override; - virtual OUString GetDragHelp( long nVal ) SAL_OVERRIDE; + virtual OUString GetDragHelp( long nVal ) override; bool UseNumericHeader() const; }; @@ -69,24 +69,24 @@ public: ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); virtual ~ScRowBar(); - virtual SCCOLROW GetPos() const SAL_OVERRIDE; - virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const SAL_OVERRIDE; - virtual OUString GetEntryText( SCCOLROW nEntryNo ) const SAL_OVERRIDE; + virtual SCCOLROW GetPos() const override; + virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const override; + virtual OUString GetEntryText( SCCOLROW nEntryNo ) const override; - virtual bool IsMirrored() const SAL_OVERRIDE; - virtual SCROW GetHiddenCount( SCROW nEntryNo ) const SAL_OVERRIDE; + virtual bool IsMirrored() const override; + virtual SCROW GetHiddenCount( SCROW nEntryNo ) const override; - virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ) SAL_OVERRIDE; - virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) SAL_OVERRIDE; + virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ) override; + virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) override; - virtual void SetMarking( bool bSet ) SAL_OVERRIDE; - virtual void SelectWindow() SAL_OVERRIDE; - virtual bool IsDisabled() const SAL_OVERRIDE; - virtual bool ResizeAllowed() const SAL_OVERRIDE; + virtual void SetMarking( bool bSet ) override; + virtual void SelectWindow() override; + virtual bool IsDisabled() const override; + virtual bool ResizeAllowed() const override; - virtual void DrawInvert( long nDragPos ) SAL_OVERRIDE; + virtual void DrawInvert( long nDragPos ) override; - virtual OUString GetDragHelp( long nVal ) SAL_OVERRIDE; + virtual OUString GetDragHelp( long nVal ) override; }; #endif diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index affbeff01f61..be0eaadd0f86 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -74,14 +74,14 @@ private: public: ScCondFormatList(vcl::Window* pParent, WinBits nStyle); virtual ~ScCondFormatList(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); - virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; + virtual void Resize() override; ScConditionalFormat* GetConditionalFormat() const; void RecalcAll(); @@ -122,7 +122,7 @@ private: DECL_LINK( EdRangeModifyHdl, Edit* ); protected: - virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; + virtual void RefInputDone( bool bForced = false ) override; void OkPressed(); void CancelPressed(); @@ -132,18 +132,18 @@ public: const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType, bool bManaged); virtual ~ScCondFormatDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SC_DLLPUBLIC ScConditionalFormat* GetConditionalFormat() const; static OUString GenerateXmlString(sal_uInt32 nIndex, sal_uInt8 nType, bool bManaged); static bool ParseXmlString(const OUString& sXMLString, sal_uInt32& nIndex, sal_uInt8& nType, bool& bManaged); - virtual void SetReference(const ScRange&, ScDocument*) SAL_OVERRIDE; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool IsTableLocked() const SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void SetReference(const ScRange&, ScDocument*) override; + virtual bool IsRefInputMode() const override; + virtual void SetActive() override; + virtual bool IsTableLocked() const override; + virtual bool Close() override; void InvalidateRefData(); diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 8eebe484cf07..a5e672b977bb 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -65,9 +65,9 @@ protected: public: ScCondFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); virtual ~ScCondFrmtEntry(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; bool IsSelected() const { return mbActive;} void SetIndex(sal_Int32 nIndex); @@ -98,7 +98,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener ScFormatEntry* createConditionEntry() const; - virtual OUString GetExpressionString() SAL_OVERRIDE; + virtual OUString GetExpressionString() override; void Init(ScCondFormatDlg* pDialogParent); DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); DECL_LINK_TYPED( ConditionTypeSelectHdl, ListBox&, void ); @@ -112,23 +112,23 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener static sal_Int32 GetNumberEditFields( ScConditionMode eMode ); protected: - virtual void Select() SAL_OVERRIDE; - virtual void Deselect() SAL_OVERRIDE; + virtual void Select() override; + virtual void Deselect() override; public: ScConditionFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); virtual ~ScConditionFrmtEntry(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual void SetInactive() SAL_OVERRIDE; + virtual ScFormatEntry* GetEntry() const override; + virtual void SetActive() override; + virtual void SetInactive() override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; using ScCondFrmtEntry::Notify; - virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::CONDITION; } + virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::CONDITION; } }; class ScFormulaFrmtEntry : public ScCondFrmtEntry @@ -139,7 +139,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry VclPtr<formula::RefEdit> maEdFormula; ScFormatEntry* createFormulaEntry() const; - virtual OUString GetExpressionString() SAL_OVERRIDE; + virtual OUString GetExpressionString() override; void Init(ScCondFormatDlg* pDialogParent); DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); @@ -147,12 +147,12 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry public: ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* PDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); virtual ~ScFormulaFrmtEntry(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual void SetInactive() SAL_OVERRIDE; - virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::FORMULA; } + virtual ScFormatEntry* GetEntry() const override; + virtual void SetActive() override; + virtual void SetInactive() override; + virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::FORMULA; } }; class ScColorScale2FrmtEntry : public ScCondFrmtEntry @@ -173,18 +173,18 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - virtual OUString GetExpressionString() SAL_OVERRIDE; + virtual OUString GetExpressionString() override; void Init(); DECL_LINK_TYPED( EntryTypeHdl, ListBox&, void ); public: ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); virtual ~ScColorScale2FrmtEntry(); - virtual void dispose() SAL_OVERRIDE; - virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual void SetInactive() SAL_OVERRIDE; - virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::COLORSCALE2; } + virtual void dispose() override; + virtual ScFormatEntry* GetEntry() const override; + virtual void SetActive() override; + virtual void SetInactive() override; + virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::COLORSCALE2; } }; class ScColorScale3FrmtEntry : public ScCondFrmtEntry @@ -208,18 +208,18 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - virtual OUString GetExpressionString() SAL_OVERRIDE; + virtual OUString GetExpressionString() override; void Init(); DECL_LINK_TYPED( EntryTypeHdl, ListBox&, void ); public: ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); virtual ~ScColorScale3FrmtEntry(); - virtual void dispose() SAL_OVERRIDE; - virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual void SetInactive() SAL_OVERRIDE; - virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::COLORSCALE3; } + virtual void dispose() override; + virtual ScFormatEntry* GetEntry() const override; + virtual void SetActive() override; + virtual void SetInactive() override; + virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::COLORSCALE3; } }; class ScDataBarFrmtEntry : public ScCondFrmtEntry @@ -239,7 +239,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createDatabarEntry() const; - virtual OUString GetExpressionString() SAL_OVERRIDE; + virtual OUString GetExpressionString() override; void Init(); DECL_LINK_TYPED( OptionBtnHdl, Button*, void ); @@ -247,12 +247,12 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry public: ScDataBarFrmtEntry( vcl::Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL ); virtual ~ScDataBarFrmtEntry(); - virtual void dispose() SAL_OVERRIDE; - virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual void SetInactive() SAL_OVERRIDE; + virtual void dispose() override; + virtual ScFormatEntry* GetEntry() const override; + virtual void SetActive() override; + virtual void SetInactive() override; - virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::DATABAR; } + virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::DATABAR; } }; class ScDateFrmtEntry : public ScCondFrmtEntry, public SfxListener @@ -260,16 +260,16 @@ class ScDateFrmtEntry : public ScCondFrmtEntry, public SfxListener public: ScDateFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat = NULL ); virtual ~ScDateFrmtEntry(); - virtual void dispose() SAL_OVERRIDE; - virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual void SetInactive() SAL_OVERRIDE; - virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::DATE; } + virtual void dispose() override; + virtual ScFormatEntry* GetEntry() const override; + virtual void SetActive() override; + virtual void SetInactive() override; + virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::DATE; } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; using ScCondFrmtEntry::Notify; protected: - virtual OUString GetExpressionString() SAL_OVERRIDE; + virtual OUString GetExpressionString() override; private: void Init(); @@ -295,7 +295,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry typedef std::vector<VclPtr<ScIconSetFrmtDataEntry>> ScIconSetFrmtDataEntriesType; ScIconSetFrmtDataEntriesType maEntries; - virtual OUString GetExpressionString() SAL_OVERRIDE; + virtual OUString GetExpressionString() override; void Init(); @@ -304,11 +304,11 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry public: ScIconSetFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = NULL ); virtual ~ScIconSetFrmtEntry(); - virtual void dispose() SAL_OVERRIDE; - virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual void SetInactive() SAL_OVERRIDE; - virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::ICONSET; } + virtual void dispose() override; + virtual ScFormatEntry* GetEntry() const override; + virtual void SetActive() override; + virtual void SetInactive() override; + virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::ICONSET; } }; #endif diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index f581daf7eaa6..003746475f08 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -41,7 +41,7 @@ public: void DeleteSelection(); ScConditionalFormat* GetSelection(); - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; }; class ScCondFormatManagerDlg : public ModalDialog @@ -49,7 +49,7 @@ class ScCondFormatManagerDlg : public ModalDialog public: ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos); virtual ~ScCondFormatManagerDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; ScConditionalFormatList* GetConditionalFormatList(); diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx index 848eff35fa3f..e2c295059c76 100644 --- a/sc/source/ui/inc/condformatuno.hxx +++ b/sc/source/ui/inc/condformatuno.hxx @@ -56,23 +56,23 @@ public: virtual ~ScCondFormatsObj(); - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; // XConditionalFormats virtual sal_Int32 SAL_CALL createByRange(const uno::Reference<sheet::XSheetCellRanges>& xRanges) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByID( const sal_Int32 nID ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual uno::Sequence< uno::Reference< sheet::XConditionalFormat > > SAL_CALL getConditionalFormats() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getLength() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; ScConditionalFormatList* getCoreObject(); @@ -93,70 +93,70 @@ public: // XConditionalFormat virtual void SAL_CALL createEntry(const sal_Int32 nType, const sal_Int32 nPos) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex(const sal_Int32 nIndex) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XIndexAccess virtual uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; ScConditionalFormat* getCoreObject(); @@ -180,48 +180,48 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; private: ScDocShell* mpDocShell; @@ -240,7 +240,7 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; ScColorScaleFormat* getCoreObject(); @@ -248,43 +248,43 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -300,22 +300,22 @@ public: virtual ~ScColorScaleEntryObj(); virtual com::sun::star::util::Color SAL_CALL getColor() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setColor(com::sun::star::util::Color aColor) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType(sal_Int32 nType) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFormula() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula(const OUString& rString) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: ScColorScaleEntry* getCoreObject(); @@ -336,48 +336,48 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -393,16 +393,16 @@ public: virtual ~ScDataBarEntryObj(); virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType(sal_Int32 nType) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFormula() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula(const OUString& rString) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: ScColorScaleEntry* getCoreObject(); @@ -423,48 +423,48 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; private: rtl::Reference<ScCondFormatObj> mxParent; @@ -480,16 +480,16 @@ public: virtual ~ScIconSetEntryObj(); virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setType(sal_Int32 nType) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFormula() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFormula(const OUString& rString) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: ScColorScaleEntry* getCoreObject(); @@ -511,48 +511,48 @@ public: // XConditionEntry virtual sal_Int32 SAL_CALL getType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; private: rtl::Reference<ScCondFormatObj> mxParent; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 404a9fd69acb..2db668a50344 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -160,7 +160,7 @@ private: public: ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ); virtual ~ScConflictsDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void UpdateView(); }; diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 07ea7c215ff3..afbc2765a161 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -39,17 +39,17 @@ public: ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScConsolidateDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; - virtual bool IsRefInputMode() const SAL_OVERRIDE { return true; } - virtual void SetActive() SAL_OVERRIDE; + virtual bool IsRefInputMode() const override { return true; } + virtual void SetActive() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; protected: - virtual void Deactivate() SAL_OVERRIDE; + virtual void Deactivate() override; private: VclPtr<ListBox> pLbFunc; diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 8da6b700e994..9d28dfb31e25 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -108,28 +108,28 @@ protected: using SvTreeListBox::ExecuteDrop; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 nAction ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; + virtual void DragFinished( sal_Int8 nAction ) override; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void InitEntry(SvTreeListEntry*,const OUString&,const Image&,const Image&, SvLBoxButtonKind) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void InitEntry(SvTreeListEntry*,const OUString&,const Image&,const Image&, SvLBoxButtonKind) override; public: ScContentTree( vcl::Window* pParent, const ResId& rResId ); virtual ~ScContentTree(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString getAltLongDescText(SvTreeListEntry* pEntry, bool isAltText) const; - OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; - OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + OUString GetEntryAltText( SvTreeListEntry* pEntry ) const override; + OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const override; void ObjectFresh( ScContentId nType, SvTreeListEntry* pEntry = NULL); bool SetNavigatorDlgFlag(bool isInNavigatoeDlg){ return bisInNavigatoeDlg=isInNavigatoeDlg;}; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; void InitWindowBits( bool bButtons ); diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx index dbc8dcc34f4f..17dbf604c04f 100644 --- a/sc/source/ui/inc/corodlg.hxx +++ b/sc/source/ui/inc/corodlg.hxx @@ -38,7 +38,7 @@ public: m_pBtnRow->Check(bRow); } virtual ~ScColRowLabelDlg() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { m_pBtnRow.clear(); m_pBtnCol.clear(); diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index a3969d775612..e818d0707ed8 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -31,7 +31,7 @@ public: ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle, const OUString& rStrLabel, bool bColDefault = true); virtual ~ScColOrRowDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<VclFrame> m_pFrame; VclPtr<RadioButton> m_pBtnRows; diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 8eaeb59e8957..f4ab74404253 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -36,13 +36,13 @@ public: ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData ); virtual ~ScColRowNameRangesDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual bool IsRefInputMode() const override; + virtual void SetActive() override; + virtual bool Close() override; private: VclPtr<ListBox> pLbRange; diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index d62c899745ec..859b8f3217b1 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -240,12 +240,12 @@ public: explicit ScCsvControl( ScCsvControl& rParent ); explicit ScCsvControl( vcl::Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ); virtual ~ScCsvControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // event handling --------------------------------------------------------- - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() override; /** Sends a GetFocus or LoseFocus event to the accessibility object. */ void AccSendFocusEvent( bool bFocused ); @@ -379,7 +379,7 @@ public: public: /** Creates and returns the accessible object of this control. Do not overwrite in derived classes, use ImplCreateAccessible() instead. */ - virtual XAccessibleRef CreateAccessible() SAL_OVERRIDE; + virtual XAccessibleRef CreateAccessible() override; protected: /** Derived classes create a new accessible object here. */ diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 4dc3e0ea8002..aa8a62ef869d 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -109,7 +109,7 @@ private: public: explicit ScCsvGrid( ScCsvControl& rParent ); virtual ~ScCsvGrid(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** Finishes initialization. Must be called after constructing a new object. */ void Init(); @@ -258,22 +258,22 @@ public: // event handling --------------------------------------------------------- protected: - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; + virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ) override; // painting --------------------------------------------------------------- protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; public: /** Redraws the entire data grid. */ @@ -323,7 +323,7 @@ private: // accessibility ---------------------------------------------------------- protected: /** Creates a new accessible object. */ - virtual rtl::Reference<ScAccessibleCsvControl> ImplCreateAccessible() SAL_OVERRIDE; + virtual rtl::Reference<ScAccessibleCsvControl> ImplCreateAccessible() override; }; #endif diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index ab2fb01c997f..83cb449a5251 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -55,7 +55,7 @@ private: public: explicit ScCsvRuler( ScCsvControl& rParent ); virtual ~ScCsvRuler(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // common ruler handling -------------------------------------------------- public: @@ -63,7 +63,7 @@ public: virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, - PosSizeFlags nFlags = PosSizeFlags::All ) SAL_OVERRIDE; + PosSizeFlags nFlags = PosSizeFlags::All ) override; /** Apply current layout data to the ruler. */ void ApplyLayout( const ScCsvLayoutData& rOldData ); @@ -119,16 +119,16 @@ private: // event handling --------------------------------------------------------- protected: - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; private: /** Starts tracking at the specified position. */ @@ -141,7 +141,7 @@ private: // painting --------------------------------------------------------------- protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; public: /** Redraws the entire ruler. */ @@ -176,7 +176,7 @@ private: // accessibility ---------------------------------------------------------- protected: /** Creates a new accessible object. */ - virtual rtl::Reference<ScAccessibleCsvControl> ImplCreateAccessible() SAL_OVERRIDE; + virtual rtl::Reference<ScAccessibleCsvControl> ImplCreateAccessible() override; }; #endif diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 2703ebf76eb7..8a775b9f8072 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -64,7 +64,7 @@ private: public: explicit ScCsvTableBox( vcl::Window* pParent, WinBits nBits ); virtual ~ScCsvTableBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** Finishes initialization. Must be called after constructing a new object. */ void Init(); @@ -118,9 +118,9 @@ public: inline void SetColTypeHdl( const Link<ScCsvTableBox&,void>& rHdl ) { maColTypeHdl = rHdl; } protected: - virtual void Resize() SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual Size GetOptimalSize() const override; private: DECL_DLLPRIVATE_LINK_TYPED( CsvCmdHdl, ScCsvControl&, void ); @@ -130,11 +130,11 @@ private: // accessibility ---------------------------------------------------------- public: /** Creates and returns the accessible object of this control. */ - virtual XAccessibleRef CreateAccessible() SAL_OVERRIDE; + virtual XAccessibleRef CreateAccessible() override; protected: /** Creates a new accessible object. */ - virtual rtl::Reference<ScAccessibleCsvControl> ImplCreateAccessible() SAL_OVERRIDE; + virtual rtl::Reference<ScAccessibleCsvControl> ImplCreateAccessible() override; }; #endif diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index 3ddb187edcbb..84fc011ebaa2 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -41,7 +41,7 @@ private: public: ScDataPilotDatabaseDlg(vcl::Window* pParent); virtual ~ScDataPilotDatabaseDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GetValues( ScImportSourceDesc& rDesc ); }; diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 2d5047c75bc4..d0a424767747 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -39,7 +39,7 @@ private: public: ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal); virtual ~ScDataPilotSourceTypeDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsDatabase() const; bool IsExternal() const; bool IsNamedRange() const; @@ -63,7 +63,7 @@ public: ScDataPilotServiceDlg( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices ); virtual ~ScDataPilotServiceDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetServiceName() const; OUString GetParSource() const; diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 17a95aa251a7..8de53cd4ff99 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -55,7 +55,7 @@ private: public: ScDataFormDlg( vcl::Window* pParent, ScTabViewShell* pTabViewShell); virtual ~ScDataFormDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void FillCtrls(SCROW nCurrentRow); private: diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index a81dbd18ed5b..979b0d954a14 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -56,7 +56,7 @@ class DataStreamDlg : public ModalDialog public: DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent); virtual ~DataStreamDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Init( const DataStream& rStrm ); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 3476cd18caf4..96756c891717 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -38,13 +38,13 @@ public: ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData ); virtual ~ScDbNameDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual bool IsRefInputMode() const override; + virtual void SetActive() override; + virtual bool Close() override; private: VclPtr<ComboBox> m_pEdName; diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index 676d93b242cc..fa2d02ee5599 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.hxx @@ -37,7 +37,7 @@ private: public: ScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false); virtual ~ScDeleteCellDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DelCellCmd GetDelCellCmd() const; }; diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index ea1bf0cbd2ab..2af0af3ba64d 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -49,7 +49,7 @@ public: ScDeleteContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE ); virtual ~ScDeleteContentsDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void DisableObjects(); InsertDeleteFlags GetDelContentsCmdBits() const; diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 9ae154bdc4d0..824178fab8d6 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -159,7 +159,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener protected: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; public: TYPEINFO_OVERRIDE(); @@ -180,7 +180,7 @@ public: #endif virtual ::svl::IUndoManager* - GetUndoManager() SAL_OVERRIDE; + GetUndoManager() override; virtual void FillClass( SvGlobalName * pClassName, SotClipboardFormatId * pFormat, @@ -188,43 +188,43 @@ public: OUString * pFullTypeName, OUString * pShortTypeName, sal_Int32 nFileFormat, - bool bTemplate = false ) const SAL_OVERRIDE; - - virtual std::set<Color> GetDocColors() SAL_OVERRIDE; - - virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) SAL_OVERRIDE; - virtual bool Load( SfxMedium& rMedium ) SAL_OVERRIDE; - virtual bool LoadFrom( SfxMedium& rMedium ) SAL_OVERRIDE; - virtual bool ConvertFrom( SfxMedium &rMedium ) SAL_OVERRIDE; - virtual bool LoadExternal( SfxMedium& rMedium ) SAL_OVERRIDE; - virtual bool Save() SAL_OVERRIDE; - virtual bool SaveAs( SfxMedium& rMedium ) SAL_OVERRIDE; - virtual bool ConvertTo( SfxMedium &rMedium ) SAL_OVERRIDE; - virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; - virtual void PrepareReload() SAL_OVERRIDE; - virtual bool IsInformationLost() SAL_OVERRIDE; - virtual void LoadStyles( SfxObjectShell &rSource ) SAL_OVERRIDE; - - virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) SAL_OVERRIDE; // SfxInPlaceObject - virtual bool DoSaveCompleted( SfxMedium * pNewStor) SAL_OVERRIDE; // SfxObjectShell - virtual bool QuerySlotExecutable( sal_uInt16 nSlotId ) SAL_OVERRIDE; + bool bTemplate = false ) const override; + + virtual std::set<Color> GetDocColors() override; + + virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) override; + virtual bool Load( SfxMedium& rMedium ) override; + virtual bool LoadFrom( SfxMedium& rMedium ) override; + virtual bool ConvertFrom( SfxMedium &rMedium ) override; + virtual bool LoadExternal( SfxMedium& rMedium ) override; + virtual bool Save() override; + virtual bool SaveAs( SfxMedium& rMedium ) override; + virtual bool ConvertTo( SfxMedium &rMedium ) override; + virtual bool PrepareClose( bool bUI = true ) override; + virtual void PrepareReload() override; + virtual bool IsInformationLost() override; + virtual void LoadStyles( SfxObjectShell &rSource ) override; + + virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) override; // SfxInPlaceObject + virtual bool DoSaveCompleted( SfxMedium * pNewStor) override; // SfxObjectShell + virtual bool QuerySlotExecutable( sal_uInt16 nSlotId ) override; virtual void Draw( OutputDevice *, const JobSetup & rSetup, - sal_uInt16 nAspect = ASPECT_CONTENT ) SAL_OVERRIDE; + sal_uInt16 nAspect = ASPECT_CONTENT ) override; - virtual void SetVisArea( const Rectangle & rVisArea ) SAL_OVERRIDE; + virtual void SetVisArea( const Rectangle & rVisArea ) override; using SfxObjectShell::GetVisArea; - virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const SAL_OVERRIDE; + virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const override; - virtual Printer* GetDocumentPrinter() SAL_OVERRIDE; + virtual Printer* GetDocumentPrinter() override; - virtual void SetModified( bool = true ) SAL_OVERRIDE; + virtual void SetModified( bool = true ) override; void SetVisAreaOrSize( const Rectangle& rVisArea, bool bModifyStart ); virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( vcl::Window *pParent, - const SfxItemSet &rSet ) SAL_OVERRIDE; + const SfxItemSet &rSet ) override; void GetDocStat( ScDocStat& rDocStat ); @@ -306,13 +306,13 @@ public: ScDBData* GetOldAutoDBRange(); // has to be deleted by caller! void CancelAutoDBRange(); // called when dialog is cancelled - virtual void ReconnectDdeLink(SfxObjectShell& rServer) SAL_OVERRIDE; - void UpdateLinks() SAL_OVERRIDE; + virtual void ReconnectDdeLink(SfxObjectShell& rServer) override; + void UpdateLinks() override; bool ReloadTabLinks(); void SetFormulaOptions( const ScFormulaOptions& rOpt, bool bForLoading = false ); void SetCalcConfig( const ScCalcConfig& rConfig ); - virtual void CheckConfigOptions() SAL_OVERRIDE; + virtual void CheckConfigOptions() override; void PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ); @@ -347,7 +347,7 @@ public: DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); - virtual SfxStyleSheetBasePool* GetStyleSheetPool() SAL_OVERRIDE; + virtual SfxStyleSheetBasePool* GetStyleSheetPool() override; void SetInplace( bool bInplace ); bool IsEmpty() const { return bIsEmpty; } @@ -365,12 +365,12 @@ public: #if defined WNT virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; + ::com::sun::star::uno::Any & rValue ) override; virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; + const ::com::sun::star::uno::Any & rValue ) override; #endif - virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) SAL_OVERRIDE; + virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) override; const OUString& GetDdeTextFmt() const { return aDdeTextFmt; } @@ -408,7 +408,7 @@ public: void BeforeXMLLoading(); void AfterXMLLoading(bool bRet); - virtual HiddenInformation GetHiddenInformationState( HiddenInformation nStates ) SAL_OVERRIDE; + virtual HiddenInformation GetHiddenInformationState( HiddenInformation nStates ) override; const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be null void SetSolverSaveData( const ScOptSolverSave& rData ); @@ -418,16 +418,16 @@ public: // password protection for Calc (derived from SfxObjectShell) // see also: FID_CHG_RECORD, SID_CHG_PROTECT - virtual bool IsChangeRecording() const SAL_OVERRIDE; - virtual bool HasChangeRecordProtection() const SAL_OVERRIDE; - virtual void SetChangeRecording( bool bActivate ) SAL_OVERRIDE; - virtual bool SetProtectionPassword( const OUString &rPassword ) SAL_OVERRIDE; - virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) SAL_OVERRIDE; + virtual bool IsChangeRecording() const override; + virtual bool HasChangeRecordProtection() const override; + virtual void SetChangeRecording( bool bActivate ) override; + virtual bool SetProtectionPassword( const OUString &rPassword ) override; + virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) override; void SnapVisArea( Rectangle& rRect ) const; - virtual void libreOfficeKitCallback(int nType, const char* pPayload) const SAL_OVERRIDE; - virtual bool isTiledRendering() const SAL_OVERRIDE; + virtual void libreOfficeKitCallback(int nType, const char* pPayload) const override; + virtual bool isTiledRendering() const override; }; void UpdateAcceptChangesDialog(); diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 8b35371f734e..48b40ad176c5 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -63,8 +63,8 @@ public: virtual ~ScDPNumGroupEditHelper() {} private: - virtual bool ImplGetValue( double& rfValue ) const SAL_OVERRIDE; - virtual void ImplSetValue( double fValue ) SAL_OVERRIDE; + virtual bool ImplGetValue( double& rfValue ) const override; + virtual void ImplSetValue( double fValue ) override; private: VclPtr<ScDoubleField> mpEdValue; @@ -80,8 +80,8 @@ public: virtual ~ScDPDateGroupEditHelper() {} private: - virtual bool ImplGetValue( double& rfValue ) const SAL_OVERRIDE; - virtual void ImplSetValue( double fValue ) SAL_OVERRIDE; + virtual bool ImplGetValue( double& rfValue ) const override; + virtual void ImplSetValue( double fValue ) override; private: VclPtr<DateField> mpEdValue; @@ -93,7 +93,7 @@ class ScDPNumGroupDlg : public ModalDialog public: explicit ScDPNumGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo ); virtual ~ScDPNumGroupDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; ScDPNumGroupInfo GetGroupInfo() const; private: @@ -114,7 +114,7 @@ public: explicit ScDPDateGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ); virtual ~ScDPDateGroupDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; ScDPNumGroupInfo GetGroupInfo() const; sal_Int32 GetDatePart() const; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index e32652c95664..1e183b8080b7 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -44,7 +44,7 @@ class ScDrawShell : public SfxShell void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ); protected: - virtual void Activate(bool bMDI) SAL_OVERRIDE; + virtual void Activate(bool bMDI) override; ScViewData* GetViewData() { return pViewData; } public: diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 85afb05f505f..3828c1b064ef 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -46,28 +46,28 @@ class ScDrawView: public FmFormView void Construct(); protected: - virtual void ModelHasChanged() SAL_OVERRIDE; + virtual void ModelHasChanged() override; // add custom handles (used by other apps, e.g. AnchorPos) - virtual void AddCustomHdl() SAL_OVERRIDE; + virtual void AddCustomHdl() override; void ImplClearCalcDropMarker(); // support enhanced text edit for draw objects - virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const SAL_OVERRIDE; + virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const override; public: ScDrawView( OutputDevice* pOut, ScViewData* pData ); virtual ~ScDrawView(); - virtual void MarkListHasChanged() SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void MarkListHasChanged() override; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; + virtual void DoConnect(SdrOle2Obj* pOleObj) override; - virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE; + virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) override; - virtual void DeleteMarked() SAL_OVERRIDE; + virtual void DeleteMarked() override; virtual bool SdrBeginTextEdit( SdrObject* pObj, @@ -78,9 +78,9 @@ public: OutlinerView* pGivenOutlinerView = 0L, bool bDontDeleteOutliner = false, bool bOnlyOneView = false, - bool bGrabFocus = true) SAL_OVERRIDE; + bool bGrabFocus = true) override; - virtual SdrEndTextEditKind SdrEndTextEdit( bool bDontDeleteReally = false ) SAL_OVERRIDE; + virtual SdrEndTextEditKind SdrEndTextEdit( bool bDontDeleteReally = false ) override; void MarkDropObj( SdrObject* pObj ); diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 2e93659711e9..70e6b4634831 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -74,12 +74,12 @@ public: const TransferableObjectDescriptor& rDesc ); virtual ~ScDrawTransferObj(); - virtual void AddSupportedFormats() SAL_OVERRIDE; - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; + virtual void AddSupportedFormats() override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, - const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; - virtual void ObjectReleased() SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; + const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) override; + virtual void ObjectReleased() override; + virtual void DragFinished( sal_Int8 nDropAction ) override; SdrModel* GetModel() { return pModel; } @@ -95,7 +95,7 @@ public: sal_uInt16 GetDragSourceFlags() const { return nDragSourceFlags; } static ScDrawTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); - virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); const ScRangeListVector& GetProtectedChartRangesVector() const { return m_aProtectedChartRangesVector; } diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 988e8aea7e82..4560fe243d03 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -89,15 +89,15 @@ private: protected: - virtual bool Close() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual bool Close() override; + virtual void Resize() override; + virtual void Resizing( Size& rSize ) override; void SetSize(); - virtual void ToggleFloatingMode() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void ToggleFloatingMode() override; + virtual void StateChanged( StateChangedType nStateChange ) override; virtual SfxChildAlignment CheckAlignment(SfxChildAlignment, - SfxChildAlignment eAlign) SAL_OVERRIDE; + SfxChildAlignment eAlign) override; public: ScFunctionDockWin( SfxBindings* pBindings, @@ -106,15 +106,15 @@ public: const ResId& rResId ); virtual ~ScFunctionDockWin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using SfxDockingWindow::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void InitLRUList(); void Initialize (SfxChildWinInfo* pInfo); - virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; + virtual void FillInfo(SfxChildWinInfo&) const override; }; #endif diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 00d5e0f2c874..231f298ceb43 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -43,7 +43,7 @@ public: double fMax, sal_uInt16 nPossDir ); virtual ~ScFillSeriesDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; FillDir GetFillDir() const { return theFillDir; } FillCmd GetFillCmd() const { return theFillCmd; } diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index a7c22e073e09..0f0c0bcd560b 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -55,14 +55,14 @@ public: ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScFilterDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; + virtual bool IsRefInputMode() const override; + virtual void SetActive() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; void SliderMoved(); size_t GetSliderPos(); void RefreshEditRow( size_t nOffset ); @@ -162,14 +162,14 @@ public: ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScSpecialFilterDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; + virtual bool IsRefInputMode() const override; + virtual void SetActive() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; private: VclPtr<ListBox> pLbFilterArea; diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index a87ec89872c2..6b324498e070 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.hxx @@ -36,7 +36,7 @@ public: void SetInputHandler(ScInputHandler* pHdl) { pInputHandler=pHdl;} void SetDocShell(ScDocShell* pSds) { pScDocShell=pSds;} - virtual void SaveValues() SAL_OVERRIDE; + virtual void SaveValues() override; private: ScFormEditData( const ScFormEditData& ); diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 62f9c511253f..1b2b5fd736a7 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -53,53 +53,53 @@ public: ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* pViewData ,formula::IFunctionManager* _pFunctionMgr); virtual ~ScFormulaDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // IFormulaEditorHelper - virtual void notifyChange() SAL_OVERRIDE; - virtual void fill() SAL_OVERRIDE; - virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult) SAL_OVERRIDE; - virtual void doClose(bool _bOk) SAL_OVERRIDE; - virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc) SAL_OVERRIDE; - virtual void showReference(const OUString& _sFormula) SAL_OVERRIDE; - virtual void dispatch(bool _bOK, bool _bMatrixChecked) SAL_OVERRIDE; - virtual void setDispatcherLock( bool bLock ) SAL_OVERRIDE; - virtual void setReferenceInput(const formula::FormEditData* _pData) SAL_OVERRIDE; - virtual void deleteFormData() SAL_OVERRIDE; - virtual void clear() SAL_OVERRIDE; - virtual void switchBack() SAL_OVERRIDE; - virtual formula::FormEditData* getFormEditData() const SAL_OVERRIDE; - virtual void setCurrentFormula(const OUString& _sReplacement) SAL_OVERRIDE; - virtual void setSelection(sal_Int32 _nStart, sal_Int32 _nEnd) SAL_OVERRIDE; - virtual void getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const SAL_OVERRIDE; - virtual OUString getCurrentFormula() const SAL_OVERRIDE; - - virtual formula::IFunctionManager* getFunctionManager() SAL_OVERRIDE; - virtual ::std::unique_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const SAL_OVERRIDE; - virtual ::com::sun::star::table::CellAddress getReferencePosition() const SAL_OVERRIDE; - - virtual bool Close() SAL_OVERRIDE; + virtual void notifyChange() override; + virtual void fill() override; + virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult) override; + virtual void doClose(bool _bOk) override; + virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc) override; + virtual void showReference(const OUString& _sFormula) override; + virtual void dispatch(bool _bOK, bool _bMatrixChecked) override; + virtual void setDispatcherLock( bool bLock ) override; + virtual void setReferenceInput(const formula::FormEditData* _pData) override; + virtual void deleteFormData() override; + virtual void clear() override; + virtual void switchBack() override; + virtual formula::FormEditData* getFormEditData() const override; + virtual void setCurrentFormula(const OUString& _sReplacement) override; + virtual void setSelection(sal_Int32 _nStart, sal_Int32 _nEnd) override; + virtual void getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const override; + virtual OUString getCurrentFormula() const override; + + virtual formula::IFunctionManager* getFunctionManager() override; + virtual ::std::unique_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const override; + virtual ::com::sun::star::table::CellAddress getReferencePosition() const override; + + virtual bool Close() override; // sc::IAnyRefDialog - virtual void ShowReference(const OUString& _sRef) SAL_OVERRIDE; - virtual void HideReference( bool bDoneRefMode = true ) SAL_OVERRIDE; - virtual void SetReference( const ScRange& rRef, ScDocument* pD ) SAL_OVERRIDE; - - virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; - virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; - virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; - virtual bool IsTableLocked() const SAL_OVERRIDE; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - - virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const SAL_OVERRIDE; - virtual void AddRefEntry() SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual void ViewShellChanged() SAL_OVERRIDE; + virtual void ShowReference(const OUString& _sRef) override; + virtual void HideReference( bool bDoneRefMode = true ) override; + virtual void SetReference( const ScRange& rRef, ScDocument* pD ) override; + + virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) override; + virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) override; + virtual void RefInputDone( bool bForced = false ) override; + virtual bool IsTableLocked() const override; + virtual bool IsRefInputMode() const override; + + virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const override; + virtual void AddRefEntry() override; + virtual void SetActive() override; + virtual void ViewShellChanged() override; protected: - virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; + virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) override; static void SaveLRUEntry(const ScFuncDesc* pFuncDesc); static bool IsInputHdl(ScInputHandler* pHdl); diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index 201d3ec92efa..07ce623639eb 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -31,16 +31,16 @@ class FuConstArc : public FuConstruct virtual ~FuConstArc(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) override; }; #endif // _SD_FUCONARC_HXX diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 1eed3b80d92c..0e722e44600f 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -34,19 +34,19 @@ public: virtual ~FuConstCustomShape(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject( const sal_uInt16 nID, const Rectangle& rRectangle ) SAL_OVERRIDE; + virtual SdrObject* CreateDefaultObject( const sal_uInt16 nID, const Rectangle& rRectangle ) override; // #i33136# - virtual bool doConstructOrthogonal() const SAL_OVERRIDE; + virtual bool doConstructOrthogonal() const override; }; #endif diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index da876f253939..edf616b567de 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -31,16 +31,16 @@ class FuConstPolygon : public FuConstruct virtual ~FuConstPolygon(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) override; }; #endif // _FUCONPOL_HXX diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index 7f65782e7d57..7614a260d894 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -31,16 +31,16 @@ class FuConstRectangle : public FuConstruct virtual ~FuConstRectangle(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) override; }; #endif // _SD_FUCONREC_HXX diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 2acbc8c58d30..736477e35b60 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -31,16 +31,16 @@ class FuConstruct : public FuDraw virtual ~FuConstruct(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_uInt8 Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; + virtual sal_uInt8 Command(const CommandEvent& rCEvt) override; bool SimpleMouseButtonUp(const MouseEvent& rMEvt); - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; // Returns grid sync offset for rInOutPos, additionally adjusts rInOutPos // by the offset diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 69884c55f0ad..7369f0d7a8cd 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -35,16 +35,16 @@ public: virtual ~FuConstUnoControl(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) override; }; #endif // _SD_FUCONCTL_HXX diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 1a0b1da909a9..2272ccf38baf 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -35,16 +35,16 @@ class FuDraw : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuDraw(); - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; virtual void ForcePointer(const MouseEvent* pMEvt); - virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; bool IsEditingANote() const; bool IsSizingOrMovingNote( const MouseEvent& rMEvt ) const; diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index f6b8f7d4f969..f266d0f29994 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -30,8 +30,8 @@ class FuInsertGraphic : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertGraphic(); - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; }; class FuInsertOLE : public FuPoor @@ -40,8 +40,8 @@ class FuInsertOLE : public FuPoor FuInsertOLE( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; }; class FuInsertChart : public FuPoor @@ -50,8 +50,8 @@ class FuInsertChart : public FuPoor FuInsertChart( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; }; class FuInsertChartFromFile : public FuPoor @@ -60,8 +60,8 @@ class FuInsertChartFromFile : public FuPoor FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq, const OUString& rURL); - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; }; class FuInsertMedia : public FuPoor @@ -71,8 +71,8 @@ class FuInsertMedia : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertMedia(); - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; }; void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage ); diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index 5009f1b60c5b..c70fec09003f 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -33,14 +33,14 @@ public: virtual ~FuSelection(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_uInt8 Command(const CommandEvent& rCEvt) SAL_OVERRIDE; - - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; + virtual sal_uInt8 Command(const CommandEvent& rCEvt) override; + + virtual void Activate() override; + virtual void Deactivate() override; void ActivateNoteHandles(SdrObject* pObj); diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index 81ce747eb48f..8e5879aad94c 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -38,22 +38,22 @@ public: virtual ~FuText(); - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; + virtual bool MouseMove(const MouseEvent& rMEvt) override; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; - virtual void ForcePointer(const MouseEvent* pMEvt) SAL_OVERRIDE; + virtual void ForcePointer(const MouseEvent* pMEvt) override; void SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL, bool bCursorToEnd = false, const KeyEvent* pInitialKey = NULL ); void StopEditMode(bool bTextDirection = false); // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) override; private: SdrOutliner* MakeOutliner(); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 689b8d5c8e2b..c99f2ddafa5b 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -292,37 +292,37 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou void GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ); protected: - virtual void PrePaint(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void PrePaint(vcl::RenderContext& rRenderContext) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; - virtual void RequestHelp( const HelpEvent& rEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; public: enum AutoFilterMode { Normal, Top10, Custom, Empty, NonEmpty, SortAscending, SortDescending }; ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ); virtual ~ScGridWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) override; // #i70788# flush and get overlay rtl::Reference<sdr::overlay::OverlayManager> getOverlayManager(); void flushOverlayManager(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; void PaintTile( VirtualDevice& rDevice, int nOutputWidth, int nOutputHeight, @@ -330,7 +330,7 @@ public: long nTileWidth, long nTileHeight ); /// @see OutputDevice::LogicInvalidate(). - void LogicInvalidate(const Rectangle* pRectangle) SAL_OVERRIDE; + void LogicInvalidate(const Rectangle* pRectangle) override; /// Update the cell selection according to what handles have been dragged. /// @see vcl::ITiledRenderable::setTextSelection() for the values of nType. @@ -339,7 +339,7 @@ public: /// Get the cell selection, coordinates are in logic units. void GetCellSelection(std::vector<Rectangle>& rLogicRects); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; void FakeButtonUp(); diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 2fdee6c08855..2677a149840e 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.hxx @@ -29,7 +29,7 @@ class ScGroupDlg : public ModalDialog public: ScGroupDlg(vcl::Window* pParent, bool bUnGroup = false, bool bRows = true); virtual ~ScGroupDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool GetColsChecked() const; private: diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index 2fd02e59a116..775ebd510341 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -69,14 +69,14 @@ private: protected: // Window overrides - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; // new methods @@ -98,7 +98,7 @@ protected: virtual OUString GetDragHelp( long nVal ); virtual void DrawInvert( long nDragPos ); - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; public: ScHeaderControl( vcl::Window* pParent, SelectionEngine* pSelectionEngine, diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index 64887a9e25c9..dfacb8e37031 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -33,7 +33,7 @@ protected: const SfxItemSet& rCoreSet, const OUString& rPageStyle, const OUString& rID, const OUString& rUIXMLDescription ); public: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) override; }; class ScHFEditHeaderDlg : public ScHFEditDlg diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index d9140ffa0f2c..1b9220a8e5a0 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -66,19 +66,19 @@ private: protected: - virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; + virtual void RefInputDone( bool bForced = false ) override; public: ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData); virtual ~ScHighlightChgDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetActive() SAL_OVERRIDE; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; - virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetActive() override; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual bool Close() override; + virtual bool IsRefInputMode() const override; }; diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx index 4b8d2d685c85..801a7b166e5a 100644 --- a/sc/source/ui/inc/hintwin.hxx +++ b/sc/source/ui/inc/hintwin.hxx @@ -33,7 +33,7 @@ private: vcl::Font aHeadFont; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; public: ScHintWindow( vcl::Window* pParent, const OUString& rTit, const OUString& rMsg ); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index d1fb1a2f221e..27192c58194b 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -62,48 +62,48 @@ class ScTextWnd : public ScTextWndBase, public DragSourceHelper // edit wind public: ScTextWnd( vcl::Window* pParent, ScTabViewShell* pViewSh ); virtual ~ScTextWnd(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetTextString( const OUString& rString ) SAL_OVERRIDE; - virtual const OUString& GetTextString() const SAL_OVERRIDE; + virtual void SetTextString( const OUString& rString ) override; + virtual const OUString& GetTextString() const override; - bool IsInputActive() SAL_OVERRIDE; - virtual EditView* GetEditView() SAL_OVERRIDE; + bool IsInputActive() override; + virtual EditView* GetEditView() override; // for function autopilots - virtual void MakeDialogEditView() SAL_OVERRIDE; + virtual void MakeDialogEditView() override; - virtual void StartEditEngine() SAL_OVERRIDE; - virtual void StopEditEngine( bool bAll ) SAL_OVERRIDE; + virtual void StartEditEngine() override; + virtual void StopEditEngine( bool bAll ) override; - virtual void TextGrabFocus() SAL_OVERRIDE; + virtual void TextGrabFocus() override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void SetFormulaMode( bool bSet ) SAL_OVERRIDE; + virtual void SetFormulaMode( bool bSet ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; - virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; - virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; + virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) override; + virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) override; DECL_LINK_TYPED( NotifyHdl, LinkParamNone*, void ); protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void KeyInput(const KeyEvent& rKEvt) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; - virtual OUString GetText() const SAL_OVERRIDE; + virtual OUString GetText() const override; void ImplInitSettings(); void UpdateAutoCorrFlag(); @@ -140,18 +140,18 @@ private: public: ScPosWnd( vcl::Window* pParent ); virtual ~ScPosWnd(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetPos( const OUString& rPosStr ); // Displayed Text void SetFormulaMode( bool bSet ); protected: - virtual void Select() SAL_OVERRIDE; - virtual void Modify() SAL_OVERRIDE; + virtual void Select() override; + virtual void Modify() override; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; private: void FillRangeNames(); @@ -169,15 +169,15 @@ class ScMultiTextWnd : public ScTextWnd public: ScMultiTextWnd( ScInputBarGroup* pParent, ScTabViewShell* pViewSh ); virtual ~ScMultiTextWnd(); - virtual void StartEditEngine() SAL_OVERRIDE; - virtual void StopEditEngine( bool bAll ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual EditView* GetEditView() SAL_OVERRIDE; + virtual void StartEditEngine() override; + virtual void StopEditEngine( bool bAll ) override; + virtual void Resize() override; + virtual EditView* GetEditView() override; long GetPixelHeightForLines( long nLines ); long GetEditEngTxtHeight(); void DoScroll(); - virtual void SetTextString( const OUString& rString ) SAL_OVERRIDE; + virtual void SetTextString( const OUString& rString ) override; void SetNumLines( long nLines ); long GetNumLines() { return mnLines; } long GetLastNumExpandedLines() { return mnLastExpandedLines; } @@ -185,7 +185,7 @@ protected: void SetScrollBarRange(); void InitEditEngine(); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); DECL_LINK_TYPED( ModifyHdl, LinkParamNone*, void ); private: @@ -202,19 +202,19 @@ class ScInputBarGroup : public ScTextWndBase public: ScInputBarGroup( vcl::Window* Parent, ScTabViewShell* pViewSh ); virtual ~ScInputBarGroup(); - virtual void dispose() SAL_OVERRIDE; - virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; - virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; - void SetTextString( const OUString& rString ) SAL_OVERRIDE; - void StartEditEngine() SAL_OVERRIDE; - EditView* GetEditView() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual const OUString& GetTextString() const SAL_OVERRIDE; - virtual void StopEditEngine( bool bAll ) SAL_OVERRIDE; - virtual void TextGrabFocus() SAL_OVERRIDE; - void SetFormulaMode( bool bSet ) SAL_OVERRIDE; - void MakeDialogEditView() SAL_OVERRIDE; - bool IsInputActive() SAL_OVERRIDE; + virtual void dispose() override; + virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) override; + virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) override; + void SetTextString( const OUString& rString ) override; + void StartEditEngine() override; + EditView* GetEditView() override; + virtual void Resize() override; + virtual const OUString& GetTextString() const override; + virtual void StopEditEngine( bool bAll ) override; + virtual void TextGrabFocus() override; + void SetFormulaMode( bool bSet ) override; + void MakeDialogEditView() override; + bool IsInputActive() override; ScrollBar& GetScrollBar() { return *aScrollBar.get(); } void IncrementVerticalSize(); void DecrementVerticalSize(); @@ -236,11 +236,11 @@ class ScInputWindow : public ToolBox // Parent toolbox public: ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ); virtual ~ScInputWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void Select() SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void Select() override; void SetFuncString( const OUString& rString, bool bDoEdit = true ); void SetPosString( const OUString& rStr ); @@ -270,15 +270,15 @@ public: ScInputHandler* GetInputHandler(){ return pInputHdl;} - void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; bool IsMultiLineInput() { return mbIsMultiLine; } protected: - virtual void SetText( const OUString& rString ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; + virtual void SetText( const OUString& rString ) override; + virtual OUString GetText() const override; static bool UseSubTotal( ScRangeList* pRangeList ); bool IsPointerAtResizePos(); diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index e89d68d9bdb3..aaa6aeee40f7 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -37,7 +37,7 @@ private: public: ScInsertCellDlg( vcl::Window* pParent,bool bDisallowCellMove = false ); virtual ~ScInsertCellDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; InsCellCmd GetInsCellCmd() const; }; diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index a36994dfdd8b..8ff69c9778a3 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -34,7 +34,7 @@ public: InsertDeleteFlags nCheckDefaults = IDF_NONE, const OUString* pStrTitle = NULL ); virtual ~ScInsertContentsDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; InsertDeleteFlags GetInsContentsCmdBits() const; ScPasteFunc GetFormulaCmdBits() const; diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 13ad0f9ca4ac..b797819a1b50 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -44,9 +44,9 @@ class ScInsertTableDlg : public ModalDialog public: ScInsertTableDlg( vcl::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile ); virtual ~ScInsertTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual short Execute() SAL_OVERRIDE; // override to set parent dialog + virtual short Execute() override; // override to set parent dialog bool GetTablesFromFile() const { return m_pBtnFromFile->IsChecked(); } bool GetTablesAsLink() const { return m_pBtnLink->IsChecked(); } diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index a8fce90b00b8..0f73519468d8 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -37,7 +37,7 @@ private: public: ScSelEntryDlg(vcl::Window* pParent, const std::vector<OUString> &rEntryList); virtual ~ScSelEntryDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetSelectEntry() const; }; diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 8204e7980795..5f771c415a0a 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -64,13 +64,13 @@ private: public: ScLinkedAreaDlg( vcl::Window* pParent ); virtual ~ScLinkedAreaDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void InitFromOldLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, sal_uLong nRefresh ); - virtual short Execute() SAL_OVERRIDE; // overwritten to set dialog parent + virtual short Execute() override; // overwritten to set dialog parent OUString GetURL(); OUString GetFilter(); // may be empty diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx index 033da1b9ebbe..830854720371 100644 --- a/sc/source/ui/inc/lnktrans.hxx +++ b/sc/source/ui/inc/lnktrans.hxx @@ -35,10 +35,10 @@ public: void SetLinkURL( const OUString& rURL, const OUString& rText ); - virtual void AddSupportedFormats() SAL_OVERRIDE; - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; - virtual void ObjectReleased() SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; + virtual void AddSupportedFormats() override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual void ObjectReleased() override; + virtual void DragFinished( sal_Int8 nDropAction ) override; }; #endif diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 85376ac273c3..1985aa00fe00 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -54,7 +54,7 @@ protected: virtual ~ScMessagePool(); public: - virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const override; }; #endif diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index bb15971e2282..686ba94351e6 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -39,7 +39,7 @@ public: long nFirst = 1, long nLast = 100 ); virtual ~ScMetricInputDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const; diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 99cd8fe51481..73b172177a3a 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -32,7 +32,7 @@ class ScMoveTableDlg : public ModalDialog public: ScMoveTableDlg(vcl::Window* pParent, const OUString& rDefault); virtual ~ScMoveTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt16 GetSelectedDocument () const { return nDocument; } SCTAB GetSelectedTable () const { return nTable; } diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx index 7a53cd85a4a7..485f0490f36a 100644 --- a/sc/source/ui/inc/namecrea.hxx +++ b/sc/source/ui/inc/namecrea.hxx @@ -35,7 +35,7 @@ protected: public: ScNameCreateDlg( vcl::Window * pParent, sal_uInt16 nFlags ); virtual ~ScNameCreateDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt16 GetFlags() const; }; diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 0cc9c6cd9911..d50b9ad7cd2f 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -70,7 +70,7 @@ private: DECL_LINK_TYPED( AssignGetFocusHdl, Control&, void ); protected: - virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; + virtual void RefInputDone( bool bForced = false ) override; public: ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, @@ -78,13 +78,13 @@ public: const ScAddress& aCursorPos, const bool bUndo); virtual ~ScNameDefDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual bool IsRefInputMode() const override; - virtual void SetActive() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void SetActive() override; + virtual bool Close() override; void GetNewData( OUString& rName, OUString& rScope ); }; diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 09526bde2b04..e95aaea9e80e 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -111,22 +111,22 @@ private: DECL_LINK_TYPED( ScopeChangedHdl, ListBox&, void ); protected: - virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; + virtual void RefInputDone( bool bForced = false ) override; public: ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData, const ScAddress& aCursorPos, boost::ptr_map<OUString, ScRangeName>* pRangeMap = NULL ); virtual ~ScNameDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual bool IsRefInputMode() const override; - virtual void SetActive() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void SetActive() override; + virtual bool Close() override; - virtual void tableInitialized() SAL_OVERRIDE; + virtual void tableInitialized() override; void GetRangeNames(boost::ptr_map<OUString, ScRangeName>& rRangeMap); void SetEntry(const OUString& rName, const OUString& rScope); diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index ee6e384626b1..aec3cb2e4240 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -66,10 +66,10 @@ private: public: ScRangeManagerTable( SvSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); virtual ~ScRangeManagerTable(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nStateChange ) override; void setInitListener( InitListener* pListener ); diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 3e22bcb9add9..113299c90e18 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -49,7 +49,7 @@ public: ScNamePasteDlg( vcl::Window * pParent, ScDocShell* pShell, bool bInsList=true ); virtual ~ScNamePasteDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; std::vector<OUString> GetSelectedNames() const; }; diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx index f2ca715191b1..e3b2fe9b639c 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.hxx @@ -32,7 +32,7 @@ public: SfxBindings& rBindings ); protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pItem ) SAL_OVERRIDE; + const SfxPoolItem* pItem ) override; private: ScNavigatorDlg& rNavigatorDlg; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 69ee4a0b5e37..4aa8afd4aa46 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -62,9 +62,9 @@ public: void UpdateEntries( const std::vector<OUString> &aNewEntryList ); protected: - virtual void Select() SAL_OVERRIDE; - virtual void DoubleClick() SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Select() override; + virtual void DoubleClick() override; + virtual bool Notify( NotifyEvent& rNEvt ) override; private: struct ScenarioEntry @@ -97,17 +97,17 @@ class ScScenarioWindow : public vcl::Window public: ScScenarioWindow( vcl::Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment); virtual ~ScScenarioWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void NotifyState( const SfxPoolItem* pState ); void SetComment( const OUString& rComment ) { aEdComment->SetText( rComment ); } - void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; + void SetSizePixel( const Size& rNewSize ) override; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; private: VclPtr<ScScenarioListBox> aLbScenario; @@ -126,12 +126,12 @@ public: void SetCol( SCCOL nColNo ); protected: - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void Up() SAL_OVERRIDE; - virtual void Down() SAL_OVERRIDE; - virtual void First() SAL_OVERRIDE; - virtual void Last() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void LoseFocus() override; + virtual void Up() override; + virtual void Down() override; + virtual void First() override; + virtual void Last() override; private: ScNavigatorDlg& rDlg; @@ -157,8 +157,8 @@ public: void SetRow( SCROW nRow ){ SetValue( nRow ); } protected: - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void LoseFocus() override; private: ScNavigatorDlg& rDlg; @@ -175,7 +175,7 @@ public: virtual ~ScDocListBox(); protected: - virtual void Select() SAL_OVERRIDE; + virtual void Select() override; private: ScNavigatorDlg& rDlg; @@ -193,13 +193,13 @@ public: void UpdateButtons(); void InitImageList(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void ); protected: - virtual void Select() SAL_OVERRIDE; - virtual void Click() SAL_OVERRIDE; + virtual void Select() override; + virtual void Click() override; private: ScNavigatorDlg& rDlg; @@ -299,20 +299,20 @@ private: static void ReleaseFocus(); protected: - virtual void Resize() SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; void Resizing( Size& rSize ); public: ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl::Window* pParent, const bool bUseStyleSettingsBackground); virtual ~ScNavigatorDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using Window::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; class ScNavigatorDialogWrapper: public SfxChildWindowContext @@ -325,7 +325,7 @@ public: SFX_DECL_CHILDWINDOWCONTEXT(ScNavigatorDialogWrapper) - virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) override; private: VclPtr<ScNavigatorDlg> pNavigator; diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index 4f0457f5b559..0c5def840aed 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -62,7 +62,7 @@ public: ScViewData* pViewData, ScSplitPos eWhich ); virtual ~ScOutlineWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** Sets the size of the header area (width/height dep. on window type). */ void SetHeaderSize( long nNewSize ); @@ -207,20 +207,20 @@ private: void ScrollRel( long nEntryDiff, long nEntryStart, long nEntryEnd ); protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; public: - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; #endif diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 6f3fae1051d1..a6b67d2029fc 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -46,11 +46,11 @@ public: ScRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ScRedlineOptionsTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; }; #endif diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 47594807be3f..81ec6c60cbf3 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -44,7 +44,7 @@ public: void SetCursorLinks( const Link<ScCursorRefEdit&,void>& rUp, const Link<ScCursorRefEdit&,void>& rDown ); protected: - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; }; /// The dialog's content for a row, not yet parsed @@ -96,12 +96,12 @@ public: ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocShell* pDocSh, ScAddress aCursorPos ); virtual ~ScOptSolverDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual bool IsRefInputMode() const override; + virtual void SetActive() override; + virtual bool Close() override; private: VclPtr<FixedText> m_pFtObjectiveCell; @@ -208,7 +208,7 @@ class ScSolverProgressDialog : public ModelessDialog public: ScSolverProgressDialog( vcl::Window* pParent ); virtual ~ScSolverProgressDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void HideTimeLimit(); void SetTimeLimit( sal_Int32 nSeconds ); @@ -221,7 +221,7 @@ class ScSolverNoSolutionDialog : public ModalDialog public: ScSolverNoSolutionDialog(vcl::Window* pParent, const OUString& rErrorText); virtual ~ScSolverNoSolutionDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class ScSolverSuccessDialog : public ModalDialog @@ -235,7 +235,7 @@ class ScSolverSuccessDialog : public ModalDialog public: ScSolverSuccessDialog( vcl::Window* pParent, const OUString& rSolution ); virtual ~ScSolverSuccessDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sc/source/ui/inc/overlayobject.hxx b/sc/source/ui/inc/overlayobject.hxx index e8255285fba9..3917dc4ce88d 100644 --- a/sc/source/ui/inc/overlayobject.hxx +++ b/sc/source/ui/inc/overlayobject.hxx @@ -28,12 +28,12 @@ public: ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor); virtual ~ScOverlayDashedBorder(); - virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; + virtual void Trigger(sal_uInt32 nTime) override; - virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; + virtual void stripeDefinitionHasChanged() override; protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; private: ::basegfx::B2DRange maRange; diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 2e74c0a8e809..61c3969fb25c 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -40,7 +40,7 @@ class ScPivotFilterDlg : public ModalDialog public: ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab); virtual ~ScPivotFilterDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const ScQueryItem& GetOutputItem(); diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx index 120d06801e89..fcd8746b7b41 100644 --- a/sc/source/ui/inc/popmenu.hxx +++ b/sc/source/ui/inc/popmenu.hxx @@ -29,7 +29,7 @@ private: sal_uInt16 nSel; bool bHit; protected: - virtual void Select() SAL_OVERRIDE; + virtual void Select() override; public: ScPopupMenu() : nSel(0),bHit(false) {} diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index a83d2a7a79bd..729629958a5a 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -103,24 +103,24 @@ private: using Window::SetZoom; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; public: ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ); virtual ~ScPreview(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; SC_DLLPUBLIC void DataChanged(bool bNewTime = false); // Instead of calling Invalidate void DoInvalidate(); diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 43c8b1bfce97..22567c77260e 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -61,18 +61,18 @@ private: void ExitPreview(); protected: - virtual void Activate(bool bMDI) SAL_OVERRIDE; - virtual void Deactivate(bool bMDI) SAL_OVERRIDE; - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) SAL_OVERRIDE; + virtual void Activate(bool bMDI) override; + virtual void Deactivate(bool bMDI) override; + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) override; - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) override; + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) override; - virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; - virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; + virtual void WriteUserData(OUString &, bool bBrowse = false) override; + virtual void ReadUserData(const OUString &, bool bBrowse = false) override; - virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; - virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; + virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; public: TYPEINFO_OVERRIDE(); @@ -102,12 +102,12 @@ public: TriState GetSourceDesignMode() const { return nSourceDesignMode; } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; - virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; - virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; + virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; + virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) override; + virtual bool HasPrintOptionsPage() const override; + virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) override; void AddAccessibilityObject( SfxListener& rObject ); void RemoveAccessibilityObject( SfxListener& rObject ); diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index 96cac4f9aaad..84c3e66b0956 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -41,9 +41,9 @@ private: void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt) override; public: @@ -57,8 +57,8 @@ public: void MoveSplitTo(Point aPos); - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void SetCtrModifiedHdl( const Link<ScPrivatSplit&,void>& rLink ) { aCtrModifiedLink = rLink; } }; diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 145704a3c974..d2f671317d6c 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -35,9 +35,9 @@ class ScTableProtectionDlg : public ModalDialog public: explicit ScTableProtectionDlg(vcl::Window* pParent); virtual ~ScTableProtectionDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; void SetDialogData(const ScTableProtection& rData); diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index c26316bd12d4..81871e7b0a74 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -61,7 +61,7 @@ public: explicit ScDPFunctionDlg( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); virtual ~ScDPFunctionDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt16 GetFuncMask() const; ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const; @@ -103,7 +103,7 @@ public: const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, bool bEnableLayout ); virtual ~ScDPSubtotalDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt16 GetFuncMask() const; void FillLabelData( ScDPLabelData& rLabelData ) const; @@ -139,7 +139,7 @@ public: const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, bool bEnableLayout ); virtual ~ScDPSubtotalOptDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void FillLabelData( ScDPLabelData& rLabelData ) const; private: @@ -191,8 +191,8 @@ class ScDPShowDetailDlg : public ModalDialog public: explicit ScDPShowDetailDlg( vcl::Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ); virtual ~ScDPShowDetailDlg(); - virtual void dispose() SAL_OVERRIDE; - virtual short Execute() SAL_OVERRIDE; + virtual void dispose() override; + virtual short Execute() override; /** * @return String internal name of the selected field. Note that this may diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 5be200c9569f..4c6e7339429b 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -181,8 +181,8 @@ public: virtual ~ScValidityRefChildWin(); bool LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; } bool LockFreeWindow( bool bLock ){ bool bFreeWindow = m_bFreeWindowLock; m_bFreeWindowLock = bLock; return bFreeWindow; } - void Hide() SAL_OVERRIDE { if( !m_bVisibleLock) SfxChildWindow::Hide(); } - void Show( ShowFlags nFlags ) SAL_OVERRIDE { if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); } + void Hide() override { if( !m_bVisibleLock) SfxChildWindow::Hide(); } + void Show( ShowFlags nFlags ) override { if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); } }; #endif // INCLUDED_SC_SOURCE_UI_INC_REFFACT_HXX diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 93a895c4c68f..729658e54737 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -46,9 +46,9 @@ public: explicit ScRetypePassDlg(vcl::Window* pParent); virtual ~ScRetypePassDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; void SetDataFromDocument(const ScDocument& rDoc); void SetDesiredHash(ScPasswordHash eHash); @@ -105,9 +105,9 @@ class ScRetypePassInputDlg : public ModalDialog public: explicit ScRetypePassInputDlg(vcl::Window* pParent, ScPassHashProtectable* pProtected); virtual ~ScRetypePassInputDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; bool IsRemovePassword() const; OUString GetNewPassword() const; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index ce5779f4b8e1..15a9f2c144fd 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -32,7 +32,7 @@ class ScNewScenarioDlg : public ModalDialog public: ScNewScenarioDlg(vcl::Window* pParent, const OUString& rName, bool bEdit = false, bool bSheetProtected = false); virtual ~ScNewScenarioDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ); diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 097416347eba..0f190f0bfdb0 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -80,7 +80,7 @@ public: vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ); virtual ~ScImportAsciiDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GetOptions( ScAsciiOptions& rOpt ); void SaveParameters(); diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index d599d4b1c5bf..d810a354541a 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -28,7 +28,7 @@ public: const ScAutoFormatData* pSelFormatData, ScViewData *pViewData); virtual ~ScAutoFormatDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt16 GetIndex() const { return nIndex; } OUString GetCurrFormatName(); diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index ba3afee71ab8..8d41f081146f 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -37,7 +37,7 @@ public: bool bImport = true ); virtual ~ScImportOptionsDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GetImportOptions( ScImportOptions& rOptions ) const; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 44b583b123f1..fbdf7cd4183f 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -45,8 +45,8 @@ class EditEngine; class ScHFEditPage : public SfxTabPage { public: - virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; + virtual void Reset ( const SfxItemSet* rCoreSet ) override; void SetNumType(SvxNumType eNumType); void ClearTextAreas(); @@ -57,7 +57,7 @@ protected: sal_uInt16 nWhich, bool bHeader ); virtual ~ScHFEditPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<ScEditWindow> m_pWndLeft; diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index 57ff716e3065..8143c48d56b6 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -30,11 +30,11 @@ class SearchResultsDlg : public ModelessDialog public: SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 nId ); virtual ~SearchResultsDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void FillResults( ScDocument* pDoc, const ScRangeList& rMatchedRanges ); - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; }; class SearchResultsDlgWrapper : public SfxChildWindow diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index ca027f040ee4..15a2b3d3d782 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -62,13 +62,13 @@ public: void SetAnchor( SCCOL nPosX, SCROW nPosY ); void SetAnchorFlag( bool bSet ); - virtual void BeginDrag() SAL_OVERRIDE; - virtual void CreateAnchor() SAL_OVERRIDE; - virtual void DestroyAnchor() SAL_OVERRIDE; - virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) SAL_OVERRIDE; - virtual bool IsSelectionAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; - virtual void DeselectAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; - virtual void DeselectAll() SAL_OVERRIDE; + virtual void BeginDrag() override; + virtual void CreateAnchor() override; + virtual void DestroyAnchor() override; + virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) override; + virtual bool IsSelectionAtPoint( const Point& rPointPixel ) override; + virtual void DeselectAtPoint( const Point& rPointPixel ) override; + virtual void DeselectAll() override; bool SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, bool bScroll ); }; @@ -89,13 +89,13 @@ public: void SetColumn( bool bSet ); void SetWhich( ScSplitPos eNew ); - virtual void BeginDrag() SAL_OVERRIDE; - virtual void CreateAnchor() SAL_OVERRIDE; - virtual void DestroyAnchor() SAL_OVERRIDE; - virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) SAL_OVERRIDE; - virtual bool IsSelectionAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; - virtual void DeselectAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; - virtual void DeselectAll() SAL_OVERRIDE; + virtual void BeginDrag() override; + virtual void CreateAnchor() override; + virtual void DestroyAnchor() override; + virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) override; + virtual bool IsSelectionAtPoint( const Point& rPointPixel ) override; + virtual void DeselectAtPoint( const Point& rPointPixel ) override; + virtual void DeselectAll() override; void SetAnchorFlag(bool bSet) { bAnchor = bSet; } }; diff --git a/sc/source/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx index cfc8a1facc09..ac78a4e7f216 100644 --- a/sc/source/ui/inc/seltrans.hxx +++ b/sc/source/ui/inc/seltrans.hxx @@ -63,9 +63,9 @@ public: ScTransferObj* GetCellData(); ScDrawTransferObj* GetDrawData(); - virtual void AddSupportedFormats() SAL_OVERRIDE; - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; - virtual void ObjectReleased() SAL_OVERRIDE; + virtual void AddSupportedFormats() override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual void ObjectReleased() override; }; #endif diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx index a33c11c7dbe2..35f4e516cce4 100644 --- a/sc/source/ui/inc/servobj.hxx +++ b/sc/source/ui/inc/servobj.hxx @@ -36,7 +36,7 @@ class ScServerObjectSvtListenerForwarder : public SvtListener public: ScServerObjectSvtListenerForwarder( ScServerObject* pObjP); virtual ~ScServerObjectSvtListenerForwarder(); - virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( const SfxHint& rHint ) override; }; class ScServerObject : public ::sfx2::SvLinkSource, public SfxListener @@ -56,9 +56,9 @@ public: virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, const OUString & rMimeType, - bool bSynchron = false ) SAL_OVERRIDE; + bool bSynchron = false ) override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void EndListeningAll(); }; diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index 85abd56dccfd..01a195a17c12 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -49,7 +49,7 @@ private: public: ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScShareDocumentDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsShareDocumentChecked() const; void UpdateView(); diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 1522ea410bb9..1240c1546f82 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -36,7 +36,7 @@ private: public: ScShowTabDlg( vcl::Window* pParent ); virtual ~ScShowTabDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** Sets dialog title, fixed text for listbox and help IDs. */ void SetDescription( diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index bca6c9c0e4a0..eb1c89b17b14 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -61,23 +61,23 @@ private: protected: - virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; + virtual void RefInputDone( bool bForced = false ) override; public: ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent); virtual ~ScSimpleRefDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual bool IsRefInputMode() const override; + virtual void SetActive() override; + virtual bool Close() override; void StartRefInput(); void SetRefString(const OUString &rStr); - virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; + virtual void FillInfo(SfxChildWinInfo&) const override; void SetCloseHdl( const Link<const OUString*,void>& rLink ); void SetUnoLinks( const Link<const OUString&,void>& rDone, const Link<const OUString&,void>& rAbort, diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 6d0efd43dfc4..64b46d191f2e 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -61,7 +61,7 @@ public: const OUString& rEngine, const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties ); virtual ~ScSolverOptionsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // already updated in selection handler const OUString& GetEngine() const { return maEngine; } @@ -76,7 +76,7 @@ class ScSolverIntegerDialog : public ModalDialog public: ScSolverIntegerDialog( vcl::Window * pParent ); virtual ~ScSolverIntegerDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetOptionName( const OUString& rName ); void SetValue( sal_Int32 nValue ); @@ -91,7 +91,7 @@ class ScSolverValueDialog : public ModalDialog public: ScSolverValueDialog( vcl::Window * pParent ); virtual ~ScSolverValueDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetOptionName( const OUString& rName ); void SetValue( double fValue ); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 828dbb2f1777..58d5cce476e0 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -42,12 +42,12 @@ public: ScDocument* pDocument, ScAddress aCursorPos ); virtual ~ScSolverDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual bool IsRefInputMode() const override; + virtual void SetActive() override; + virtual bool Close() override; private: VclPtr<FixedText> m_pFtFormulaCell; diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx index 65492a0b0e84..478f3fca49eb 100644 --- a/sc/source/ui/inc/sortdlg.hxx +++ b/sc/source/ui/inc/sortdlg.hxx @@ -46,7 +46,7 @@ class ScSortWarningDlg : public ModalDialog public: ScSortWarningDlg( vcl::Window* pParent, const OUString& rExtendText,const OUString& rCurrentText ); virtual ~ScSortWarningDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK_TYPED( BtnHdl, Button*, void ); private: VclPtr<FixedText> aFtText; diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index 3291f64b048b..dbcbfda78abc 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -56,14 +56,14 @@ protected: next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. */ - virtual svx::SpellPortions GetNextWrongSentence( bool bRecheck ) SAL_OVERRIDE; + virtual svx::SpellPortions GetNextWrongSentence( bool bRecheck ) override; /** This method is responsible for merging corrections made in the spelling dialog back into the document. */ - virtual void ApplyChangedSentence( const svx::SpellPortions& rChanged, bool bRecheck ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void ApplyChangedSentence( const svx::SpellPortions& rChanged, bool bRecheck ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; private: void Reset(); diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index 150139e25a7f..edc9225738cf 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -102,20 +102,20 @@ public: css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpeller ); /** Checks spelling of all cells in the selection or sheet. */ - virtual void ConvertAll( EditView& rEditView ) SAL_OVERRIDE; + virtual void ConvertAll( EditView& rEditView ) override; protected: /** Callback from edit engine to check the next cell. */ - virtual bool SpellNextDocument() SAL_OVERRIDE; + virtual bool SpellNextDocument() override; /** Returns true, if the current text contains a spelling error. */ - virtual bool NeedsConversion() SAL_OVERRIDE; + virtual bool NeedsConversion() override; /** Show a query box that asks whether to restart at top of the sheet. @return true = Restart at top, false = Stop the conversion. */ - virtual bool ShowTableWrapDialog() SAL_OVERRIDE; + virtual bool ShowTableWrapDialog() override; /** Show a message box stating that spell checking is finished. */ - virtual void ShowFinishDialog() SAL_OVERRIDE; + virtual void ShowFinishDialog() override; private: /** Returns the spelling dialog if it is open. */ @@ -134,14 +134,14 @@ public: ScDocument* pRedoDoc ); /** Converts all cells in the selection or sheet according to set language. */ - virtual void ConvertAll( EditView& rEditView ) SAL_OVERRIDE; + virtual void ConvertAll( EditView& rEditView ) override; protected: /** Callback from edit engine to convert the next cell. */ - virtual bool ConvertNextDocument() SAL_OVERRIDE; + virtual bool ConvertNextDocument() override; /** Returns true, if the current text contains text to convert. */ - virtual bool NeedsConversion() SAL_OVERRIDE; + virtual bool NeedsConversion() override; private: ScConversionParam maConvParam; /// Conversion parameters. diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index 1863869203fb..f617f9f58f42 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -33,7 +33,7 @@ public: const OUString& rDefault, const OString& sHelpId, const OString& sEditHelpId); virtual ~ScStringInputDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetInputString() const { return m_pEdInput->GetText(); diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index b91572c35772..1a94f71bb611 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -32,8 +32,8 @@ public: sal_uInt16 nRscId ); protected: - virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; - virtual void RefreshInputSet() SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) override; + virtual void RefreshInputSet() override; private: sal_uInt16 nDlgRsc; diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 2dd41dcb4291..17e3a9d7e3fb 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -29,7 +29,7 @@ class ScSubTotalDlg : public SfxTabDialog public: ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet); virtual ~ScSubTotalDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<PushButton> m_pBtnRemove; DECL_LINK_TYPED( RemoveHdl, Button *, void ); diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index a598549dd6d4..ae83b584060d 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -34,7 +34,7 @@ public: const Color& rDefaultColor, const OString& nHelpId ); virtual ~ScTabBgColorDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GetSelectedColor( Color& rColor ) const; @@ -43,14 +43,14 @@ public: public: ScTabBgColorValueSet(vcl::Window* pParent, WinBits nStyle); virtual ~ScTabBgColorValueSet(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetDialog(ScTabBgColorDlg* pTabBgColorDlg) { m_pTabBgColorDlg = pTabBgColorDlg; } - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; private: VclPtr<ScTabBgColorDlg> m_pTabBgColorDlg; }; diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index 4c1da4c397f0..246a7942a423 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -46,22 +46,22 @@ private: void SwitchToPageId(sal_uInt16 nId); protected: - virtual void Select() SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Select() override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; - virtual bool StartRenaming() SAL_OVERRIDE; - virtual TabBarAllowRenamingReturnCode AllowRenaming() SAL_OVERRIDE; - virtual void EndRenaming() SAL_OVERRIDE; - virtual void Mirror() SAL_OVERRIDE; + virtual bool StartRenaming() override; + virtual TabBarAllowRenamingReturnCode AllowRenaming() override; + virtual void EndRenaming() override; + virtual void Mirror() override; - virtual void AddTabClick() SAL_OVERRIDE; + virtual void AddTabClick() override; public: ScTabControl( vcl::Window* pParent, ScViewData* pData ); diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index e9eac1f2e2a1..35fb3ce520ad 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -44,13 +44,13 @@ public: ScDocument* pDocument, const ScRefAddress& rCursorPos ); virtual ~ScTabOpDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const SAL_OVERRIDE { return true; } - virtual void SetActive() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual bool IsRefInputMode() const override { return true; } + virtual void SetActive() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; private: VclPtr<FixedText> m_pFtFormulaRange; diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 7ab302b7abac..e5dedcc20710 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -32,15 +32,15 @@ public: static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges () { return pProtectionRanges; } - virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override; + virtual void Reset ( const SfxItemSet* ) override; virtual ~ScTabPageProtection(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) override; private: ScTabPageProtection( vcl::Window* pParent, diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index de3fce78b4bd..e37f9ffbe31e 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -31,7 +31,7 @@ private: bool bFixed; protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; public: ScTabSplitter( vcl::Window* pParent, WinBits nWinStyle, @@ -39,7 +39,7 @@ public: virtual ~ScTabSplitter(); void SetFixed(bool bSet); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rPaintRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rPaintRect ) override; }; #endif diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index e207569c49a0..c5fffce05396 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -69,15 +69,15 @@ private: bool bAdd; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; public: ScCornerButton( vcl::Window* pParent, ScViewData* pData, bool bAdditional ); virtual ~ScCornerButton(); - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; class ScTabView : boost::noncopyable diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index f636120fe131..31208b35f628 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -190,34 +190,34 @@ private: DECL_LINK_TYPED( FormControlActivated, LinkParamNone*, void ); protected: - virtual void Activate(bool bMDI) SAL_OVERRIDE; - virtual void Deactivate(bool bMDI) SAL_OVERRIDE; - virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; + virtual void Activate(bool bMDI) override; + virtual void Deactivate(bool bMDI) override; + virtual bool PrepareClose( bool bUI = true ) override; - virtual void ShowCursor(bool bOn) SAL_OVERRIDE; + virtual void ShowCursor(bool bOn) override; - virtual void Move() SAL_OVERRIDE; // Benachrichtigung + virtual void Move() override; // Benachrichtigung - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) SAL_OVERRIDE; // alt + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) override; // alt - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; // neu - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; - virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) SAL_OVERRIDE; + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) override; // neu + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) override; + virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) override; - virtual void QueryObjAreaPixel( Rectangle& rRect ) const SAL_OVERRIDE; + virtual void QueryObjAreaPixel( Rectangle& rRect ) const override; - virtual OUString GetSelectionText( bool bWholeWord ) SAL_OVERRIDE; - virtual bool HasSelection( bool bText ) const SAL_OVERRIDE; + virtual OUString GetSelectionText( bool bWholeWord ) override; + virtual bool HasSelection( bool bText ) const override; - virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; - virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; - virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; - virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; + virtual void WriteUserData(OUString &, bool bBrowse = false) override; + virtual void ReadUserData(const OUString &, bool bBrowse = false) override; + virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) override; - virtual void UIDeactivated( SfxInPlaceClient* pClient ) SAL_OVERRIDE; + virtual void UIDeactivated( SfxInPlaceClient* pClient ) override; - virtual bool KeyInput( const KeyEvent &rKeyEvent ) SAL_OVERRIDE; - virtual SdrView* GetDrawView() const SAL_OVERRIDE; + virtual bool KeyInput( const KeyEvent &rKeyEvent ) override; + virtual SdrView* GetDrawView() const override; public: TYPEINFO_OVERRIDE(); @@ -311,7 +311,7 @@ public: ObjectSelectionType GetCurObjectSelectionType() { return eCurOST; } - virtual ErrCode DoVerb(long nVerb) SAL_OVERRIDE; + virtual ErrCode DoVerb(long nVerb) override; void StopEditShell(); bool IsDrawTextShell() const; @@ -323,17 +323,17 @@ public: bool GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; ScNavigatorSettings* GetNavigatorSettings(); // Drucken: - virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; + virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, - SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false ) SAL_OVERRIDE; + SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false ) override; - virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; + virtual bool HasPrintOptionsPage() const override; + virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) override; void ConnectObject( SdrOle2Obj* pObj ); bool ActivateObject( SdrOle2Obj* pObj, long nVerb ); @@ -347,8 +347,8 @@ public: void UpdateOleZoom(); - virtual const FmFormShell* GetFormShell() const SAL_OVERRIDE { return pFormShell; } - virtual FmFormShell* GetFormShell() SAL_OVERRIDE { return pFormShell; } + virtual const FmFormShell* GetFormShell() const override { return pFormShell; } + virtual FmFormShell* GetFormShell() override { return pFormShell; } void InsertURL( const OUString& rName, const OUString& rURL, const OUString& rTarget, sal_uInt16 nMode ); diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index ac53e20d28c1..67202401908d 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -33,8 +33,8 @@ public: ScZoomSliderControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~ScZoomSliderControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override; }; class ScZoomSliderWnd: public vcl::Window @@ -54,13 +54,13 @@ public: ScZoomSliderWnd(vcl::Window* pParent, const css::uno::Reference<css::frame::XDispatchProvider >& rDispatchProvider, const css::uno::Reference<css::frame::XFrame>& _xFrame, sal_uInt16 nCurrentZoom); virtual ~ScZoomSliderWnd(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ); protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; }; #endif diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index 1bea02d2a0ea..13ff4590fd6e 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.hxx @@ -31,7 +31,7 @@ private: sal_uInt16 m_nNamePageId; sal_uInt16 m_nEffectsPageId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) override; public: ScCharDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell); @@ -42,7 +42,7 @@ class ScParagraphDlg : public SfxTabDialog private: sal_uInt16 m_nTabPageId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) override; public: ScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr); diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 4eda9235c23f..56f03c98a5c2 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -31,8 +31,8 @@ class ScTextImportOptionsDlg : public ModalDialog public: ScTextImportOptionsDlg(vcl::Window* pParent); virtual ~ScTextImportOptionsDlg(); - virtual void dispose() SAL_OVERRIDE; - virtual short Execute() SAL_OVERRIDE; + virtual void dispose() override; + virtual short Execute() override; LanguageType getLanguageType() const; bool isDateConversionSet() const; diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 9a51172ec4f1..ea7177a9298b 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -35,16 +35,16 @@ class ScTpCalcOptions : public SfxTabPage public: static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); - virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; + virtual void Reset ( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) override; private: ScTpCalcOptions( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~ScTpCalcOptions(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<CheckBox> m_pBtnIterate; diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 322e50d003bb..69e9a78f4274 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -22,12 +22,12 @@ public: static VclPtr<SfxTabPage> Create (vcl::Window* pParent, const SfxItemSet* rCoreAttrs); - virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet* rCoreAttrs) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rCoreAttrs) override; + virtual void Reset(const SfxItemSet* rCoreAttrs) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) override; virtual ~ScTpCompatOptions(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: explicit ScTpCompatOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs); private: diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 0cc0371f8e33..4e7b8ab0e39c 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -22,14 +22,14 @@ public: static VclPtr<SfxTabPage> Create (vcl::Window* pParent, const SfxItemSet* rCoreSet); - virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet* rCoreSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rCoreSet) override; + virtual void Reset(const SfxItemSet* rCoreSet) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) override; private: explicit ScTpDefaultsOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet); virtual ~ScTpDefaultsOptions(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void CheckNumSheets(); void CheckPrefix(Edit* pEdit); diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 35e5a70b9cf3..0334ebf51e7c 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -36,14 +36,14 @@ public: static VclPtr<SfxTabPage> Create (vcl::Window* pParent, const SfxItemSet* rCoreSet); - virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rCoreSet) override; + virtual void Reset( const SfxItemSet* rCoreSet ) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) override; private: explicit ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet); virtual ~ScTpFormulaOptions(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ResetSeparators(); void OnFocusSeparatorInput(Edit* pEdit); void UpdateCustomCalcRadioButtons(bool bDefault); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index f32ce4a9fe1a..f3192bbf5fd0 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -28,10 +28,10 @@ class ScHFPage : public SvxHFPage { public: virtual ~ScHFPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual bool FillItemSet( SfxItemSet* rOutSet ) override; void SetPageStyle( const OUString& rName ) { aStrPageStyle = rName; } void SetStyleDlg ( ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } @@ -41,10 +41,10 @@ protected: const SfxItemSet& rSet, sal_uInt16 nSetId ); - virtual void ActivatePage() SAL_OVERRIDE; - virtual void DeactivatePage() SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void ActivatePage() override; + virtual void DeactivatePage() override; + virtual void ActivatePage( const SfxItemSet& rSet ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; private: VclPtr<PushButton> m_pBtnEdit; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index b26dcdefee55..fefff1f6dc79 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -55,7 +55,7 @@ class SC_DLLPUBLIC ScEditWindow : public Control public: ScEditWindow( vcl::Window* pParent, WinBits nBits , ScEditWindowLocation eLoc ); virtual ~ScEditWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using Control::SetFont; void SetFont( const ScPatternAttr& rPattern ); @@ -68,22 +68,22 @@ public: void SetNumType(SvxNumType eNumType); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; ScHeaderEditEngine* GetEditEngine() const { return pEdEngine; } void SetObjectSelectHdl( const Link<ScEditWindow&,void>& aLink) { aObjectSelectLink = aLink; } void SetLocation(ScEditWindowLocation eLoc) { eLocation = eLoc; } protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void Resize() override; private: ScHeaderEditEngine* pEdEngine; @@ -111,9 +111,9 @@ private: protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Click() SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt) override; + virtual void Click() override; void StartPopup(); @@ -128,7 +128,7 @@ public: void SetMenuHdl( const Link<ScExtIButton&,void>& rLink ) { aMLink = rLink; } - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPHFEDIT_HXX diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index bf38a927c3b6..b006c4411052 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -33,12 +33,12 @@ class ScTpPrintOptions : public SfxTabPage ScTpPrintOptions( vcl::Window* pParent, const SfxItemSet& rCoreSet ); public: virtual ~ScTpPrintOptions(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); - virtual bool FillItemSet( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rCoreSet ) override; + virtual void Reset( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) override; }; #endif diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 8ce953db4c86..3f54ce4b1587 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -50,21 +50,21 @@ public: ScTabPageSortFields( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTabPageSortFields(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); - virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; + virtual void Reset ( const SfxItemSet* rArgSet ) override; - virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) SAL_OVERRIDE; - virtual void SetSizePixel(const Size& rAllocation) SAL_OVERRIDE; - virtual void SetPosPixel(const Point& rAllocPos) SAL_OVERRIDE; + virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) override; + virtual void SetSizePixel(const Size& rAllocation) override; + virtual void SetPosPixel(const Point& rAllocPos) override; protected: - virtual void ActivatePage ( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage ( const SfxItemSet& rSet ) override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = 0) override; private: OUString aStrUndefined; @@ -109,20 +109,20 @@ public: ScTabPageSortOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTabPageSortOptions(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; #undef SfxTabPage #define SfxTabPage ::SfxTabPage static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); - virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; + virtual void Reset ( const SfxItemSet* rArgSet ) override; protected: - virtual void ActivatePage ( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage ( const SfxItemSet& rSet ) override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = 0) override; private: diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 14478dc7043e..06e23db28d56 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -30,13 +30,13 @@ class ScDocStatPage: public SfxTabPage public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); virtual ~ScDocStatPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet ); protected: - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset ( const SfxItemSet* rSet ) override; private: VclPtr<FixedText> m_pFtTables; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index d6fdccc35e48..3a702efab904 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -41,7 +41,7 @@ protected: public: virtual ~ScTpSubTotalGroup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool DoReset ( sal_uInt16 nGroupNo, const SfxItemSet& rArgSet ); @@ -88,8 +88,8 @@ public: static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); - virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; + virtual void Reset ( const SfxItemSet* rArgSet ) override; }; class ScTpSubTotalGroup2 : public ScTpSubTotalGroup @@ -104,8 +104,8 @@ public: static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); - virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; + virtual void Reset ( const SfxItemSet* rArgSet ) override; }; class ScTpSubTotalGroup3 : public ScTpSubTotalGroup @@ -120,8 +120,8 @@ public: static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); - virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; + virtual void Reset ( const SfxItemSet* rArgSet ) override; }; class ScTpSubTotalOptions : public SfxTabPage @@ -133,11 +133,11 @@ protected: public: virtual ~ScTpSubTotalOptions(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); - virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; + virtual void Reset ( const SfxItemSet* rArgSet ) override; private: VclPtr<CheckBox> pBtnPagebreak; diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index f46c6fc2c109..37893831dfa5 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -33,14 +33,14 @@ public: static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); static const sal_uInt16* GetRanges () { return pPageTableRanges; } - virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; + virtual void Reset ( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; - virtual void DataChanged ( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) override; + virtual void DataChanged ( const DataChangedEvent& rDCEvt ) override; virtual ~ScTablePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: ScTablePage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); void ShowImage(); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 70c5e769169a..4f10fd409ea0 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -36,16 +36,16 @@ class ScTpUserLists : public SfxTabPage public: static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rAttrSet ); - virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override; + virtual void Reset ( const SfxItemSet* rCoreAttrs ) override; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) override; private: ScTpUserLists( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTpUserLists(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<FixedText> mpFtLists; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 288fda0b2428..149330b13275 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -68,17 +68,17 @@ class ScTpContentOptions : public SfxTabPage ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTpContentOptions(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); - virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; + virtual void Reset ( const SfxItemSet* rCoreSet ) override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; }; @@ -115,15 +115,15 @@ class ScTpLayoutOptions : public SfxTabPage const SfxItemSet& rArgSet ); public: virtual ~ScTpLayoutOptions(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); - virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; + virtual void Reset ( const SfxItemSet* rCoreSet ) override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; void SetDocument(ScDocument* pPtr){pDoc = pPtr;} diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index c0772b579573..a068c74540dc 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -71,12 +71,12 @@ public: ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDescriptor& rDesc ); virtual ~ScTransferObj(); - virtual void AddSupportedFormats() SAL_OVERRIDE; - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; + virtual void AddSupportedFormats() override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, - const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; - virtual void ObjectReleased() SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; + const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) override; + virtual void ObjectReleased() override; + virtual void DragFinished( sal_Int8 nDropAction ) override; ScDocument* GetDocument() { return pDoc; } // owned by ScTransferObj const ScRange& GetRange() const { return aBlock; } @@ -102,7 +102,7 @@ public: static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); static SfxObjectShell* SetDrawClipDoc( bool bAnyOle ); // update ScGlobal::pDrawClipDocShellRef - virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); }; diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 56b70aa13037..493d24a5124a 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -63,8 +63,8 @@ public: ScInputStatusItem( const ScInputStatusItem& rItem ); virtual ~ScInputStatusItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const ScAddress& GetPos() const { return aCursorPos; } @@ -143,9 +143,9 @@ public: ScSortItem( const ScSortItem& rItem ); virtual ~ScSortItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; ScViewData* GetViewData () const { return pViewData; } const ScSortParam& GetSortData () const { return theSortData; } @@ -167,8 +167,8 @@ public: ScQueryItem( const ScQueryItem& rItem ); virtual ~ScQueryItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; ScViewData* GetViewData () const { return pViewData; } const ScQueryParam& GetQueryData() const; @@ -195,9 +195,9 @@ public: ScSubTotalItem( const ScSubTotalItem& rItem ); virtual ~ScSubTotalItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const override; ScViewData* GetViewData () const { return pViewData; } const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } @@ -215,8 +215,8 @@ public: ScUserListItem( const ScUserListItem& rItem ); virtual ~ScUserListItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; void SetUserList ( const ScUserList& rUserList ); ScUserList* GetUserList () const { return pUserList; } @@ -234,8 +234,8 @@ public: ScConsolidateItem( const ScConsolidateItem& rItem ); virtual ~ScConsolidateItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const ScConsolidateParam& GetData() const { return theConsData; } @@ -252,8 +252,8 @@ public: ScPivotItem( const ScPivotItem& rItem ); virtual ~ScPivotItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const ScDPSaveData& GetData() const { return *pSaveData; } const ScRange& GetDestRange() const { return aDestRange; } @@ -274,8 +274,8 @@ public: ScSolveItem( const ScSolveItem& rItem ); virtual ~ScSolveItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const ScSolveParam& GetData() const { return theSolveData; } @@ -292,8 +292,8 @@ public: ScTabOpItem( const ScTabOpItem& rItem ); virtual ~ScTabOpItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; const ScTabOpParam& GetData() const { return theTabOpData; } diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 7d6326e55bf5..d092d1f5f2ed 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -45,7 +45,7 @@ public: ScSimpleUndo( ScDocShell* pDocSh ); virtual ~ScSimpleUndo(); - virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; + virtual bool Merge( SfxUndoAction *pNextAction ) override; protected: ScDocShell* pDocShell; @@ -178,16 +178,16 @@ public: SfxUndoAction* GetWrappedUndo() { return pWrappedUndo; } void ForgetWrappedUndo(); - virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction) SAL_OVERRIDE; + virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction) override; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; - virtual OUString GetComment() const SAL_OVERRIDE; - virtual OUString GetRepeatComment(SfxRepeatTarget&) const SAL_OVERRIDE; - virtual sal_uInt16 GetId() const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; + virtual bool Merge( SfxUndoAction *pNextAction ) override; + virtual OUString GetComment() const override; + virtual OUString GetRepeatComment(SfxRepeatTarget&) const override; + virtual sal_uInt16 GetId() const override; }; #endif diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 15df3c2a9ff5..cefbb40e7a4e 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -49,14 +49,14 @@ public: bool bNewPartOfPaste ); virtual ~ScUndoInsertCells(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat( SfxRepeatTarget& rTarget ) SAL_OVERRIDE; - virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat( SfxRepeatTarget& rTarget ) override; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; - virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; + virtual bool Merge( SfxUndoAction *pNextAction ) override; private: ScRange aEffRange; @@ -81,12 +81,12 @@ public: DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData ); virtual ~ScUndoDeleteCells(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScRange aEffRange; @@ -113,12 +113,12 @@ public: virtual ~ScUndoDeleteMulti(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: bool mbRows:1; @@ -143,12 +143,12 @@ public: ScDocument* pNewUndoDoc ); virtual ~ScUndoCut(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScMarkData aMarkData; @@ -191,12 +191,12 @@ public: const ScUndoPasteOptions* pOptions = NULL); virtual ~ScUndoPaste(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScMarkData aMarkData; @@ -224,12 +224,12 @@ public: bool bScenario ); virtual ~ScUndoDragDrop(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: sal_uInt16 mnPaintExtFlags; @@ -259,12 +259,12 @@ public: InsertDeleteFlags nNewFlags, bool bObjects ); virtual ~ScUndoDeleteContents(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; void SetDataSpans( const std::shared_ptr<DataSpansType>& pSpans ); @@ -296,12 +296,12 @@ public: InsertDeleteFlags nFlg, ScPasteFunc nFunc, bool bSkip, bool bLink ); virtual ~ScUndoFillTable(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScRange aRange; @@ -334,12 +334,12 @@ public: const SvxBoxInfoItem* pNewInner = NULL ); virtual ~ScUndoSelectionAttr(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; ScEditDataArray* GetDataArray(); private: @@ -371,12 +371,12 @@ public: bool bNewWidth ); virtual ~ScUndoWidthOrHeight(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScMarkData aMarkData; @@ -405,12 +405,12 @@ public: double fNewStartValue, double fNewStepValue, double fNewMaxValue ); virtual ~ScUndoAutoFill(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScRange aSource; @@ -436,12 +436,12 @@ public: bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo); virtual ~ScUndoMerge(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScCellMergeOption maOption; @@ -462,12 +462,12 @@ public: bool bNewSize, sal_uInt16 nNewFormatNo ); virtual ~ScUndoAutoFormat(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScDocument* pUndoDoc; // deleted data @@ -487,12 +487,12 @@ public: const SvxSearchItem* pItem ); virtual ~ScUndoReplace(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScAddress aCursorPos; @@ -521,12 +521,12 @@ public: ScTabOpParam::Mode eMode ); virtual ~ScUndoTabOp(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScRange aRange; @@ -549,12 +549,12 @@ public: const ScConversionParam& rConvParam ); virtual ~ScUndoConversion(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScMarkData aMarkData; @@ -579,12 +579,12 @@ public: ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, bool bNewMulti, InsertDeleteFlags nNewFlag); virtual ~ScUndoRefConversion(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScMarkData aMarkData; @@ -609,12 +609,12 @@ public: ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc ); virtual ~ScUndoListNames(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScDocument* pUndoDoc; @@ -631,12 +631,12 @@ public: ScDocument* pUndoDoc, ScDocument* pRedoDoc, const ScRange& rRange); virtual ~ScUndoConditionalFormat(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: void DoChange(ScDocument* pDoc); @@ -655,12 +655,12 @@ public: const OUString& rNewName ); virtual ~ScUndoUseScenario(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScDocument* pUndoDoc; @@ -680,13 +680,13 @@ public: ScDocument* pNewUndoDoc ); virtual ~ScUndoSelectionStyle(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; - virtual sal_uInt16 GetId() const SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual sal_uInt16 GetId() const override; private: ScMarkData aMarkData; @@ -705,12 +705,12 @@ public: ScDocument* pNewUndoDoc ); virtual ~ScUndoRefreshLink(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScDocument* pUndoDoc; @@ -727,12 +727,12 @@ public: const OUString& rForm ); virtual ~ScUndoEnterMatrix(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScDocument* pUndoDoc; @@ -754,12 +754,12 @@ public: sal_uLong nRefreshDelay ); virtual ~ScUndoInsertAreaLink(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: OUString aDocName; @@ -781,12 +781,12 @@ public: sal_uLong nRefreshDelay ); virtual ~ScUndoRemoveAreaLink(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: OUString aDocName; @@ -814,12 +814,12 @@ public: bool bDoInsert ); virtual ~ScUndoUpdateAreaLink(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: OUString aOldDoc; @@ -849,12 +849,12 @@ public: ScDocument* pNewUndoDoc, bool bIncrement ); virtual ~ScUndoIndent(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScMarkData aMarkData; @@ -870,12 +870,12 @@ public: ScDocument* pNewUndoDoc, sal_Int32 nType ); virtual ~ScUndoTransliterate(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScMarkData aMarkData; @@ -891,12 +891,12 @@ public: ScDocument* pNewUndoDoc, const sal_uInt16* pW ); virtual ~ScUndoClearItems(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScMarkData aMarkData; @@ -912,12 +912,12 @@ public: SCTAB nNewTab, ScDocument* pNewUndoDoc ); virtual ~ScUndoRemoveBreaks(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCTAB nTab; @@ -933,12 +933,12 @@ public: ScDocument* pNewUndoDoc ); virtual ~ScUndoRemoveMerge(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: void SetCurTab(); @@ -958,12 +958,12 @@ public: const SvxBoxInfoItem& rNewInner ); virtual ~ScUndoBorder(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScDocument* pUndoDoc; diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 1f55708cbdfb..2b18611634d9 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -52,12 +52,12 @@ public: const ScPatternAttr* pApplyPat, bool bAutomatic ); virtual ~ScUndoCursorAttr(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; /** once the objects are passed to this class, their life-cycle is managed by this class; the calling function must pass new'ed @@ -101,12 +101,12 @@ public: virtual ~ScUndoEnterData(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ValuesType maOldValues; @@ -130,12 +130,12 @@ public: virtual ~ScUndoEnterValue(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScAddress aPos; @@ -154,11 +154,11 @@ public: virtual ~ScUndoSetCell(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat( SfxRepeatTarget& rTarget ) SAL_OVERRIDE; - virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const SAL_OVERRIDE; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat( SfxRepeatTarget& rTarget ) override; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const override; + virtual OUString GetComment() const override; private: void SetChangeTrack(); @@ -180,12 +180,12 @@ public: bool bNewColumn, bool bNewInsert ); virtual ~ScUndoPageBreak(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCCOL nCol; @@ -205,12 +205,12 @@ public: sal_uInt16 nOS, sal_uInt16 nOP, sal_uInt16 nNS, sal_uInt16 nNP ); virtual ~ScUndoPrintZoom(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCTAB nTab; @@ -231,12 +231,12 @@ public: const ScCellValue& rOldText, const ScCellValue& rNewText ); virtual ~ScUndoThesaurus(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCCOL nCol; @@ -275,12 +275,12 @@ public: virtual ~ScUndoReplaceNote(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat( SfxRepeatTarget& rTarget ) SAL_OVERRIDE; - virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat( SfxRepeatTarget& rTarget ) override; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: void DoInsertNote( const ScNoteData& rNoteData ); @@ -301,12 +301,12 @@ public: ScUndoShowHideNote( ScDocShell& rDocShell, const ScAddress& rPos, bool bShow ); virtual ~ScUndoShowHideNote(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat( SfxRepeatTarget& rTarget ) SAL_OVERRIDE; - virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat( SfxRepeatTarget& rTarget ) override; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScAddress maPos; @@ -322,12 +322,12 @@ public: ScDetOpList* pUndoList = NULL ); virtual ~ScUndoDetective(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: bool bIsDelete; @@ -346,12 +346,12 @@ public: ScRangeName* pOld, ScRangeName* pNew , SCTAB nTab = -1); virtual ~ScUndoRangeNames(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScRangeName* pOldRanges; @@ -375,11 +375,11 @@ public: UndoSetCells( ScDocShell* pDocSh, const ScAddress& rTopPos ); virtual ~UndoSetCells(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual bool CanRepeat( SfxRepeatTarget& ) const SAL_OVERRIDE; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual bool CanRepeat( SfxRepeatTarget& ) const override; + virtual OUString GetComment() const override; CellValues& GetOldValues() { return maOldValues;} void SetNewValues( const std::vector<double>& rVals ); diff --git a/sc/source/ui/inc/undoconvert.hxx b/sc/source/ui/inc/undoconvert.hxx index 99ce97f51e7c..0faafe947214 100644 --- a/sc/source/ui/inc/undoconvert.hxx +++ b/sc/source/ui/inc/undoconvert.hxx @@ -22,9 +22,9 @@ class UndoFormulaToValue : public ScSimpleUndo public: UndoFormulaToValue( ScDocShell* pDocSh, TableValues& rUndoValues ); - virtual OUString GetComment() const SAL_OVERRIDE; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual void Undo() override; + virtual void Redo() override; private: void Execute(); diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 0bfa865a5707..980a7fe3fcdf 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -50,12 +50,12 @@ public: sal_uInt16 nNewLevel, sal_uInt16 nNewEntry, bool bNewShow ); virtual ~ScUndoDoOutline(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCCOLROW nStart; @@ -79,12 +79,12 @@ public: bool bNewColumns, bool bNewMake ); virtual ~ScUndoMakeOutline(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScAddress aBlockStart; @@ -104,12 +104,12 @@ public: bool bNewColumns, sal_uInt16 nNewLevel ); virtual ~ScUndoOutlineLevel(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCCOLROW nStart; @@ -132,12 +132,12 @@ public: bool bNewShow ); virtual ~ScUndoOutlineBlock(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScAddress aBlockStart; @@ -157,12 +157,12 @@ public: ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab ); virtual ~ScUndoRemoveAllOutlines(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScAddress aBlockStart; @@ -181,12 +181,12 @@ public: ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab ); virtual ~ScUndoAutoOutline(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScAddress aBlockStart; @@ -206,12 +206,12 @@ public: ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB ); virtual ~ScUndoSubTotals(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCTAB nTab; @@ -234,12 +234,12 @@ public: bool bSize, const ScRange* pAdvSrc ); virtual ~ScUndoQuery(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SdrUndoAction* pDrawUndo; @@ -268,12 +268,12 @@ public: const OUString& rName, bool bSet ); virtual ~ScUndoAutoFilter(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; }; class ScUndoDBData: public ScSimpleUndo @@ -284,12 +284,12 @@ public: ScDBCollection* pNewUndoColl, ScDBCollection* pNewRedoColl ); virtual ~ScUndoDBData(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScDBCollection* pUndoColl; @@ -307,12 +307,12 @@ public: ScDBData* pNewUndoData, ScDBData* pNewRedoData ); virtual ~ScUndoImportData(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCTAB nTab; @@ -339,12 +339,12 @@ public: const ScRange* pOldQ, const ScRange* pNewQ ); virtual ~ScUndoRepeatDB(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScAddress aBlockStart; @@ -370,12 +370,12 @@ public: bool bMove ); virtual ~ScUndoDataPilot(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScDocument* pOldUndoDoc; @@ -396,12 +396,12 @@ public: ScDBData* pData ); virtual ~ScUndoConsolidate(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScArea aDestArea; @@ -425,12 +425,12 @@ public: bool bColHdr, bool bRowHdr, bool bAdd ); virtual ~ScUndoChartData(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: OUString aChartName; @@ -461,12 +461,12 @@ public: ); virtual ~ScUndoDataForm(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: std::unique_ptr<ScMarkData> mpMarkData; diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index 61bae4b7e2ae..d5d53b669705 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.hxx @@ -39,16 +39,16 @@ public: SfxUndoAction* GetDrawUndo() { return pDrawUndo; } void ForgetDrawUndo(); - virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction) SAL_OVERRIDE; - - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; - virtual OUString GetComment() const SAL_OVERRIDE; - virtual OUString GetRepeatComment(SfxRepeatTarget&) const SAL_OVERRIDE; - virtual sal_uInt16 GetId() const SAL_OVERRIDE; + virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction) override; + + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; + virtual bool Merge( SfxUndoAction *pNextAction ) override; + virtual OUString GetComment() const override; + virtual OUString GetRepeatComment(SfxRepeatTarget&) const override; + virtual sal_uInt16 GetId() const override; }; #endif diff --git a/sc/source/ui/inc/undosort.hxx b/sc/source/ui/inc/undosort.hxx index 283b99f89d13..cdd3181ff6e1 100644 --- a/sc/source/ui/inc/undosort.hxx +++ b/sc/source/ui/inc/undosort.hxx @@ -22,9 +22,9 @@ class UndoSort : public ScSimpleUndo public: UndoSort( ScDocShell* pDocSh, const ReorderParam& rParam ); - virtual OUString GetComment() const SAL_OVERRIDE; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual void Undo() override; + virtual void Redo() override; private: void Execute( bool bUndo ); diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 7487f9076838..ce823a338873 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -65,12 +65,12 @@ public: const ScStyleSaveData& rNew ); virtual ~ScUndoModifyStyle(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; }; class ScUndoApplyPageStyle: public ScSimpleUndo @@ -82,12 +82,12 @@ public: void AddSheetAction( SCTAB nTab, const OUString& rOld ); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: struct ApplyStyleEntry diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 3ffc95dc306b..2058a05f355c 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -52,12 +52,12 @@ public: const OUString& rNewName); virtual ~ScUndoInsertTab(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: OUString sNewName; @@ -79,12 +79,12 @@ public: std::vector<OUString>& newNameList); virtual ~ScUndoInsertTables(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: @@ -108,12 +108,12 @@ public: ScRefUndoData* pRefData ); virtual ~ScUndoDeleteTab(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: std::vector<SCTAB> theTabs; @@ -134,12 +134,12 @@ public: const OUString& rNewName); virtual ~ScUndoRenameTab(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCTAB nTab; @@ -162,12 +162,12 @@ public: virtual ~ScUndoMoveTab(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: std::shared_ptr< ::std::vector<SCTAB> > mpOldTabs; @@ -190,12 +190,12 @@ public: virtual ~ScUndoCopyTab(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: std::shared_ptr< ::std::vector<SCTAB> > mpOldTabs; @@ -220,12 +220,12 @@ public: const ScUndoTabColorInfo::List& rUndoTabColorList); virtual ~ScUndoTabColor(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ScUndoTabColorInfo::List aTabColorList; @@ -245,12 +245,12 @@ public: const ScMarkData& rMark ); virtual ~ScUndoMakeScenario(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: std::unique_ptr<ScMarkData> mpMarkData; @@ -272,12 +272,12 @@ public: SCTAB nNewTab, SCTAB nNewCount ); virtual ~ScUndoImportTab(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCTAB nTab; @@ -297,12 +297,12 @@ public: const OUString& rDoc ); virtual ~ScUndoRemoveLink(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: OUString aDocName; @@ -327,12 +327,12 @@ public: bool bNewShow ); virtual ~ScUndoShowHideTab(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: std::vector<SCTAB> undoTabs; @@ -349,12 +349,12 @@ public: ScUndoDocProtect(ScDocShell* pShell, ::std::unique_ptr<ScDocProtection> && pProtectSettings); virtual ~ScUndoDocProtect(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: ::std::unique_ptr<ScDocProtection> mpProtectSettings; @@ -371,12 +371,12 @@ public: std::unique_ptr<ScTableProtection> && pProtectSettings); virtual ~ScUndoTabProtect(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCTAB mnTab; @@ -393,12 +393,12 @@ public: ScPrintRangeSaver* pOld, ScPrintRangeSaver* pNew ); virtual ~ScUndoPrintRange(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCTAB nTab; @@ -421,12 +421,12 @@ public: virtual ~ScUndoScenarioFlags(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCTAB nTab; @@ -450,12 +450,12 @@ public: virtual ~ScUndoRenameObject(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: OUString aPersistName; // to find object (works only for OLE objects) @@ -472,12 +472,12 @@ public: ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, bool bNewRTL ); virtual ~ScUndoLayoutRTL(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; private: SCTAB nTab; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index c86719d80985..10e4cfe236bc 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -84,12 +84,12 @@ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage public: explicit ScTPValidationValue( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationValue(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rArgSet ); static const sal_uInt16* GetRanges() { return pValueRanges; } - virtual bool FillItemSet( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rArgSet ) override; + virtual void Reset( const SfxItemSet* rArgSet ) override; private: void Init(); @@ -132,7 +132,7 @@ public: class ScRefButtonEx : public ::formula::RefButton { VclPtr<ScTPValidationValue> m_pPage; - virtual void Click() SAL_OVERRIDE; + virtual void Click() override; public: ScRefButtonEx(vcl::Window* pParent, WinBits nStyle) : ::formula::RefButton(pParent, nStyle) @@ -140,7 +140,7 @@ public: { } virtual ~ScRefButtonEx(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetParentPage(ScTPValidationValue *pPage) { m_pPage = pPage; @@ -183,7 +183,7 @@ class ScValidationDlg public: explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL ); virtual ~ScValidationDlg() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { if( m_bOwnRefHdlr ) RemoveRefDlg( false ); @@ -204,13 +204,13 @@ public: void SetModal( bool bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override { if ( m_pHandler && m_pSetReferenceHdl ) (m_pHandler->*m_pSetReferenceHdl)( rRef, pDoc ); } - virtual void SetActive() SAL_OVERRIDE + virtual void SetActive() override { if ( m_pHandler && m_pSetActiveHdl ) (m_pHandler->*m_pSetActiveHdl)(); @@ -219,7 +219,7 @@ public: bool IsRefInputting(){ return m_bRefInputting; } vcl::Window* get_refinput_shrink_parent() { return m_pHBox; } - virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE + virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) override { if( !CanInputStart( pEdit ) ) return; @@ -232,7 +232,7 @@ public: (m_pHandler->*m_pRefInputStartPostHdl)( pEdit, pButton ); } - virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE + virtual void RefInputDone( bool bForced = false ) override { if( !CanInputDone( bForced ) ) return; @@ -251,7 +251,7 @@ public: enum { SLOTID = SID_VALIDITY_REFERENCE }; - bool Close() SAL_OVERRIDE + bool Close() override { if( m_bOwnRefHdlr ) { @@ -275,11 +275,11 @@ private: public: ScTPValidationHelp( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationHelp(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); - virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; + virtual void Reset ( const SfxItemSet* rArgSet ) override; }; class ScTPValidationError : public SfxTabPage @@ -301,11 +301,11 @@ private: public: ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationError(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); - virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; + virtual void Reset ( const SfxItemSet* rArgSet ) override; }; #endif // INCLUDED_SC_SOURCE_UI_INC_VALIDATE_HXX diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index 1030abf4818d..7ae2360e9efa 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -33,7 +33,7 @@ public: /** Opens dialog if IsDialogEnabled() returns true. @descr If after executing the dialog the checkbox "Do not show again" is set, the method DisableDialog() will be called. */ - virtual sal_Int16 Execute() SAL_OVERRIDE; + virtual sal_Int16 Execute() override; /** Called before executing the dialog. If this method returns false, the dialog will not be opened. */ virtual bool IsDialogEnabled(); @@ -48,9 +48,9 @@ public: ScReplaceWarnBox( vcl::Window* pParent ); /** Reads the configuration key "ReplaceCellsWarning". */ - virtual bool IsDialogEnabled() SAL_OVERRIDE; + virtual bool IsDialogEnabled() override; /** Sets the configuration key "ReplaceCellsWarning" to false. */ - virtual void DisableDialog() SAL_OVERRIDE; + virtual void DisableDialog() override; }; #endif diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index b9e50fc41f46..4555d02b3680 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -58,13 +58,13 @@ public: ScXMLSourceDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDoc); virtual ~ScXMLSourceDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetReference(const ScRange& rRange, ScDocument* pDoc) SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual bool IsRefInputMode() const override; + virtual void SetReference(const ScRange& rRange, ScDocument* pDoc) override; + virtual void Deactivate() override; + virtual void SetActive() override; + virtual bool Close() override; private: diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 2a82c9883fcc..b20cd3b88a03 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -43,7 +43,7 @@ public: { m_sWidestAccessString = getWidestTime(*ScGlobal::pLocaleData); } - virtual void Resize() SAL_OVERRIDE + virtual void Resize() override { SvSimpleTable::Resize(); if (isInitialLayout(this)) diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index fb58e94c290d..3482786ae339 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -73,7 +73,7 @@ public: void SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = nNew; } virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) SAL_OVERRIDE; + const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; }; void ScSolverOptionsString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext, diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index bef3220fc23b..ee33e899dff9 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -383,14 +383,14 @@ struct UnOp : Op { } - virtual void addHeader(ScDocument *pDoc, int nTab) const SAL_OVERRIDE + virtual void addHeader(ScDocument *pDoc, int nTab) const override { pDoc->SetString(ScAddress(0,0,nTab), "arg"); pDoc->SetString(ScAddress(1,0,nTab), msOp + "(arg)"); pDoc->SetString(ScAddress(2,0,nTab), "expected"); } - virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const SAL_OVERRIDE + virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const override { double nArg; @@ -426,7 +426,7 @@ struct UnOp : Op } } - virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const SAL_OVERRIDE + virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const override { return "=SUM(" + ScRange(ScAddress(3,1,nTab), @@ -456,7 +456,7 @@ struct BinOp : Op { } - virtual void addHeader(ScDocument *pDoc, int nTab) const SAL_OVERRIDE + virtual void addHeader(ScDocument *pDoc, int nTab) const override { pDoc->SetString(ScAddress(0,0,nTab), "lhs"); pDoc->SetString(ScAddress(1,0,nTab), "rhs"); @@ -464,7 +464,7 @@ struct BinOp : Op pDoc->SetString(ScAddress(3,0,nTab), "expected"); } - virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const SAL_OVERRIDE + virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const override { double nLhs, nRhs; @@ -489,7 +489,7 @@ struct BinOp : Op ",0,1)"); } - virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const SAL_OVERRIDE + virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const override { return "=SUM(" + ScRange(ScAddress(4,1,nTab), @@ -509,7 +509,7 @@ struct Round : Area { } - virtual void addHeader(ScDocument *pDoc, int nTab) const SAL_OVERRIDE + virtual void addHeader(ScDocument *pDoc, int nTab) const override { pDoc->SetString(ScAddress(0,0,nTab), "x"); pDoc->SetString(ScAddress(1,0,nTab), "n"); @@ -517,7 +517,7 @@ struct Round : Area pDoc->SetString(ScAddress(3,0,nTab), "expected"); } - virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const SAL_OVERRIDE + virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const override { const double nX(comphelper::rng::uniform_real_distribution(0, 100)); const int nN(comphelper::rng::uniform_int_distribution(1, 10)); @@ -539,7 +539,7 @@ struct Round : Area ",0,1)"); } - virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const SAL_OVERRIDE + virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const override { return "=SUM(" + ScRange(ScAddress(4,1,nTab), @@ -560,7 +560,7 @@ struct Normdist : Area { } - virtual void addHeader(ScDocument *pDoc, int nTab) const SAL_OVERRIDE + virtual void addHeader(ScDocument *pDoc, int nTab) const override { pDoc->SetString(ScAddress(0,0,nTab), "num"); pDoc->SetString(ScAddress(1,0,nTab), "avg"); @@ -570,7 +570,7 @@ struct Normdist : Area pDoc->SetString(ScAddress(5,0,nTab), "expected"); } - virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const SAL_OVERRIDE + virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const override { const double nNum(comphelper::rng::uniform_real_distribution(0, 100)); const double nAvg(comphelper::rng::uniform_real_distribution(0, 100)); @@ -601,7 +601,7 @@ struct Normdist : Area ",0,1)"); } - virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const SAL_OVERRIDE + virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const override { return "=SUM(" + ScRange(ScAddress(6,1,nTab), @@ -635,14 +635,14 @@ struct Reduction : Op { } - virtual void addHeader(ScDocument *pDoc, int nTab) const SAL_OVERRIDE + virtual void addHeader(ScDocument *pDoc, int nTab) const override { pDoc->SetString(ScAddress(0,0,nTab), "x"); pDoc->SetString(ScAddress(1,0,nTab), msOp); pDoc->SetString(ScAddress(2,0,nTab), "expected"); } - virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const SAL_OVERRIDE + virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const override { double nArg; @@ -680,7 +680,7 @@ struct Reduction : Op } } - virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const SAL_OVERRIDE + virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const override { return "=SUM(" + ScRange(ScAddress(3,1+0,nTab), diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 7f9923bda8f3..b06ab7adb55a 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -36,7 +36,7 @@ class ScCalcOptionsDialog : public ModalDialog public: ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfig& rConfig); virtual ~ScCalcOptionsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK_TYPED( BtnAutomaticSelectHdl, RadioButton&, void ); DECL_LINK_TYPED( DeviceSelHdl, SvTreeListBox*, void ); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 3d20848bcb29..3bb6b6e3d75e 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -47,16 +47,16 @@ public: SfxBindings* pBindings); virtual void DataChanged( - const DataChangedEvent& rEvent) SAL_OVERRIDE; + const DataChangedEvent& rEvent) override; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) SAL_OVERRIDE; + const ::sfx2::sidebar::EnumContext& rContext) override; virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled) SAL_OVERRIDE; + const bool bIsEnabled) override; SfxBindings* GetBindings() { return mpBindings;} @@ -66,7 +66,7 @@ public: const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~AlignmentPropertyPanel(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: //ui controls diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index a8ccd98798d7..3218d2e8fe7b 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -56,16 +56,16 @@ public: SfxBindings* pBindings); virtual void DataChanged( - const DataChangedEvent& rEvent) SAL_OVERRIDE; + const DataChangedEvent& rEvent) override; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) SAL_OVERRIDE; + const ::sfx2::sidebar::EnumContext& rContext) override; virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled) SAL_OVERRIDE; + const bool bIsEnabled) override; SfxBindings* GetBindings() { return mpBindings;} @@ -75,7 +75,7 @@ public: const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~CellAppearancePropertyPanel(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: //ui controls diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index 8772dccb5da0..d957528e5a4a 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -48,7 +48,7 @@ private: public: CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); virtual ~CellBorderStyleControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; } } // end of namespace svx::sidebar diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index 36d2347ac379..247d419bf410 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -47,9 +47,9 @@ private: public: CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); virtual ~CellLineStyleControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - void GetFocus() SAL_OVERRIDE; + void GetFocus() override; void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis); }; diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx index 45cbb91fd509..3d990b788822 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx @@ -35,11 +35,11 @@ private: public: CellLineStyleValueSet( vcl::Window* pParent, const ResId& rResId); virtual ~CellLineStyleValueSet(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetUnit(const OUString* str); void SetSelItem(sal_uInt16 nSel); - virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; + virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; }; } } // end of namespace svx::sidebar diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index b03b6d0df97d..e9e9b1eaf60f 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -42,16 +42,16 @@ public: SfxBindings* pBindings); virtual void DataChanged( - const DataChangedEvent& rEvent) SAL_OVERRIDE; + const DataChangedEvent& rEvent) override; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext& rContext) SAL_OVERRIDE; + const ::sfx2::sidebar::EnumContext& rContext) override; virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled) SAL_OVERRIDE; + const bool bIsEnabled) override; SfxBindings* GetBindings() { return mpBindings;} @@ -61,7 +61,7 @@ public: const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~NumberFormatPropertyPanel(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: //ui controls VclPtr<ListBox> mpLbCategory; diff --git a/sc/source/ui/sidebar/ScPanelFactory.hxx b/sc/source/ui/sidebar/ScPanelFactory.hxx index 517d526e134b..92a88b1ecbf1 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.hxx +++ b/sc/source/ui/sidebar/ScPanelFactory.hxx @@ -52,16 +52,16 @@ public: throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; } } // end of namespace sc::sidebar diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 522f64b2beb5..48f1b9cffbe8 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -161,13 +161,13 @@ class SpanBroadcaster : public sc::ColumnSpanSet::ColumnAction public: SpanBroadcaster( ScDocument& rDoc ) : mrDoc(rDoc), mnCurTab(-1), mnCurCol(-1) {} - virtual void startColumn( ScColumn* pCol ) SAL_OVERRIDE + virtual void startColumn( ScColumn* pCol ) override { mnCurTab = pCol->GetTab(); mnCurCol = pCol->GetCol(); } - virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) SAL_OVERRIDE + virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) override { if (!bVal) return; diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 5df49eefa6cb..a7dd0827e338 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -84,36 +84,36 @@ namespace calc DECLARE_XTYPEPROVIDER() // XListEntrySource - virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) override; // OComponentHelper/XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; + virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const override; // ::comphelper::OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; private: void checkDisposed( ) const; diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 8b23bb56d4f2..6f47116c58da 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -90,39 +90,39 @@ namespace calc DECLARE_XTYPEPROVIDER() // XValueBinding - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getSupportedValueTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsType( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getValue( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getSupportedValueTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsType( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Any SAL_CALL getValue( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; // OComponentHelper/XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; + virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const override; // ::comphelper::OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; private: void checkDisposed( ) const; diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx index 68095b6b48d2..12901ce85614 100644 --- a/sc/source/ui/unoobj/exceldetect.hxx +++ b/sc/source/ui/unoobj/exceldetect.hxx @@ -26,13 +26,13 @@ public: virtual ~ScExcelBiffDetect(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XExtendedFilterDetection virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index a899d101cfc8..293bfc017096 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -177,7 +177,7 @@ public: virtual ~ScUnoEditEngine(); virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, - Color*& rTxtColor, Color*& rFldColor ) SAL_OVERRIDE; + Color*& rTxtColor, Color*& rFldColor ) override; sal_uInt16 CountFields(); SvxFieldData* FindByIndex(sal_uInt16 nIndex); diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index ce80be7ccf31..1dca02c3b02e 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -43,14 +43,14 @@ public: virtual ~ScFilterDetect(); /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XExtendedFilterDetect virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 9098457281ae..9ba379bf67cd 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 (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override { SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object @@ -135,7 +135,7 @@ public: return maCachedObject.hasValue(); } - ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override { SolarMutexGuard aGuard; OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )", @@ -144,7 +144,7 @@ public: throw ::com::sun::star::container::NoSuchElementException(); return maCachedObject; } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { SolarMutexGuard aGuard; ScDocument& rDoc = mpDocShell->GetDocument(); @@ -161,8 +161,8 @@ public: return aNames; } // XElemenAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return uno::Type(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return sal_True; } + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return uno::Type(); } + virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override { return sal_True; } }; @@ -172,7 +172,7 @@ class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper< document::XCodeName public: ScVbaCodeNameProvider( ScDocShell& rDocShell ) : mrDocShell(rDocShell) {} // XCodeNameQuery - OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE + OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException, std::exception ) override { SolarMutexGuard aGuard; OUString sCodeName; @@ -212,7 +212,7 @@ public: } OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE + throw( uno::RuntimeException, std::exception ) 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 03716f8cfcac..dd82b6b9670f 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -1380,7 +1380,7 @@ public: virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -1418,7 +1418,7 @@ public: // XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::RuntimeException, std::exception) override { uno::Sequence< beans::PropertyValue > aProperties; ScMacroInfo* pInfo = getInfo(); @@ -1442,25 +1442,25 @@ public: return uno::Any( aProperties ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException, std::exception) override { uno::Sequence< OUString > aSeq( 1 ); aSeq[ 0 ] = SC_EVENTACC_ONCLICK; return aSeq; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) override { return aName == SC_EVENTACC_ONCLICK; } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Type SAL_CALL getElementType() throw(uno::RuntimeException, std::exception) override { return cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements() throw(uno::RuntimeException, std::exception) override { // elements are always present (but contained property sequences may be empty) return sal_True; diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index d5fc99f72fd7..7f7fac6a7bc5 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -40,7 +40,7 @@ private: OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException ); protected: - virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) override; public: ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext ); @@ -50,88 +50,88 @@ public: static bool getDocumentEventsEnabled(); // XExactName - virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) override; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection() throw(css::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XApplication - virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDisplayAlerts() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getCalculation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCalculation( ::sal_Int32 _calculation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDisplayFormulaBar(sal_Bool _displayformulabar) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getStatusBar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEnableCancelKey( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual sal_Bool SAL_CALL getDisplayFullScreen() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayFullScreen( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDisplayScrollBars() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayScrollBars( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDisplayExcel4Menus() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayExcel4Menus( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual sal_Bool SAL_CALL getDisplayNoteIndicator() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayNoteIndicator( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getShowWindowsInTaskbar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setShowWindowsInTaskbar( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIteration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setIteration( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL wait( double time ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL GoTo( const css::uno::Any& Reference, const css::uno::Any& Scroll ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_OVERRIDE; - virtual double SAL_CALL InchesToPoints( double InchesToPoints ) throw (css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAAPPLICATION_HXX diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index dc6193763319..0736494d97ee 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.hxx @@ -42,21 +42,21 @@ public: ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ); virtual ~ScVbaAssistant(); // XAssistant - virtual sal_Bool SAL_CALL getOn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setOn( sal_Bool _on ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getAnimation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAASSISTANT_HXX diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 7e8143122900..c29ab845474c 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: EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); @@ -116,8 +116,8 @@ public: } } - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mCoordinates.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException, std::exception) SAL_OVERRIDE + 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 { try { @@ -133,11 +133,11 @@ public: } } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<excel::XAxis>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return ( mCoordinates.size() > 0 ); } diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx index 70fe59455b6d..5d3a761b9f25 100644 --- a/sc/source/ui/vba/vbaaxes.hxx +++ b/sc/source/ui/vba/vbaaxes.hxx @@ -30,14 +30,14 @@ 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) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + 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; // 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) SAL_OVERRIDE; - virtual css::uno::Any createCollectionObject(const css::uno::Any&) SAL_OVERRIDE; + 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 createCollectionObject(const css::uno::Any&) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; 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 ); }; diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index d60eb29fe0d2..5c66a3371540 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -39,51 +39,51 @@ class ScVbaAxis : public ScVbaAxis_BASE 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) SAL_OVERRIDE; - virtual css::uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL getAxisTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayUnit( ::sal_Int32 DisplayUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getDisplayUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCrosses( ::sal_Int32 Crosses ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getCrosses( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCrossesAt( double CrossesAt ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getCrossesAt( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setType( ::sal_Int32 Type ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getType( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHasTitle( sal_Bool HasTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getHasTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMinorUnit( double MinorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getMinorUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMinorUnitIsAuto( sal_Bool MinorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMinorUnitIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setReversePlotOrder( sal_Bool ReversePlotOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getReversePlotOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMajorUnit( double MajorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getMajorUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMajorUnitIsAuto( sal_Bool MajorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMajorUnitIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMaximumScale( double MaximumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getMaximumScale( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMaximumScaleIsAuto( sal_Bool MaximumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMaximumScaleIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMinimumScale( double MinimumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getMinimumScale( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMinimumScaleIsAuto( sal_Bool MinimumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMinimumScaleIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getAxisGroup( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setScaleType( ::sal_Int32 ScaleType ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getScaleType( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getHeight( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHeight( double height ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getWidth( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWidth( double width ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTop( double top ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAAXIS_HXX diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx index a42824d8717f..048874bb4530 100644 --- a/sc/source/ui/vba/vbaaxistitle.hxx +++ b/sc/source/ui/vba/vbaaxistitle.hxx @@ -30,8 +30,8 @@ class ScVbaAxisTitle : public AxisTitleBase public: ScVbaAxisTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index 7f94c6b80072..a001908e2029 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -143,11 +143,11 @@ private: } protected: - virtual OUString getServiceImplName() SAL_OVERRIDE + virtual OUString getServiceImplName() override { return OUString("ScVbaBorder"); } - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE + virtual css::uno::Sequence<OUString> getServiceNames() override { static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) @@ -161,14 +161,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) SAL_OVERRIDE + uno::Any SAL_CALL getColor() throw (uno::RuntimeException, std::exception) 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) SAL_OVERRIDE + void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) override { sal_Int32 nColor = 0; _color >>= nColor; @@ -182,7 +182,7 @@ public: throw uno::RuntimeException("No Implementation available" ); } - uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) override { sal_Int32 nColor = 0; XLRGBToOORGB( getColor() ) >>= nColor; @@ -202,7 +202,7 @@ public: return uno::makeAny(nIndex); } - void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) override { sal_Int32 nColor = 0; _colorindex >>= nColor; @@ -210,7 +210,7 @@ public: nColor = 1; setColor( OORGBToXLRGB( m_Palette.getPalette()->getByIndex( --nColor ) ) ); } - uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) override { table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) @@ -232,7 +232,7 @@ public: } throw uno::RuntimeException("Method failed" ); } - void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) override { sal_Int32 nWeight = 0; _weight >>= nWeight; @@ -262,12 +262,12 @@ public: throw uno::RuntimeException("Method failed" ); } - uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) override { // always return xlContinuous; return uno::makeAny( XlLineStyle::xlContinuous ); } - void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) override { // Urk no choice but to silently ignore we don't support this attribute // #TODO would be nice to support the excel line styles @@ -321,11 +321,11 @@ public: { } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { return sizeof( supportedIndexTable ) / sizeof( supportedIndexTable[0] ); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { sal_Int32 nIndex = getTableIndex( Index ); @@ -336,11 +336,11 @@ public: } throw lang::IndexOutOfBoundsException(); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<excel::XBorder>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return sal_True; } @@ -358,12 +358,12 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index 2dfc77d59437..0b961faef6e0 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -32,7 +32,7 @@ class ScVbaPalette; class ScVbaBorders : public ScVbaBorders_BASE { // XEnumerationAccess - virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) override; bool bRangeIsSingleCell; css::uno::Reference< css::beans::XPropertySet > m_xProps; public: @@ -40,25 +40,25 @@ public: virtual ~ScVbaBorders() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + 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; // XBorders // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getLineStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception) SAL_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; // xxxxBASE - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBABORDERS_HXX diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 03853af80033..9b7733dd8e35 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -42,21 +42,21 @@ public: virtual ~ScVbaCharacters() {} // Attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // Methods - virtual void SAL_CALL Insert( const OUString& String ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index e80f7c256c38..9bfa43fe03bf 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -69,26 +69,26 @@ public: bool is3D() throw ( css::uno::RuntimeException ); css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); // Methods - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Activate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL Location( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getLocation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLocation( ::sal_Int32 where, const css::uno::Any& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getHasTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHasTitle( sal_Bool bTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getHasLegend( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHasLegend( sal_Bool bLegend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPlotBy( ::sal_Int32 xlRowCol ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getPlotBy( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index 081dc43ea393..da405ac70964 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -48,14 +48,14 @@ class ScVbaChartObject : public ChartObjectImpl_BASE css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException ); 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) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& sName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; void Activate() throw ( css::script::BasicErrorException ); // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBACHARTOBJECT_HXX diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index 1670a9c3b4b8..3d64cf9f2077 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -41,7 +41,7 @@ class ChartObjectEnumerationImpl : public EnumerationHelperImpl public: 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) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { uno::Any ret; diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index c3eaabf81d4c..9612438681a6 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -45,17 +45,17 @@ public: void removeByName(const OUString& _sChartName); // XChartObjects - virtual ::com::sun::star::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (::com::sun::star::script::BasicErrorException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete( ) throw (::com::sun::star::script::BasicErrorException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (::com::sun::star::script::BasicErrorException, std::exception) override; + virtual void SAL_CALL Delete( ) throw (::com::sun::star::script::BasicErrorException, std::exception) override; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; // ChartObjects_BASE - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBACHARTOBJECTS_HXX diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx index e1542ff63540..9091bbf1a356 100644 --- a/sc/source/ui/vba/vbacharttitle.hxx +++ b/sc/source/ui/vba/vbacharttitle.hxx @@ -29,8 +29,8 @@ class ScVbaChartTitle : public ChartTitleBase public: ScVbaChartTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index 1ad3d501a30d..da75ff9de27d 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -51,20 +51,20 @@ public: virtual ~ScVbaComment() {} // Attributes - virtual OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAuthor( const OUString& _author ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // Methods - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBACOMMENT_HXX diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index ee965328216c..abc868af9ccb 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -50,7 +50,7 @@ public: mxModel( xModel, uno::UNO_SET_THROW ) {} - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { return AnnotationToComment( m_xEnumeration->nextElement(), m_xContext, mxModel ); } diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx index 3255dffc6413..dd5e9a85c039 100644 --- a/sc/source/ui/vba/vbacomments.hxx +++ b/sc/source/ui/vba/vbacomments.hxx @@ -39,13 +39,13 @@ public: virtual ~ScVbaComments() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + 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; // ScVbaComments_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; private: css::uno::Reference< css::frame::XModel > mxModel; diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx index a249803c23e1..8d63ee7f5756 100644 --- a/sc/source/ui/vba/vbadialog.hxx +++ b/sc/source/ui/vba/vbadialog.hxx @@ -33,10 +33,10 @@ public: virtual ~ScVbaDialog() {} // Methods - virtual OUString mapIndexToName( sal_Int32 nIndex ) SAL_OVERRIDE; + virtual OUString mapIndexToName( sal_Int32 nIndex ) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 985dd5c7a501..ed974d4fee91 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -35,11 +35,11 @@ public: virtual ~ScVbaDialogs() {} // XCollection - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBADIALOGS_HXX diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 294a6c284fbd..1957fc075c2a 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -123,28 +123,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) SAL_OVERRIDE; - virtual void SAL_CALL windowClosing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowClosed( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowMinimized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowNormalized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowActivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowDeactivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XWindowListener - virtual void SAL_CALL windowResized( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowMoved( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowShown( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowHidden( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XBorderResizeListener - virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException, std::exception) override; // XChangesListener - virtual void SAL_CALL changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override; private: /** Starts listening to the document model. */ diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 7a8667411062..6d0dbcc0d26b 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -35,19 +35,19 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ScVbaEventsHelper(); - virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; protected: - virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) SAL_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) SAL_OVERRIDE; - virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) SAL_OVERRIDE; + 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; private: /** Checks if selection has been changed compared to selection of last call. diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index fd6274b60eda..eef3261c3465 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -46,32 +46,32 @@ public: virtual ~ScVbaFont();// {} // Attributes - virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getStandardFontSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getStandardFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStandardFont( const css::uno::Any& _standardfont ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getFontStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFontStyle( const css::uno::Any& _fontstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + 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 ; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index 4e9c4646fcf7..70003e883379 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -50,19 +50,19 @@ public: static css::sheet::ConditionOperator retrieveAPIType(sal_Int32 _nVBAType, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition ) throw( css::script::BasicErrorException ); //Methods - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 Operator( bool ) throw (css::script::BasicErrorException) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL Operator( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ) SAL_OVERRIDE; - virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException ) SAL_OVERRIDE; - virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 void setFormula2( const css::uno::Any& _aFormula2) 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 3513e551856b..557cd51ef45d 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -98,12 +98,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) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { try { diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index 45d00018b0c2..7980b7aaa236 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -55,15 +55,15 @@ public: void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( css::script::BasicErrorException ); 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) SAL_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) SAL_OVERRIDE; + 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; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any createCollectionObject(const css::uno::Any&) SAL_OVERRIDE; + 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::Any createCollectionObject(const css::uno::Any&) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #ifdef _MSC_VER diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index fc31ffb31150..b7d72fad2bea 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -49,39 +49,39 @@ typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::excel::XGlobals > ScV virtual ~ScVbaGlobals(); // XGlobals - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Calculate( ) throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) SAL_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 WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_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) SAL_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) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getDebug() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_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; // XMultiServiceFactory - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx index 11b3d53dacd2..17d6c70c2f68 100644 --- a/sc/source/ui/vba/vbahyperlink.hxx +++ b/sc/source/ui/vba/vbahyperlink.hxx @@ -45,19 +45,19 @@ public: virtual ~ScVbaHyperlink(); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAddress() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAddress( const OUString& rAddress ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception) SAL_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 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; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index b3e80e0ca8c5..8623b0487e8f 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -113,12 +113,12 @@ public: void insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override; private: typedef ::std::vector< uno::Reference< excel::XHyperlink > > HyperlinkVector; diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx index 03325fe5aff3..a5233b9632da 100644 --- a/sc/source/ui/vba/vbahyperlinks.hxx +++ b/sc/source/ui/vba/vbahyperlinks.hxx @@ -113,18 +113,18 @@ public: 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) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; // ScVbaCollectionBase - virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) override; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 764af6c56fc5..ca05bd0894f9 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -61,20 +61,20 @@ public: virtual ~ScVbaInterior(){} - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getPattern() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPattern( const css::uno::Any& _pattern ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getPatternColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException, std::exception) SAL_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; //XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/vba/vbamenu.hxx b/sc/source/ui/vba/vbamenu.hxx index 44792a278e60..85c4c6f36a77 100644 --- a/sc/source/ui/vba/vbamenu.hxx +++ b/sc/source/ui/vba/vbamenu.hxx @@ -23,15 +23,15 @@ private: public: 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 ); - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAMENU_HXX diff --git a/sc/source/ui/vba/vbamenubar.hxx b/sc/source/ui/vba/vbamenubar.hxx index ded89e2a7e71..12f6ee622ee4 100644 --- a/sc/source/ui/vba/vbamenubar.hxx +++ b/sc/source/ui/vba/vbamenubar.hxx @@ -23,11 +23,11 @@ private: public: 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 ); - virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAMENUBAR_HXX diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index a30c17317db7..a33407de7457 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -23,11 +23,11 @@ public: 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 ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override { // FIXME: should be add menubar if( hasMoreElements() ) diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx index b714920b43d9..57e234cbf3d1 100644 --- a/sc/source/ui/vba/vbamenubars.hxx +++ b/sc/source/ui/vba/vbamenubars.hxx @@ -28,15 +28,15 @@ public: virtual ~ScVbaMenuBars(); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + 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::Any createCollectionObject( const css::uno::Any& aSource ) override; - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException) SAL_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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAMENUBARS_HXX diff --git a/sc/source/ui/vba/vbamenuitem.hxx b/sc/source/ui/vba/vbamenuitem.hxx index 4165aab1d2e5..46a65ed72291 100644 --- a/sc/source/ui/vba/vbamenuitem.hxx +++ b/sc/source/ui/vba/vbamenuitem.hxx @@ -23,16 +23,16 @@ private: public: 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 ); - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAMENUITEM_HXX diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index 4ef5b911a332..c1ef68428fe0 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -26,11 +26,11 @@ public: 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 ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override { // FIXME: should be add menu if( hasMoreElements() ) diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx index 9404c7db3936..2ad099909673 100644 --- a/sc/source/ui/vba/vbamenuitems.hxx +++ b/sc/source/ui/vba/vbamenuitems.hxx @@ -26,17 +26,17 @@ public: 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 ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + 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::Any createCollectionObject( const css::uno::Any& aSource ) override; // Methods - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) SAL_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) SAL_OVERRIDE; + 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAMENUITEMS_HXX diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index 0960970e0c9f..085b9a7143c8 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -25,11 +25,11 @@ public: 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 ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override { // FIXME: should be add menu if( hasMoreElements() ) diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx index 5a11815b38ec..37e9343f2523 100644 --- a/sc/source/ui/vba/vbamenus.hxx +++ b/sc/source/ui/vba/vbamenus.hxx @@ -26,17 +26,17 @@ public: 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 ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + 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::Any createCollectionObject( const css::uno::Any& aSource ) override; // Methods - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) SAL_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) SAL_OVERRIDE; + 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAMENUS_HXX diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index 0fc00728bfee..072b91e389ca 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -41,30 +41,30 @@ public: virtual ~ScVbaName(); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setNameLocal( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const OUString &rValue ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException, std::exception) SAL_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 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; // Methods - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBANAME_HXX diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index 53faccf0becb..ec276a7fef37 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -47,7 +47,7 @@ class NamesEnumeration : public EnumerationHelperImpl public: 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_xParent( xParent ), m_xNames( xNames ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) 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 ) ) ); diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index b8df3b18f9bf..661f3a509d71 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.hxx @@ -46,8 +46,8 @@ public: virtual ~ScVbaNames(); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + 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; // Methods virtual css::uno::Any SAL_CALL Add( const css::uno::Any& aName , @@ -62,13 +62,13 @@ public: const css::uno::Any& aRefersToR1C1, const css::uno::Any& aRefersToR1C1Local ) throw (css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; // ScVbaNames_BASE - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBANAMES_HXX diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index 7daa4a614895..700a0a1c53d7 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -31,30 +31,30 @@ class ScVbaOLEObject : public OLEObjectImpl_BASE { protected: css::uno::Reference< css::drawing::XControlShape > m_xControlShape; - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; css::uno::Reference< ov::msforms::XControl> m_xControl; public: ScVbaOLEObject( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XControlShape > xControlShape ); // XOLEObject Attributes - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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 (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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 efa8038e142e..862a10e6aeeb 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) SAL_OVERRIDE + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override { return vObjects.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -62,12 +62,12 @@ public: } // Methods XElementAcess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<drawing::XControlShape>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) 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) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( nIndex < m_xIndexAccess->getCount() ) { diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx index a0cfa9a3582d..ef992d2c5857 100644 --- a/sc/source/ui/vba/vbaoleobjects.hxx +++ b/sc/source/ui/vba/vbaoleobjects.hxx @@ -29,19 +29,19 @@ 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) SAL_OVERRIDE; - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException) override; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; public: ScVbaOLEObjects( 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) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + 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; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECTS_HXX diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx index 40640ee7bde9..6bd791d827c3 100644 --- a/sc/source/ui/vba/vbaoutline.hxx +++ b/sc/source/ui/vba/vbaoutline.hxx @@ -35,10 +35,10 @@ public: {} virtual ~ScVbaOutline(){} - virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException, std::exception) override ; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index d14437bdcda4..611dc54c4903 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -64,8 +64,8 @@ public: virtual ~ScVbaHPageBreak(){} // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; //VPageBreak @@ -82,8 +82,8 @@ public: virtual ~ScVbaVPageBreak(); // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 4f442d1c54fd..35c3d4159ea0 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -75,15 +75,15 @@ public: uno::Any Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + 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 { 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) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return sal_True; } @@ -185,12 +185,12 @@ class RangePageBreaksEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: RangePageBreaksEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index 5cdd5ab64da0..bab3d59874e4 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.hxx @@ -46,16 +46,16 @@ public: virtual ~ScVbaHPageBreaks(){} // XHPageBreaks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any createCollectionObject(const css::uno::Any&) SAL_OVERRIDE; + 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::Any createCollectionObject(const css::uno::Any&) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; //VPageBreaks @@ -73,16 +73,16 @@ public: virtual ~ScVbaVPageBreaks(); // XVPageBreaks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception ) override; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException ) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw ( css::uno::RuntimeException ) SAL_OVERRIDE; - virtual css::uno::Any createCollectionObject( const css::uno::Any& ) SAL_OVERRIDE; + 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::Any createCollectionObject( const css::uno::Any& ) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index e7ba2c4569d0..c4b2a8420cea 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.hxx @@ -42,52 +42,52 @@ public: virtual ~ScVbaPageSetup(){} // Attribute - virtual OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException) SAL_OVERRIDE; - void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException) SAL_OVERRIDE; - double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException) SAL_OVERRIDE; - void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getFitToPagesTall() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getFitToPagesWide() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getOrder() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setOrder( sal_Int32 order ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getFirstPageNumber() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFirstPageNumber( sal_Int32 firstPageNumber ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getCenterVertically() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCenterVertically( sal_Bool centerVertically ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getCenterHorizontally() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCenterHorizontally( sal_Bool centerHorizontally ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getPrintHeadings() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 sal_Bool SAL_CALL getPrintGridlines() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPrintGridlines( sal_Bool _printgridlines ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::rtl::OUString SAL_CALL getPrintTitleRows() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getPaperSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) throw (css::uno::RuntimeException, std::exception) SAL_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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index 8619bf27334b..77a0d5dec03a 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) SAL_OVERRIDE + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override { return sizeof(spnDefColorTable8) / sizeof(spnDefColorTable8[0]); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -67,11 +67,11 @@ public: } // Methods XElementAcess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override { return ::cppu::UnoType<sal_Int32>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { return sal_True; } diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx index 654afc872874..046d975d6200 100644 --- a/sc/source/ui/vba/vbapane.hxx +++ b/sc/source/ui/vba/vbapane.hxx @@ -35,15 +35,15 @@ public: const css::uno::Reference< css::sheet::XViewPane >& rViewPane ) throw (css::uno::RuntimeException); // XPane attributes - virtual sal_Int32 SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setScrollColumn( sal_Int32 _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setScrollRow( sal_Int32 _scrollrow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // 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) SAL_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) SAL_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 ) 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; protected: css::uno::Reference< css::frame::XModel > m_xModel; diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx index 50b6232fd732..417d20370c02 100644 --- a/sc/source/ui/vba/vbapivotcache.hxx +++ b/sc/source/ui/vba/vbapivotcache.hxx @@ -32,10 +32,10 @@ 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) SAL_OVERRIDE; + virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTCACHE_HXX diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx index f85a06580d58..b673f6a730ea 100644 --- a/sc/source/ui/vba/vbapivottable.hxx +++ b/sc/source/ui/vba/vbapivottable.hxx @@ -31,10 +31,10 @@ 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) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) throw (css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTTABLE_HXX diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index 8be41a0f66f2..1670b968e1f2 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -35,7 +35,7 @@ class PivotTableEnumeration : public EnumerationHelperImpl public: 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 ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { return DataPilotToPivotTable( m_xEnumeration->nextElement(), m_xContext ); } diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index 970abe8ddf23..531c91b9f2e5 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -31,22 +31,22 @@ typedef CollTestImplHelper< ov::excel::XPivotTables > ScVbaPivotTables_BASE; class ScVbaPivotTables : public ScVbaPivotTables_BASE { - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() override; 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 ); virtual ~ScVbaPivotTables() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + 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; // XPivotTables // ScVbaPivotTables_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; - virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; }; diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index ba05f979daad..f8472f4b25dc 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -298,8 +298,8 @@ class SingleRangeEnumeration : public EnumerationHelper_BASE public: SingleRangeEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xRange( xRange ), mxContext( xContext ), bHasMore( true ) { } - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return bHasMore; } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + 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 { if ( !bHasMore ) throw container::NoSuchElementException(); @@ -322,19 +322,19 @@ private: public: SingleRangeIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ):mxParent( xParent ), m_xRange( xRange ), mxContext( xContext ) {} // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (::uno::RuntimeException, std::exception) SAL_OVERRIDE { return 1; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + 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 { if ( Index != 0 ) throw lang::IndexOutOfBoundsException(); return uno::makeAny( m_xRange ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<table::XCellRange>::get(); } + 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) SAL_OVERRIDE { return sal_True; } + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { return sal_True; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new SingleRangeEnumeration( mxParent, mxContext, m_xRange ); } + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) override { return new SingleRangeEnumeration( mxParent, mxContext, m_xRange ); } }; @@ -345,7 +345,7 @@ class RangesEnumerationImpl : public EnumerationHelperImpl public: 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) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { return lcl_makeRange( m_xParent, m_xContext, m_xEnumeration->nextElement(), mbIsRows, mbIsColumns ); } @@ -359,16 +359,16 @@ 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) SAL_OVERRIDE; + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException) SAL_OVERRIDE { return cppu::UnoType<excel::XRange>::get(); } + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException) override { return cppu::UnoType<excel::XRange>::get(); } - virtual uno::Any createCollectionObject( const uno::Any& aSource ) SAL_OVERRIDE; + virtual uno::Any createCollectionObject( const uno::Any& aSource ) override; - virtual OUString getServiceImplName() SAL_OVERRIDE { return OUString(); } + virtual OUString getServiceImplName() override { return OUString(); } - virtual uno::Sequence< OUString > getServiceNames() SAL_OVERRIDE { return uno::Sequence< OUString >(); } + virtual uno::Sequence< OUString > getServiceNames() override { return uno::Sequence< OUString >(); } }; @@ -625,9 +625,9 @@ public: { } - virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) SAL_OVERRIDE { return mCurElem < mMaxElems; } + virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) override { return mCurElem < mMaxElems; } - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -675,9 +675,9 @@ public: } m_it = m_CellPositions.begin(); } - virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_it != m_CellPositions.end(); } + virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) override { return m_it != m_CellPositions.end(); } - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -710,8 +710,8 @@ protected: uno::Any maValue; public: CellValueSetter( const uno::Any& aValue ); - virtual bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE; - virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE; + virtual bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) override; + virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) override; }; @@ -804,9 +804,9 @@ protected: uno::Any maValue; public: CellValueGetter() {} - virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE; - virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue ) SAL_OVERRIDE; - const uno::Any& getValue() const SAL_OVERRIDE { return maValue; } + virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) override; + virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue ) override; + const uno::Any& getValue() const override { return maValue; } }; @@ -874,7 +874,7 @@ private: public: CellFormulaValueSetter( const uno::Any& aValue, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ):CellValueSetter( aValue ), m_pDoc( pDoc ), m_eGrammar( eGram ){} protected: - bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE + bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) override { OUString sFormula; double aDblValue = 0.0; @@ -923,7 +923,7 @@ private: formula::FormulaGrammar::Grammar m_eGrammar; public: CellFormulaValueGetter(ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ) : CellValueGetter( ), m_pDoc( pDoc ), m_eGrammar( eGram ) {} - virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE + virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) override { uno::Any aValue; aValue <<= xCell->getFormula(); @@ -971,7 +971,7 @@ public: aMatrix[index].realloc( nColCount ); maValue <<= aMatrix; } - void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE + void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) override { mValueGetter.visitNode( x, y, xCell ); @@ -994,7 +994,7 @@ public: aValue >>= aMatrix; nColCount = aMatrix.getLength(); } - virtual void visitNode( sal_Int32 /*x*/, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE + virtual void visitNode( sal_Int32 /*x*/, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) override { if ( y < nColCount ) mCellValueSetter.processValue( aMatrix[ y ], xCell ); @@ -1017,7 +1017,7 @@ public: nColCount = aMatrix[0].getLength(); } - virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE + virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) override { if ( x < nRowCount && y < nColCount ) mCellValueSetter.processValue( aMatrix[ x ][ y ], xCell ); @@ -1042,7 +1042,7 @@ class RangeValueProcessor : public RangeProcessor public: RangeValueProcessor( const uno::Any& rVal ):m_aVal( rVal ) {} virtual ~RangeValueProcessor() {} - virtual void process( const uno::Reference< excel::XRange >& xRange ) SAL_OVERRIDE + virtual void process( const uno::Reference< excel::XRange >& xRange ) override { xRange->setValue( m_aVal ); } @@ -1054,7 +1054,7 @@ class RangeFormulaProcessor : public RangeProcessor public: RangeFormulaProcessor( const uno::Any& rVal ):m_aVal( rVal ) {} virtual ~RangeFormulaProcessor() {} - virtual void process( const uno::Reference< excel::XRange >& xRange ) SAL_OVERRIDE + virtual void process( const uno::Reference< excel::XRange >& xRange ) override { xRange->setFormula( m_aVal ); } @@ -1066,7 +1066,7 @@ class RangeCountProcessor : public RangeProcessor public: RangeCountProcessor():nCount(0){} virtual ~RangeCountProcessor() {} - virtual void process( const uno::Reference< excel::XRange >& xRange ) SAL_OVERRIDE + virtual void process( const uno::Reference< excel::XRange >& xRange ) override { nCount = nCount + xRange->getCount(); } diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 360d0f469b2b..4dfa72b89115 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -114,7 +114,7 @@ class ScVbaRange : public ScVbaRange_BASE void fireChangeEvent(); protected: - virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ) SAL_OVERRIDE; + virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ) override; SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException ); public: 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 ); @@ -134,7 +134,7 @@ public: static const ScRangeList& getScRangeList( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); virtual ~ScVbaRange(); - virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() SAL_OVERRIDE { return this; } + virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() override { return this; } bool isSingleCellRange(); static css::uno::Reference< ov::excel::XRange > getRangeObjectForName( @@ -149,135 +149,135 @@ public: const css::uno::Any &nRowIndex, const css::uno::Any &nColumnIndex ) throw(css::uno::RuntimeException); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const css::uno::Any& aValue ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFormula( const css::uno::Any& rFormula ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getFormulaArray() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFormulaArray(const css::uno::Any& rFormula) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getFormulaR1C1() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFormulaR1C1( const css::uno::Any &rFormula ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; using ScVbaRange_BASE::setNumberFormat; - virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getNumberFormat() throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL setMergeCells( const css::uno::Any& bMerge ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getMergeCells() throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL setWrapText( const css::uno::Any& bIsWrapped ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getWrapText() throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL getComment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getHidden() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getColumnWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setColumnWidth( const css::uno::Any& _columnwidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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) 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) 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) SAL_OVERRIDE; - virtual void SAL_CALL setRowHeight( const css::uno::Any& _rowheight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual css::uno::Reference< ov::excel::XName > SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getWorksheet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getPageBreak() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XValidation > SAL_CALL getValidation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getPrefixCharacter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getShowDetail() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // Methods bool IsRows() const { return mbIsRows; } bool IsColumns() const { return mbIsColumns; } - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Clear() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ClearComments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ClearContents() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ClearFormats() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL HasFormula() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL FillLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL FillRight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL FillUp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL FillDown() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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) SAL_OVERRIDE; + 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) SAL_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) SAL_OVERRIDE; - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows( const css::uno::Any& nIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any &nIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Copy( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Cut( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_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) SAL_OVERRIDE; + 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; 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) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException, std::exception) override; 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) SAL_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) SAL_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) SAL_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) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual void SAL_CALL Delete( const css::uno::Any& Shift ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + 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; 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) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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) SAL_OVERRIDE; - virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Autofit() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_OVERRIDE ; - void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL AutoOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual void SAL_CALL ClearOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Ungroup( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Group( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Merge( const css::uno::Any& Across ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL UnMerge( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getStyle() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Next() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Previous() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL RemoveSubtotal( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL MergeArea() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + 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; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override { return cppu::UnoType<ov::excel::XRange>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; // XDefaultMethod - OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException, std::exception) override; // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); } // #TODO completely rewrite ScVbaRange, it's become a hackfest // it needs to be closer to ScCellRangeBase in that the underlying @@ -288,14 +288,14 @@ public: // * we shouldn't need hacks like this below 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 bool getCellRangesForAddress( sal_uInt16& rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ); - 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) SAL_OVERRIDE; + 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) SAL_OVERRIDE; + throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; // XErrorQuery - virtual sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index bd72c393ab6d..bcc9f86250b3 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -48,17 +48,17 @@ public: virtual ~ScVbaButtonCharacters(); // XCharacters attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XCharacters methods - virtual void SAL_CALL Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE @@ -87,20 +87,20 @@ public: const css::uno::Reference< css::drawing::XShape >& rxShape ) throw (css::uno::RuntimeException); // XSheetObject attributes - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLeft( double fLeft ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTop( double fTop ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWidth( double fWidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHeight( double fHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getPlacement() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; /** Sets default properties after a new object has been created. */ void setDefaultProperties( sal_Int32 nIndex ) throw (css::uno::RuntimeException); @@ -142,16 +142,16 @@ public: ListenerType eListenerType ) throw (css::uno::RuntimeException); // XSheetObject attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setOnAction( const OUString& rMacroName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception) SAL_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 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; // XControlObject attributes - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; protected: sal_Int32 getModelIndexInForm() const throw (css::uno::RuntimeException); @@ -176,27 +176,27 @@ public: const css::uno::Reference< css::drawing::XControlShape >& rxControlShape ) throw (css::uno::RuntimeException); // XButton attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getHorizontalAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHorizontalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getVerticalAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // 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) SAL_OVERRIDE; + const css::uno::Any& rStart, const css::uno::Any& rLength ) throw (css::uno::RuntimeException, std::exception) override; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE protected: - virtual OUString implGetBaseName() const SAL_OVERRIDE; - virtual void implSetDefaultProperties() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString implGetBaseName() const override; + virtual void implSetDefaultProperties() throw (css::uno::RuntimeException) override; }; #endif diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 3916dfea971c..026b85564087 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -98,12 +98,12 @@ public: uno::Any getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override; protected: /** Derived classes return true, if the passed shape is supported by the instance. */ @@ -238,7 +238,7 @@ class ScVbaObjectEnumeration : public SimpleEnumerationBase { public: explicit ScVbaObjectEnumeration( const ScVbaObjectContainerRef& rxContainer ); - virtual uno::Any createCollectionObject( const uno::Any& rSource ) SAL_OVERRIDE; + virtual uno::Any createCollectionObject( const uno::Any& rSource ) override; private: ScVbaObjectContainerRef mxContainer; @@ -344,11 +344,11 @@ public: protected: uno::Reference< container::XIndexContainer > createForm() throw (uno::RuntimeException); - virtual bool implPickShape( const uno::Reference< drawing::XShape >& rxShape ) const SAL_OVERRIDE; - virtual OUString implGetShapeServiceName() const SAL_OVERRIDE; + 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) SAL_OVERRIDE; - virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) SAL_OVERRIDE; + 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; protected: uno::Reference< container::XIndexContainer > mxFormIC; @@ -450,8 +450,8 @@ public: const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException); protected: - virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) SAL_OVERRIDE; - virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const SAL_OVERRIDE; + virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) override; + virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const override; }; ScVbaButtonContainer::ScVbaButtonContainer( diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index 0b18d2a87beb..ebab4216d3cd 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -49,14 +49,14 @@ public: void collectShapes() throw (css::uno::RuntimeException); // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; // ScVbaCollectionBase - virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) SAL_OVERRIDE; - virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) override; + virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) throw (css::uno::RuntimeException) override; protected: ScVbaObjectContainerRef mxContainer; @@ -77,7 +77,7 @@ public: 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) SAL_OVERRIDE; + const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception) override; }; /** Collection containing all button controls from a sheet (not ActiveX controls). */ diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index 26f43a8392e3..0e5ea95e28bb 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -40,20 +40,20 @@ public: 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 ); virtual ~ScVbaStyle(){} static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() SAL_OVERRIDE { return this; }; + 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) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XFormat - virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBASTYLE_HXX diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index aceff332e58a..f51a4954a75b 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -75,11 +75,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) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { try { diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx index b3fa6242a753..ea60d0a8331c 100644 --- a/sc/source/ui/vba/vbastyles.hxx +++ b/sc/source/ui/vba/vbastyles.hxx @@ -36,14 +36,14 @@ public: css::uno::Sequence< OUString > getStyleNames() throw ( css::uno::RuntimeException ); void Delete(const OUString& _sStyleName) throw ( css::script::BasicErrorException ); // 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) SAL_OVERRIDE; + 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; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any createCollectionObject(const css::uno::Any&) SAL_OVERRIDE; + 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::Any createCollectionObject(const css::uno::Any&) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx index 983d593a92a5..f6616e1842a1 100644 --- a/sc/source/ui/vba/vbatextboxshape.hxx +++ b/sc/source/ui/vba/vbatextboxshape.hxx @@ -35,9 +35,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) SAL_OVERRIDE; - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_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::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBATEXTBOXSHAPE_HXX diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx index ec044717ed3b..c50d2bc7549c 100644 --- a/sc/source/ui/vba/vbatextframe.hxx +++ b/sc/source/ui/vba/vbatextframe.hxx @@ -32,10 +32,10 @@ public: ScVbaTextFrame( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext ) throw ( css::lang::IllegalArgumentException ); virtual ~ScVbaTextFrame() {} // Methods - virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx index 8493ceff0712..14e7c430f2d8 100644 --- a/sc/source/ui/vba/vbavalidation.hxx +++ b/sc/source/ui/vba/vbavalidation.hxx @@ -32,31 +32,31 @@ 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) SAL_OVERRIDE; - virtual void SAL_CALL setIgnoreBlank( sal_Bool _ignoreblank ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getInCellDropdown() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInCellDropdown( sal_Bool _incelldropdown ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getShowInput() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setShowInput( sal_Bool _showinput ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getShowError() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setShowError( sal_Bool _showerror ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // Methods - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + 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 500983412dd3..59c326b102b6 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -73,11 +73,11 @@ public: m_it = m_sheets.begin(); } // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return m_it != m_sheets.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( !hasMoreElements() ) { @@ -126,16 +126,16 @@ public: } //XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override { return new SelectedSheetsEnum( m_xContext, sheets, m_xModel ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { return sheets.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( Index < 0 || static_cast< Sheets::size_type >( Index ) >= sheets.size() ) @@ -145,18 +145,18 @@ public: } //XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<excel::XWorksheet>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return ( !sheets.empty() ); } //XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -165,7 +165,7 @@ public: } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override { uno::Sequence< OUString > names( namesToIndices.size() ); OUString* pString = names.getArray(); @@ -176,7 +176,7 @@ public: return names; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index c9931c59bfe1..7475ea4d195c 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.hxx @@ -64,65 +64,65 @@ public: throw (css::uno::RuntimeException); // XWindow - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDisplayGridlines() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayGridlines( sal_Bool _displaygridlines ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDisplayHeadings() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayHeadings( sal_Bool _bDisplayHeadings ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDisplayHorizontalScrollBar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDisplayOutline() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayOutline( sal_Bool _bDisplayOutline ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDisplayVerticalScrollBar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDisplayWorkbookTabs() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getFreezePanes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFreezePanes( sal_Bool _bFreezePanes ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getSplit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSplit( sal_Bool _bSplit ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSplitColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual void SAL_CALL setSplitColumn( sal_Int32 _splitcolumn ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual double SAL_CALL getSplitHorizontal() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual void SAL_CALL setSplitHorizontal( double _splithorizontal ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual sal_Int32 SAL_CALL getSplitRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual void SAL_CALL setSplitRow( sal_Int32 _splitrow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual double SAL_CALL getSplitVertical() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual void SAL_CALL setSplitVertical( double _splitvertical ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual css::uno::Any SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual css::uno::Any SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setZoom(const css::uno::Any& _zoom) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getTabRatio() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual void SAL_CALL setTabRatio( double _tabratio ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + 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 ; // 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) SAL_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) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Selection( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL RangeSelection() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_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 ) 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWINDOW_HXX diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index f02c891b5394..09d52ff62c6c 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -77,12 +77,12 @@ public: m_it = m_components.begin(); } // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return m_it != m_components.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( !hasMoreElements() ) { @@ -97,7 +97,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) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext, m_aApplication ); } @@ -138,16 +138,16 @@ public: } //XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override { return new WindowComponentEnumImpl( m_xContext, m_windows ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { return m_windows.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( Index < 0 || static_cast< Components::size_type >( Index ) >= m_windows.size() ) @@ -156,18 +156,18 @@ public: } //XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<sheet::XSpreadsheetDocument>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return ( !m_windows.empty() ); } //XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -176,7 +176,7 @@ public: } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override { uno::Sequence< OUString > names( namesToIndices.size() ); OUString* pString = names.getArray(); @@ -187,7 +187,7 @@ public: return names; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 574c1a75e748..9876b9c75822 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -35,17 +35,17 @@ public: virtual ~ScVbaWindows() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + 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; // 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 (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWINDOWS_HXX diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index ca0a2e1ebdb0..699f8d359043 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -41,35 +41,35 @@ public: virtual ~ScVbaWorkbook() {} // Attributes - virtual sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getPrecisionAsDisplayed() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // Methods - virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException) SAL_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 (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_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 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 (::com::sun::star::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 Styles( const css::uno::Any& Item ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ResetColors( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getFileFormat( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) throw ( css::uno::RuntimeException, std::exception) SAL_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; // code name - virtual OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + 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) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) 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 78af85ec3e0f..c4f514ea3251 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -81,7 +81,7 @@ class WorkBookEnumImpl : public EnumerationHelperImpl public: 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 ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { uno::Reference< sheet::XSpreadsheetDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return getWorkbook( m_xContext, xDoc, m_xParent ); diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index 8c36b4d0e1dd..ec75007dba74 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -40,18 +40,18 @@ public: virtual ~ScVbaWorkbooks() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + 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; // ScVbaWorkbooks_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; + virtual OUString getServiceImplName() override; + 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) SAL_OVERRIDE; - virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + 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; }; #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index a6cd833d20a7..58d17a17dc29 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -80,87 +80,87 @@ public: css::uno::Reference< ov::excel::XWorksheet > createSheetCopy(css::uno::Reference< ov::excel::XWorksheet> xSheet, bool bAfter); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVisible( sal_Int32 nVisible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getStandardHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getProtectionMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getProtectContents() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getProtectDrawingObjects() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getProtectScenarios() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getUsedRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual css::uno::Any SAL_CALL ChartObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getEnableSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoFilterMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (css::uno::RuntimeException, std::exception) SAL_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 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; // Methods - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Paste( const css::uno::Any& Destination, const css::uno::Any& Link ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual void SAL_CALL Unprotect( const css::uno::Any& Password ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual void SAL_CALL Calculate( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; + 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; // 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) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual css::uno::Any SAL_CALL OLEObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual css::uno::Any SAL_CALL Buttons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL CheckBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL DropDowns( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL GroupBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Labels( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL ListBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL OptionButtons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL ScrollBars( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual void SAL_CALL setEnableCalculation( sal_Bool EnableCalculation ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ShowDataForm( ) throw (css::uno::RuntimeException, std::exception) SAL_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 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; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // CodeName - virtual OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException, std::exception) override; sal_Int16 getSheetID() throw (css::uno::RuntimeException); - 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) SAL_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 ) throw (css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + 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) SAL_OVERRIDE; + virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) 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 0b6541ca8cb7..a0bb2d29ef03 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -65,11 +65,11 @@ class WorkSheetsEnumeration : public ::cppu::WeakImplHelper< container::XEnumera SheetMap::iterator mIt; public: WorkSheetsEnumeration( const SheetMap& sMap ) : mSheetMap( sMap ), mIt( mSheetMap.begin() ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return ( mIt != mSheetMap.end() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -87,16 +87,16 @@ class SheetCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAcc public: SheetCollectionHelper( const SheetMap& sMap ) : mSheetMap( sMap ), cachePos(mSheetMap.begin()) {} // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<sheet::XSpreadsheet>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( !mSheetMap.empty() ); } + 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() ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( *cachePos ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) override { uno::Sequence< OUString > sNames( mSheetMap.size() ); OUString* pString = sNames.getArray(); @@ -110,7 +110,7 @@ public: } return sNames; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override { cachePos = mSheetMap.begin(); SheetMap::iterator it_end = mSheetMap.end(); @@ -124,8 +124,8 @@ public: } // XElementAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mSheetMap.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE + 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 { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -134,7 +134,7 @@ public: } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override { return new WorkSheetsEnumeration( mSheetMap ); } @@ -146,7 +146,7 @@ class SheetsEnumeration : public EnumerationHelperImpl public: 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 ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override { uno::Reference< sheet::XSpreadsheet > xSheet( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); uno::Reference< XHelperInterface > xIf = excel::getUnoSheetModuleObj( xSheet ); diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index 93df52c9c4f9..fcd162b19a89 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -37,7 +37,7 @@ class ScVbaWorksheets : public ScVbaWorksheets_BASE css::uno::Reference< css::sheet::XSpreadsheets > m_xSheets; protected: // ScVbaWorksheets_BASE - virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException) override; public: ScVbaWorksheets( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xSheets, const css::uno::Reference< css::frame::XModel >& xModel ); ScVbaWorksheets( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XEnumerationAccess >& xEnum, const css::uno::Reference< css::frame::XModel >& xModel ); @@ -46,24 +46,24 @@ public: bool isSelectedSheets(); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; + 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; // XWorksheets - virtual css::uno::Any SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVisible( const css::uno::Any& _visible ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; - virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Copy ( const css::uno::Any& Before, const css::uno::Any& After) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 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; // 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) SAL_OVERRIDE; - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException, css::uno::RuntimeException) override; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ); }; diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index 8763e97ace48..af3481e48861 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.hxx @@ -34,16 +34,16 @@ public: ScVbaWSFunction( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~ScVbaWSFunction(){} - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection() throw(css::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 21640bfd496e..32b69d08fbe8 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -218,17 +218,17 @@ private: ScFilterBoxMode eMode; protected: - virtual void LoseFocus() SAL_OVERRIDE; + virtual void LoseFocus() override; void SelectHdl(); public: ScFilterListBox( vcl::Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ); virtual ~ScFilterListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Select() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void Select() override; SCCOL GetCol() const { return nCol; } SCROW GetRow() const { return nRow; } @@ -347,9 +347,9 @@ class ScFilterFloatingWindow : public FloatingWindow public: ScFilterFloatingWindow( vcl::Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); virtual ~ScFilterFloatingWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // required for System FloatingWindows that will not process KeyInput by themselves - virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() override; }; ScFilterFloatingWindow::ScFilterFloatingWindow( vcl::Window* pParent, WinBits nStyle ) : @@ -647,7 +647,7 @@ class AutoFilterAction : public ScMenuFloatingWindow::Action public: AutoFilterAction(ScGridWindow* p, ScGridWindow::AutoFilterMode eMode) : mpWindow(p), meMode(eMode) {} - virtual void execute() SAL_OVERRIDE + virtual void execute() override { mpWindow->UpdateAutoFilterFromMenu(meMode); } @@ -660,7 +660,7 @@ class AutoFilterPopupEndAction : public ScMenuFloatingWindow::Action public: AutoFilterPopupEndAction(ScGridWindow* p, const ScAddress& rPos) : mpWindow(p), maPos(rPos) {} - virtual void execute() SAL_OVERRIDE + virtual void execute() override { mpWindow->RefreshAutoFilterButton(maPos); } diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index c24fd53dc509..cfa402f302bb 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -390,7 +390,7 @@ public: explicit DPFieldPopupOKAction(ScGridWindow* p) : mpGridWindow(p) {} - virtual void execute() SAL_OVERRIDE + virtual void execute() override { mpGridWindow->UpdateDPFromFieldPopupMenu(); } @@ -406,7 +406,7 @@ public: explicit PopupSortAction(const ScAddress& rPos, SortType eType, sal_uInt16 nUserListIndex, ScTabViewShell* pViewShell) : maPos(rPos), meType(eType), mnUserListIndex(nUserListIndex), mpViewShell(pViewShell) {} - virtual void execute() SAL_OVERRIDE + virtual void execute() override { switch (meType) { |