diff options
Diffstat (limited to 'sw/source')
513 files changed, 4798 insertions, 4798 deletions
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index 5049b560b5d2..03d70950a552 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -47,45 +47,45 @@ class SwAccessibleCell : public SwAccessibleContext, protected: // Set states for getAccessibleStateSet. // This derived class additionally sets SELECTABLE(1) and SELECTED(+) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override; - virtual void _InvalidateCursorPos() SAL_OVERRIDE; + virtual void _InvalidateCursorPos() override; virtual ~SwAccessibleCell(); public: SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrm *pCellFrm ); - virtual bool HasCursor() SAL_OVERRIDE; // required by map to remember that object + virtual bool HasCursor() override; // required by map to remember that object // XAccessibleContext /// 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; // 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; // 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 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; - virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE; + virtual void Dispose( bool bRecursive = false ) override; - virtual void InvalidatePosOrSize( const SwRect& rFrm ) SAL_OVERRIDE; + virtual void InvalidatePosOrSize( const SwRect& rFrm ) override; // XInterface @@ -95,68 +95,68 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - 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 { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () SAL_OVERRIDE + virtual void SAL_CALL release( ) throw () override { SwAccessibleContext::release(); }; // 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; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) 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) override; // XAccessibleValue // XAccessibleExtendedAttributes ::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 ; private: SwFrameFormat* GetTableBoxFormat() const; public: virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; + 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; // XAccessibleComponent sal_Int32 SAL_CALL getBackground() - 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; + ::com::sun::star::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 1c96ee6aa403..9a5e5fe4bea8 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -200,121 +200,121 @@ public: // 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; // 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 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. */ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::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; 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; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) - 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& aPoint ) - 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; // 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; /** 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 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; // thread safe C++ interface diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 98fc056cd996..d39f3c7f78ab 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -55,51 +55,51 @@ public: // 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 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 description. virtual OUString SAL_CALL - getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) - 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& aPoint ) - 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; }; /** @@ -116,7 +116,7 @@ class SwAccessibleDocument : public SwAccessibleDocumentBase, protected: // Set states for getAccessibleStateSet. // This derived class additionally sets MULTISELECTABLE(1) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override; virtual ~SwAccessibleDocument(); @@ -130,18 +130,18 @@ 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; // 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 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; // XInterface @@ -151,65 +151,65 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - 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 { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () SAL_OVERRIDE + virtual void SAL_CALL release( ) throw () override { SwAccessibleContext::release(); }; // 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; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) 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) 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; // index has to be treated as global child index. 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; 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; // thread safe C++ interface // The object is not visible an longer and should be destroyed - virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE; + virtual void Dispose( bool bRecursive = false ) override; // XAccessibleComponent sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleGetAccFlowTo ::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; + std::exception) override; }; #endif diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx index 1966f0d0f42b..b3b7f6b5ef82 100644 --- a/sw/source/core/access/accembedded.hxx +++ b/sw/source/core/access/accembedded.hxx @@ -39,40 +39,40 @@ 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; + throw () override; virtual void SAL_CALL release() - throw () SAL_OVERRIDE; + 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; // 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 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 - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleExtendedAttributes 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 ; }; #endif diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index d03b94f0e1ed..dd789dbfb49e 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -41,28 +41,28 @@ public: /// 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; // 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; /** 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 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 - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; static bool IsEndnote( const SwFootnoteFrm *pFrm ); }; diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx index ab1e17e07481..0be3137423c5 100644 --- a/sw/source/core/access/accframebase.hxx +++ b/sw/source/core/access/accframebase.hxx @@ -36,29 +36,29 @@ protected: // Set states for getAccessibleStateSet. // This derived class additionally sets SELECTABLE(1), SELECTED(+), // FOCUSABLE(1) and FOCUSED(+) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override; SwFlyFrm* getFlyFrm() const; bool GetSelectedState( ); SwPaM* GetCrsr(); - virtual void _InvalidateCursorPos() SAL_OVERRIDE; - virtual void _InvalidateFocus() SAL_OVERRIDE; + virtual void _InvalidateCursorPos() override; + virtual void _InvalidateFocus() override; virtual ~SwAccessibleFrameBase(); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: SwAccessibleFrameBase( SwAccessibleMap* pInitMap, sal_Int16 nInitRole, const SwFlyFrm *pFlyFrm ); - virtual bool HasCursor() SAL_OVERRIDE; // required by map to remember that object + virtual bool HasCursor() override; // required by map to remember that object static sal_uInt8 GetNodeType( const SwFlyFrm *pFlyFrm ); // The object is not visible an longer and should be destroyed - virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE; - virtual bool SetSelectedState( bool bSeleted ) SAL_OVERRIDE; + virtual void Dispose( bool bRecursive = false ) override; + virtual bool SetSelectedState( bool bSeleted ) override; }; #endif diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx index 39400c851e7b..4cfc258892b4 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -36,23 +36,23 @@ 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; /** 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 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 - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) 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; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index 97ffa34b783a..fbaf7a64ec17 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -41,31 +41,31 @@ public: /// 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; // 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; /** 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 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 - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleComponent 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/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx index 06570c899969..dd6146f29aee 100644 --- a/sw/source/core/access/acchyperlink.hxx +++ b/sw/source/core/access/acchyperlink.hxx @@ -49,35 +49,35 @@ class SwAccessibleHyperlink : public: // 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; + ::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; + ::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; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleHyperlink virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) 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::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) 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_Int32 SAL_CALL getStartIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getEndIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isValid( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 2cfc34c37605..8d61f361ed7a 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -128,10 +128,10 @@ protected: public: explicit SwDrawModellListener_Impl( SdrModel *pDrawModel ); - virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void Dispose(); }; diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index 196b8eaf6c30..d77f116bb297 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -49,7 +49,7 @@ protected: const SwNoTextNode *GetNoTextNode() const; - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: SwAccessibleNoTextFrame( SwAccessibleMap* pInitMap, @@ -61,12 +61,12 @@ public: // #i73249# - 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 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; // XInterface methods need to be implemented to disambiguate // between those inherited through SwAcessibleContext and @@ -74,62 +74,62 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - 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 { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () SAL_OVERRIDE + virtual void SAL_CALL release( ) throw () override { SwAccessibleContext::release(); }; // 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; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleImage virtual OUString SAL_CALL getAccessibleImageDescription( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getAccessibleImageHeight( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getAccessibleImageWidth( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; // The object is not visible an longer and should be destroyed - virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE; - - virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;//Shen Zhen Jie changed sal_Unicode to sal_uInt32 - 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; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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; - virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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; - 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 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; + virtual void Dispose( bool bRecursive = false ) override; + + virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32 + 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) override; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + 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) override; + virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) 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; + 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) override; // XAccessibleHypertext virtual sal_Int32 SAL_CALL getHyperLinkCount() - 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::XAccessibleHyperlink > SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) 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_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; SwAccessibleMap *GetAccessibleMap(){ return GetMap();} @@ -137,7 +137,7 @@ public: 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; }; #endif diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx index 79a9b9817bc8..84bdabf2da52 100644 --- a/sw/source/core/access/accnotexthyperlink.hxx +++ b/sw/source/core/access/accnotexthyperlink.hxx @@ -47,35 +47,35 @@ public: // 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; + ::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; + ::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; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleHyperlink virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) 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::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) 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_Int32 SAL_CALL getStartIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getEndIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isValid( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index 2fc6e3f7d498..54d4f2858be8 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -41,10 +41,10 @@ protected: // Set states for getAccessibleStateSet. // This derived class additionally sets // FOCUSABLE(1) and FOCUSED(+) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override; - virtual void _InvalidateCursorPos() SAL_OVERRIDE; - virtual void _InvalidateFocus() SAL_OVERRIDE; + virtual void _InvalidateCursorPos() override; + virtual void _InvalidateFocus() override; virtual ~SwAccessiblePage(); @@ -56,23 +56,23 @@ public: // XAccessibleContext methods that need to be overridden virtual OUString SAL_CALL getAccessibleDescription() - 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& sServiceName) - 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< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual bool HasCursor() SAL_OVERRIDE; // required by map to remember that object + virtual bool HasCursor() override; // required by map to remember that object }; #endif diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 735324e3b111..0f684883349e 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -170,12 +170,12 @@ protected: // Set states for getAccessibleStateSet. // This derived class additionally sets MULTILINE(1), MULTISELECTABLE(+), // FOCUSABLE(+) and FOCUSED(+) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override; - virtual void _InvalidateContent( bool bVisibleDataFired ) SAL_OVERRIDE; + virtual void _InvalidateContent( bool bVisibleDataFired ) override; - virtual void _InvalidateCursorPos() SAL_OVERRIDE; - virtual void _InvalidateFocus() SAL_OVERRIDE; + virtual void _InvalidateCursorPos() override; + virtual void _InvalidateFocus() override; virtual ~SwAccessibleParagraph(); @@ -233,7 +233,7 @@ protected: ::com::sun::star::uno::RuntimeException, std::exception); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew) override; public: @@ -242,57 +242,57 @@ public: inline operator ::com::sun::star::accessibility::XAccessibleText *(); - virtual bool HasCursor() SAL_OVERRIDE; // required by map to remember that object + virtual bool HasCursor() override; // required by map to remember that object com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex ); - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleContext // 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 parents locale or throw exception if this object has no // parent yet/anymore. virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; // #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO 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; // XAccessibleComponent virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // #i71385# 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; // 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; // 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 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; // XInterface @@ -302,140 +302,140 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - 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 { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () SAL_OVERRIDE + virtual void SAL_CALL release( ) throw () override { SwAccessibleContext::release(); }; // 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; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) 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) override; // XAccessibleText virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; 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; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getSelectedText( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - 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; - virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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; - 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 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; + std::exception) override; + 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) override; + virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) 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; + 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) override; // XAccessibleEditableText - virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setText( const OUString& sText ) 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; // index has to be treated as global child index. 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; // XAccessibleHypertext virtual sal_Int32 SAL_CALL getHyperLinkCount() - 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::XAccessibleHyperlink > SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) 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_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // #i71360# // XAccesibleTextMarkup virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType ) 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::accessibility::TextSegment SAL_CALL getTextMarkup( sal_Int32 nTextMarkupIndex, sal_Int32 nTextMarkupType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::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::Sequence< ::com::sun::star::accessibility::TextSegment > SAL_CALL getTextMarkupAtIndex( sal_Int32 nCharIndex, sal_Int32 nTextMarkupType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleTextSelection virtual sal_Bool SAL_CALL scrollToPosition( const ::com::sun::star::awt::Point& aPoint, sal_Bool isLeftTop ) - 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 sal_Int32 SAL_CALL getSelectedPortionCount( ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Int32 SAL_CALL addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XAccessibleExtendedAttributes 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 ; bool GetSelectionAtIndex(sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd); sal_Int32 GetRealHeadingLevel(); // XAccessibleComponent @@ -445,24 +445,24 @@ public: // XAccessibleMultiLineText virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex ) 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::accessibility::TextSegment SAL_CALL getTextAtLineNumber( sal_Int32 nLineNo ) 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::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getNumberOfLineWithCaret() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // #i63870# // XAccesibleTextAttributes - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( 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; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; }; inline SwAccessibleParagraph::operator ::com::sun::star::accessibility::XAccessibleText *() diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index 5650b25998da..a23f8b1f76b5 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -97,13 +97,13 @@ public: virtual ~SwAccessiblePortionData(); // SwPortionHandler methods - virtual void Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) SAL_OVERRIDE; - virtual void Special(sal_Int32 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0, const SwFont* pFont = 0) SAL_OVERRIDE; - virtual void LineBreak(sal_Int32 nWidth) SAL_OVERRIDE; - virtual void Skip(sal_Int32 nLength) SAL_OVERRIDE; - virtual void Finish() SAL_OVERRIDE; + virtual void Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) override; + virtual void Special(sal_Int32 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0, const SwFont* pFont = 0) override; + virtual void LineBreak(sal_Int32 nWidth) override; + virtual void Skip(sal_Int32 nLength) override; + virtual void Finish() override; - virtual void SetAttrFieldType( sal_uInt16 nAttrFieldType ) SAL_OVERRIDE; + virtual void SetAttrFieldType( sal_uInt16 nAttrFieldType ) override; bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos ); bool IsIndexInFootnode(sal_Int32 nIndex); bool IsInGrayPortion( sal_Int32 nPos ); diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index 0be84e02fd31..46d8e96afb98 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -43,27 +43,27 @@ 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 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 - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void _InvalidateFocus() SAL_OVERRIDE; + OUString SAL_CALL getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void _InvalidateFocus() override; }; #endif diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 8eacffb88dff..fdf2bfd6250f 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -582,7 +582,7 @@ public: inline bool IsSelected() const { return bSelected; } - virtual void Unselect( sal_Int32, sal_Int32 ) SAL_OVERRIDE; + virtual void Unselect( sal_Int32, sal_Int32 ) override; }; inline SwAccSingleTableSelHander_Impl::SwAccSingleTableSelHander_Impl() : @@ -610,7 +610,7 @@ public: uno::Sequence < sal_Int32 > GetSelSequence(); - virtual void Unselect( sal_Int32 nRowOrCol, sal_Int32 nExt ) SAL_OVERRIDE; + virtual void Unselect( sal_Int32 nRowOrCol, sal_Int32 nExt ) override; virtual ~SwAccAllTableSelHander_Impl(); }; diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 3dec2dd65cae..b05d714b17ed 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -59,7 +59,7 @@ class SwAccessibleTable : protected: // Set states for getAccessibleStateSet. // This derived class additionally sets MULTISELECTABLE(+) - virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; + virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override; virtual ~SwAccessibleTable(); @@ -83,7 +83,7 @@ protected: // Is table data evailable? bool HasTableData() const { return (mpTableData != 0); } - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: SwAccessibleTable( SwAccessibleMap* pInitMap, const SwTabFrm* pTableFrm ); @@ -96,176 +96,176 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - 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 { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () SAL_OVERRIDE + virtual void SAL_CALL release( ) throw () override { SwAccessibleContext::release(); }; // 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; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) 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) override; // XAccessibleContext /// 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; // XAccessibleTable 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; 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; virtual OUString SAL_CALL getAccessibleRowDescription( 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 OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) 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_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; + ::com::sun::star::uno::RuntimeException, 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; + ::com::sun::star::uno::RuntimeException, 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; + 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; + 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; + ::com::sun::star::uno::RuntimeException, 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; + ::com::sun::star::uno::RuntimeException, 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; + ::com::sun::star::uno::RuntimeException, 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; + 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; + 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; + ::com::sun::star::uno::RuntimeException, 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; + ::com::sun::star::uno::RuntimeException, 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; + ::com::sun::star::uno::RuntimeException, 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; + ::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 ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, 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 ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, 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; // 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; /** 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 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; // C++ interface // The object has been moved by the layout - virtual void InvalidatePosOrSize( const SwRect& rOldBox ) SAL_OVERRIDE; + virtual void InvalidatePosOrSize( const SwRect& rOldBox ) override; // The object is not visible an longer and should be destroyed - virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE; + virtual void Dispose( bool bRecursive = false ) override; virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrmOrObj, - bool bRecursive ) SAL_OVERRIDE; + bool bRecursive ) override; virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrmOrObj, - const SwRect& rFrm ) SAL_OVERRIDE; + const SwRect& rFrm ) 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; // index has to be treated as global child index. 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; // XAccessibleComponent sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; typedef std::vector< ::std::pair<SwAccessibleContext*, css::uno::WeakReference<css::accessibility::XAccessible> > > Cells_t; Cells_t m_vecCellAdd; @@ -288,8 +288,8 @@ protected: virtual ~SwAccessibleTableColHeaders() {} - virtual SwAccessibleTableData_Impl* CreateNewTableData() SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual SwAccessibleTableData_Impl* CreateNewTableData() override; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: SwAccessibleTableColHeaders( SwAccessibleMap *pMap, const SwTabFrm *pTabFrm ); @@ -298,36 +298,36 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - 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 { SwAccessibleContext::acquire(); }; - virtual void SAL_CALL release( ) throw () SAL_OVERRIDE + virtual void SAL_CALL release( ) throw () override { SwAccessibleContext::release(); }; // 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; // XAccessibleTable 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; 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; // XServiceInfo @@ -335,7 +335,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; }; #endif diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index ef0673758db3..f16d1a19e826 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -40,56 +40,56 @@ private: protected: virtual ~SwAccessibleTextFrame(); - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrm& rFlyFrm ); 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; - 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; // 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; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // XAccessibleContext // #i73249# - 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 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; // XServiceInfo @@ -97,23 +97,23 @@ 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 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 - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XAccessibleContext::getAccessibleRelationSet @@ -131,7 +131,7 @@ public: 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; }; #endif diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index ff68ce97ccdb..855c3dc350f9 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -1068,8 +1068,8 @@ struct SwFindParaAttr : public SwFindParas virtual ~SwFindParaAttr() { delete pSText; } - virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE; - virtual bool IsReplaceMode() const SAL_OVERRIDE; + virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) override; + virtual bool IsReplaceMode() const override; }; int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion, diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx index 5523a25707c1..19ab4f0da861 100644 --- a/sw/source/core/crsr/findcoll.cxx +++ b/sw/source/core/crsr/findcoll.cxx @@ -37,8 +37,8 @@ struct SwFindParaFormatColl : public SwFindParas : pFormatColl( &rFormatColl ), pReplColl( pRpColl ), rCursor( rCrsr ) {} virtual ~SwFindParaFormatColl() {} - virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE; - virtual bool IsReplaceMode() const SAL_OVERRIDE; + virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) override; + virtual bool IsReplaceMode() const override; }; int SwFindParaFormatColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion, diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index b2cf56cad95c..33a28d1e82d0 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -637,8 +637,8 @@ struct SwFindParaText : public SwFindParas SwFindParaText( const SearchOptions& rOpt, bool bSearchInNotes, bool bRepl, SwCursor& rCrsr ) : m_rSearchOpt( rOpt ), m_rCursor( rCrsr ), m_aSText( rOpt ), m_bReplace( bRepl ), m_bSearchInNotes( bSearchInNotes ) {} - virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE; - virtual bool IsReplaceMode() const SAL_OVERRIDE; + virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) override; + virtual bool IsReplaceMode() const override; virtual ~SwFindParaText(); }; diff --git a/sw/source/core/crsr/overlayrangesoutline.hxx b/sw/source/core/crsr/overlayrangesoutline.hxx index 53684a7f0df3..2bd9b7734249 100644 --- a/sw/source/core/crsr/overlayrangesoutline.hxx +++ b/sw/source/core/crsr/overlayrangesoutline.hxx @@ -35,7 +35,7 @@ namespace sw std::vector< basegfx::B2DRange > maRanges; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; public: OverlayRangesOutline( diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 2251d4dc83a3..0bcfb344757a 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -129,7 +129,7 @@ namespace std::vector<PaMEntry> m_aUnoCrsrEntries; std::vector<PaMEntry> m_aShellCrsrEntries; typedef std::function<void (SwPosition& rPos, sal_Int32 nContent)> updater_t; - virtual void Clear() SAL_OVERRIDE + virtual void Clear() override { m_aBkmkEntries.clear(); m_aRedlineEntries.clear(); @@ -137,11 +137,11 @@ namespace m_aUnoCrsrEntries.clear(); m_aShellCrsrEntries.clear(); } - virtual bool Empty() SAL_OVERRIDE + virtual bool Empty() override { return m_aBkmkEntries.empty() && m_aRedlineEntries.empty() && m_aFlyEntries.empty() && m_aUnoCrsrEntries.empty() && m_aShellCrsrEntries.empty(); } - virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit=false) SAL_OVERRIDE + virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit=false) override { SaveBkmks(pDoc, nNode, nContent); SaveRedlines(pDoc, nNode, nContent); @@ -149,7 +149,7 @@ namespace SaveUnoCrsrs(pDoc, nNode, nContent); SaveShellCrsrs(pDoc, nNode, nContent); } - virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nOffset=0, bool bAuto = false) SAL_OVERRIDE + virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nOffset=0, bool bAuto = false) override { SwContentNode* pCNd = pDoc->GetNodes()[ nNode ]->GetContentNode(); updater_t aUpdater = OffsetUpdater(pCNd, nOffset); @@ -159,7 +159,7 @@ namespace RestoreUnoCrsrs(aUpdater); RestoreShellCrsrs(aUpdater); } - virtual void Restore(SwNode& rNd, sal_Int32 nLen, sal_Int32 nCorrLen) SAL_OVERRIDE + virtual void Restore(SwNode& rNd, sal_Int32 nLen, sal_Int32 nCorrLen) override { SwContentNode* pCNd = rNd.GetContentNode(); SwDoc* pDoc = rNd.GetDoc(); diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index 8e6034d3c42c..75919034e4bc 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -59,7 +59,7 @@ public: static sal_uLong GetElementCount() {return nSwAutoCompleteClientCount;} #endif protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; }; typedef std::vector<SwAutoCompleteClient> SwAutoCompleteClientVector; diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index ad472e8ed2a3..285bfff8210e 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -140,7 +140,7 @@ public: { } - virtual const SwNode& GetEndOfContent() SAL_OVERRIDE + virtual const SwNode& GetEndOfContent() override { return rDoc.GetNodes().GetEndOfContent(); } @@ -156,7 +156,7 @@ public: { } - virtual const SwNode& GetEndOfContent() SAL_OVERRIDE + virtual const SwNode& GetEndOfContent() override { return *m_rIndex.GetNode().EndOfSectionNode(); } @@ -253,9 +253,9 @@ public: LineArrayComparator( const CompareData &rD1, const CompareData &rD2, int nStt1, int nEnd1, int nStt2, int nEnd2 ); - virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE; - virtual int GetLen1() const SAL_OVERRIDE { return nLen1; } - virtual int GetLen2() const SAL_OVERRIDE { return nLen2; } + virtual bool Compare( int nIdx1, int nIdx2 ) const override; + virtual int GetLen1() const override { return nLen1; } + virtual int GetLen2() const override { return nLen2; } }; class WordArrayComparator : public ArrayComparator @@ -271,9 +271,9 @@ public: WordArrayComparator( const SwTextNode *pNode1, const SwTextNode *pNode2 ); virtual ~WordArrayComparator(); - virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE; - virtual int GetLen1() const SAL_OVERRIDE { return nCnt1; } - virtual int GetLen2() const SAL_OVERRIDE { return nCnt2; } + virtual bool Compare( int nIdx1, int nIdx2 ) const override; + virtual int GetLen1() const override { return nCnt1; } + virtual int GetLen2() const override { return nCnt2; } int GetCharSequence( const int *pWordLcs1, const int *pWordLcs2, int *pSubseq1, int *pSubseq2, int nLcsLen ); }; @@ -289,9 +289,9 @@ public: { } - virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE; - virtual int GetLen1() const SAL_OVERRIDE { return pTextNd1->GetText().getLength(); } - virtual int GetLen2() const SAL_OVERRIDE { return pTextNd2->GetText().getLength(); } + virtual bool Compare( int nIdx1, int nIdx2 ) const override; + virtual int GetLen1() const override { return pTextNd1->GetText().getLength(); } + virtual int GetLen2() const override { return pTextNd2->GetText().getLength(); } }; /// Options set in Tools->Options->Writer->Comparison @@ -996,8 +996,8 @@ public: explicit SwCompareLine( const SwNode& rNd ); virtual ~SwCompareLine(); - virtual sal_uLong GetHashValue() const SAL_OVERRIDE; - virtual bool Compare( const CompareLine& rLine ) const SAL_OVERRIDE; + virtual sal_uLong GetHashValue() const override; + virtual bool Compare( const CompareLine& rLine ) const override; static sal_uLong GetTextNodeHashValue( const SwTextNode& rNd, sal_uLong nVal ); static bool CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd ); diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index ddd101aab9b4..14815d9ef2b5 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1109,8 +1109,8 @@ namespace numfunc void InitFont(); /** catches notification about changed default bullet configuration data */ - virtual void Notify( const uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void Notify( const uno::Sequence<OUString>& aPropertyNames ) override; + virtual void ImplCommit() override; // default bullet list configuration data OUString msFontname; @@ -1324,8 +1324,8 @@ namespace numfunc void LoadConfig(); /** catches notification about changed configuration data */ - 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; // configuration data bool mbChangeIndentOnTabAtFirstPosOfFirstListItem; diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx index 11d3b3b63c93..d68377b2ce6d 100644 --- a/sw/source/core/doc/swstylemanager.cxx +++ b/sw/source/core/doc/swstylemanager.cxx @@ -72,14 +72,14 @@ public: {} virtual ~SwStyleManager(); virtual StylePool::SfxItemSet_Pointer_t getAutomaticStyle( const SfxItemSet& rSet, - IStyleAccess::SwAutoStyleFamily eFamily ) SAL_OVERRIDE; + IStyleAccess::SwAutoStyleFamily eFamily ) override; virtual StylePool::SfxItemSet_Pointer_t getByName( const OUString& rName, - IStyleAccess::SwAutoStyleFamily eFamily ) SAL_OVERRIDE; + IStyleAccess::SwAutoStyleFamily eFamily ) override; virtual void getAllStyles( std::vector<StylePool::SfxItemSet_Pointer_t> &rStyles, - IStyleAccess::SwAutoStyleFamily eFamily ) SAL_OVERRIDE; + IStyleAccess::SwAutoStyleFamily eFamily ) override; virtual StylePool::SfxItemSet_Pointer_t cacheAutomaticStyle( const SfxItemSet& rSet, - SwAutoStyleFamily eFamily ) SAL_OVERRIDE; - virtual void clearCaches() SAL_OVERRIDE; + SwAutoStyleFamily eFamily ) override; + virtual void clearCaches() override; }; IStyleAccess *createStyleManager( SfxItemSet* pIgnorableParagraphItems ) diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx index 9058c60c263b..4a7596e0dda1 100644 --- a/sw/source/core/docnode/cancellablejob.hxx +++ b/sw/source/core/docnode/cancellablejob.hxx @@ -35,7 +35,7 @@ public: virtual ~CancellableJob() {} // ::com::sun::star::util::XCancellable: - virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) override; private: CancellableJob( CancellableJob& ) = delete; diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 6390ad7a843a..86dc48d07e71 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -57,7 +57,7 @@ class CancelJobsThread : public osl::Thread css::uno::Reference< css::util::XCancellable > getNextJob(); bool stopped() const; - virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL run() override; mutable osl::Mutex maMutex; std::list< css::uno::Reference< css::util::XCancellable > > maJobs; @@ -164,8 +164,8 @@ class TerminateOfficeThread : public osl::Thread void StopOfficeTermination(); private: - virtual void SAL_CALL run() SAL_OVERRIDE; - virtual void SAL_CALL onTerminated() SAL_OVERRIDE; + virtual void SAL_CALL run() override; + virtual void SAL_CALL onTerminated() override; bool OfficeTerminationStopped(); void PerformOfficeTermination(); diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 09ae5bc27107..e8ec08f70bc0 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -77,13 +77,13 @@ public: rSectFormat( rFormat ) {} - 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 const SwNode* GetAnchor() const SAL_OVERRIDE; + virtual const SwNode* GetAnchor() const override; virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0, - sal_Int32 nEnd = -1 ) const SAL_OVERRIDE; + sal_Int32 nEnd = -1 ) const override; inline SwSectionNode* GetSectNode() { diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index f26d2b30afee..5f8a77550a74 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1998,7 +1998,7 @@ namespace sdr * * This method will not handle included hierarchies and not check geometric visibility. */ - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: VOCOfDrawVirtObj(ObjectContact& rObjectContact, ViewContact& rViewContact) @@ -2017,7 +2017,7 @@ namespace sdr * Always needs to return something. Default is to create a standard ViewObjectContact * containing the given ObjectContact and *this. */ - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; public: /// basic constructor, used from SdrObject. diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 50b31ddcbeb2..04c10c069b80 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -86,7 +86,7 @@ namespace sdr * * @note ONLY based on model data */ - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: /// basic constructor, used from SdrObject. @@ -156,7 +156,7 @@ namespace drawinglayer protected: /// method which is to be used to implement the local decomposition of a 2D primitive - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: SwVirtFlyDrawObjPrimitive( @@ -168,12 +168,12 @@ namespace drawinglayer { } - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; // override to allow callbacks to wrap_DoPaintObject - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; // data read access const SwVirtFlyDrawObj& getSwVirtFlyDrawObj() const { return mrSwVirtFlyDrawObj; } @@ -265,7 +265,7 @@ namespace sdr * * @note ONLY based on model data */ - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: /// basic constructor, used from SdrObject. diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 55177134fa3a..251b591c2d42 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -64,7 +64,7 @@ class SwSdrHdl : public SdrHdl public: SwSdrHdl(const Point& rPnt, bool bTopRight ) : SdrHdl( rPnt, bTopRight ? HDL_ANCHOR_TR : HDL_ANCHOR ) {} - virtual bool IsFocusHdl() const SAL_OVERRIDE; + virtual bool IsFocusHdl() const override; }; bool SwSdrHdl::IsFocusHdl() const diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 66ed9bdaceec..cb4dadd8c371 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -48,13 +48,13 @@ public: rFieldType( rType ) {} - 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 const SwNode* GetAnchor() const SAL_OVERRIDE; + virtual const SwNode* GetAnchor() const override; virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0, - sal_Int32 nEnd = -1 ) const SAL_OVERRIDE; + sal_Int32 nEnd = -1 ) const override; }; ::sfx2::SvBaseLink::UpdateResult SwIntrnlRefLink::DataChanged( const OUString& rMimeType, diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index b18dcc2b096c..2628c7f22c30 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1248,7 +1248,7 @@ namespace { } - virtual bool includeObject( const SdrObject& i_rObject ) const SAL_OVERRIDE + virtual bool includeObject( const SdrObject& i_rObject ) const override { return m_pPV && m_pPV->GetView().IsObjMarkable( const_cast< SdrObject* >( &i_rObject ), m_pPV ); } diff --git a/sw/source/core/inc/DocumentChartDataProviderManager.hxx b/sw/source/core/inc/DocumentChartDataProviderManager.hxx index 17b072d12e43..627178ed5a6e 100644 --- a/sw/source/core/inc/DocumentChartDataProviderManager.hxx +++ b/sw/source/core/inc/DocumentChartDataProviderManager.hxx @@ -45,11 +45,11 @@ public: DocumentChartDataProviderManager( SwDoc& i_rSwdoc ); - SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const SAL_OVERRIDE; + SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const override; - void CreateChartInternalDataProviders( const SwTable *pTable ) SAL_OVERRIDE; + void CreateChartInternalDataProviders( const SwTable *pTable ) override; - SwChartLockController_Helper & GetChartControllerHelper() SAL_OVERRIDE; + SwChartLockController_Helper & GetChartControllerHelper() override; virtual ~DocumentChartDataProviderManager(); diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx b/sw/source/core/inc/DocumentContentOperationsManager.hxx index 3897b3fe24b2..51ed829fe27c 100644 --- a/sw/source/core/inc/DocumentContentOperationsManager.hxx +++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx @@ -39,63 +39,63 @@ public: DocumentContentOperationsManager( SwDoc& i_rSwdoc ); //Interface methods: - bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll, bool bCheckPos ) const SAL_OVERRIDE; + bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll, bool bCheckPos ) const override; - void DeleteSection(SwNode* pNode) SAL_OVERRIDE; + void DeleteSection(SwNode* pNode) override; - bool DeleteRange(SwPaM&) SAL_OVERRIDE; + bool DeleteRange(SwPaM&) override; - bool DelFullPara(SwPaM&) SAL_OVERRIDE; + bool DelFullPara(SwPaM&) override; // Add optional parameter <bForceJoinNext>, default value <false> // Needed for hiding of deletion redlines bool DeleteAndJoin( SwPaM&, - const bool bForceJoinNext = false ) SAL_OVERRIDE; + const bool bForceJoinNext = false ) override; - bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags) SAL_OVERRIDE; + bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags) override; - bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags) SAL_OVERRIDE; + bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags) override; - bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags) SAL_OVERRIDE; + bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags) override; - bool Overwrite(const SwPaM &rRg, const OUString& rStr) SAL_OVERRIDE; + bool Overwrite(const SwPaM &rRg, const OUString& rStr) override; bool InsertString(const SwPaM &rRg, const OUString&, - const SwInsertFlags nInsertMode = SwInsertFlags::EMPTYEXPAND ) SAL_OVERRIDE; + const SwInsertFlags nInsertMode = SwInsertFlags::EMPTYEXPAND ) override; - void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&) SAL_OVERRIDE; + void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&) override; SwFlyFrameFormat* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, - const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE; + const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat*) override; SwFlyFrameFormat* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE; + const SfxItemSet* pGrfAttrSet, SwFrameFormat*) override; - void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj) SAL_OVERRIDE; + void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj) override; - SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) SAL_OVERRIDE; + SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) override; SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE; + const SfxItemSet* pGrfAttrSet, SwFrameFormat*) override; SwFlyFrameFormat* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet, - const SfxItemSet* pGrfAttrSet, SwFrameFormat*) SAL_OVERRIDE; + const SfxItemSet* pGrfAttrSet, SwFrameFormat*) override; - bool SplitNode(const SwPosition &rPos, bool bChkTableStart) SAL_OVERRIDE; + bool SplitNode(const SwPosition &rPos, bool bChkTableStart) override; - bool AppendTextNode(SwPosition& rPos) SAL_OVERRIDE; + bool AppendTextNode(SwPosition& rPos) override; bool ReplaceRange(SwPaM& rPam, const OUString& rNewStr, - const bool bRegExReplace) SAL_OVERRIDE; + const bool bRegExReplace) override; // Add a para for the char attribute exp... bool InsertPoolItem(const SwPaM &rRg, const SfxPoolItem&, - const SetAttrMode nFlags = SetAttrMode::DEFAULT, bool bExpandCharToPara=false) SAL_OVERRIDE; + const SetAttrMode nFlags = SetAttrMode::DEFAULT, bool bExpandCharToPara=false) override; bool InsertItemSet (const SwPaM &rRg, const SfxItemSet&, - const SetAttrMode nFlags = SetAttrMode::DEFAULT) SAL_OVERRIDE; + const SetAttrMode nFlags = SetAttrMode::DEFAULT) override; - void RemoveLeadingWhiteSpace(const SwPosition & rPos ) SAL_OVERRIDE; + void RemoveLeadingWhiteSpace(const SwPosition & rPos ) override; //Non-Interface methods diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx index 5da2b2009be5..25a049c3dfb2 100644 --- a/sw/source/core/inc/DocumentDeviceManager.hxx +++ b/sw/source/core/inc/DocumentDeviceManager.hxx @@ -41,25 +41,25 @@ public: DocumentDeviceManager( SwDoc& i_rSwdoc ); - SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const SAL_OVERRIDE; + SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const override; - void setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ) SAL_OVERRIDE; + void setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ) override; - VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const SAL_OVERRIDE; + VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const override; - void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool ) SAL_OVERRIDE; + void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool ) override; - OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const SAL_OVERRIDE; + OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const override; - void setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes ) SAL_OVERRIDE; + void setReferenceDeviceType(/*[in]*/ bool bNewVirtual, /*[in]*/ bool bNewHiRes ) override; - const JobSetup* getJobsetup() const SAL_OVERRIDE; + const JobSetup* getJobsetup() const override; - void setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) SAL_OVERRIDE; + void setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) override; - const SwPrintData & getPrintData() const SAL_OVERRIDE; + const SwPrintData & getPrintData() const override; - void setPrintData(/*[in]*/ const SwPrintData& rPrtData ) SAL_OVERRIDE; + void setPrintData(/*[in]*/ const SwPrintData& rPrtData ) override; virtual ~DocumentDeviceManager(); diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx index dfa406ff80d3..486657e4b368 100644 --- a/sw/source/core/inc/DocumentDrawModelManager.hxx +++ b/sw/source/core/inc/DocumentDrawModelManager.hxx @@ -44,24 +44,24 @@ public: void DrawNotifyUndoHdl(); //IDocumentDrawModelAccess - virtual const SwDrawModel* GetDrawModel() const SAL_OVERRIDE; - virtual SwDrawModel* GetDrawModel() SAL_OVERRIDE; - virtual SwDrawModel* _MakeDrawModel() SAL_OVERRIDE; - virtual SwDrawModel* GetOrCreateDrawModel() SAL_OVERRIDE; - virtual SdrLayerID GetHeavenId() const SAL_OVERRIDE; - virtual SdrLayerID GetHellId() const SAL_OVERRIDE; - virtual SdrLayerID GetControlsId() const SAL_OVERRIDE; - virtual SdrLayerID GetInvisibleHeavenId() const SAL_OVERRIDE; - virtual SdrLayerID GetInvisibleHellId() const SAL_OVERRIDE; - virtual SdrLayerID GetInvisibleControlsId() const SAL_OVERRIDE; + virtual const SwDrawModel* GetDrawModel() const override; + virtual SwDrawModel* GetDrawModel() override; + virtual SwDrawModel* _MakeDrawModel() override; + virtual SwDrawModel* GetOrCreateDrawModel() override; + virtual SdrLayerID GetHeavenId() const override; + virtual SdrLayerID GetHellId() const override; + virtual SdrLayerID GetControlsId() const override; + virtual SdrLayerID GetInvisibleHeavenId() const override; + virtual SdrLayerID GetInvisibleHellId() const override; + virtual SdrLayerID GetInvisibleControlsId() const override; - virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) SAL_OVERRIDE; + virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) override; - virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const SAL_OVERRIDE; + virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const override; - virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) SAL_OVERRIDE; + virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) override; - virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) SAL_OVERRIDE; + virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) override; virtual ~DocumentDrawModelManager() {} diff --git a/sw/source/core/inc/DocumentExternalDataManager.hxx b/sw/source/core/inc/DocumentExternalDataManager.hxx index 3f36887eac75..781fb081ca67 100644 --- a/sw/source/core/inc/DocumentExternalDataManager.hxx +++ b/sw/source/core/inc/DocumentExternalDataManager.hxx @@ -31,8 +31,8 @@ class DocumentExternalDataManager : public IDocumentExternalData, { public: - void setExternalData( ::sw::tExternalDataType eType, ::sw::tExternalDataPointer pPayload) SAL_OVERRIDE; - ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType) SAL_OVERRIDE; + void setExternalData( ::sw::tExternalDataType eType, ::sw::tExternalDataPointer pPayload) override; + ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType) override; virtual ~DocumentExternalDataManager() {}; }; diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx b/sw/source/core/inc/DocumentFieldsManager.hxx index 441a5766252c..78a7c85713d4 100644 --- a/sw/source/core/inc/DocumentFieldsManager.hxx +++ b/sw/source/core/inc/DocumentFieldsManager.hxx @@ -36,32 +36,32 @@ public: DocumentFieldsManager( SwDoc& i_rSwdoc ); - virtual const SwFieldTypes *GetFieldTypes() const SAL_OVERRIDE; - virtual SwFieldType *InsertFieldType(const SwFieldType &) SAL_OVERRIDE; - virtual SwFieldType *GetSysFieldType( const sal_uInt16 eWhich ) const SAL_OVERRIDE; - virtual SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const SAL_OVERRIDE; - virtual void RemoveFieldType(size_t nField) SAL_OVERRIDE; - virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) SAL_OVERRIDE; - virtual void InsDeletedFieldType(SwFieldType &) SAL_OVERRIDE; - virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) SAL_OVERRIDE; - virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) SAL_OVERRIDE; - virtual void UpdateRefFields(SfxPoolItem* pHt) SAL_OVERRIDE; - virtual void UpdateTableFields(SfxPoolItem* pHt) SAL_OVERRIDE; - virtual void UpdateExpFields(SwTextField* pField, bool bUpdateRefFields) SAL_OVERRIDE; - virtual void UpdateUsrFields() SAL_OVERRIDE; - virtual void UpdatePageFields(SfxPoolItem*) SAL_OVERRIDE; - virtual void LockExpFields() SAL_OVERRIDE; - virtual void UnlockExpFields() SAL_OVERRIDE; - virtual bool IsExpFieldsLocked() const SAL_OVERRIDE; - virtual SwDocUpdateField& GetUpdateFields() const SAL_OVERRIDE; - virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) SAL_OVERRIDE; - virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) SAL_OVERRIDE; - virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) SAL_OVERRIDE; - virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) SAL_OVERRIDE; - virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) SAL_OVERRIDE; - virtual bool IsNewFieldLst() const SAL_OVERRIDE; - virtual void SetNewFieldLst( bool bFlag) SAL_OVERRIDE; - virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) SAL_OVERRIDE; + virtual const SwFieldTypes *GetFieldTypes() const override; + virtual SwFieldType *InsertFieldType(const SwFieldType &) override; + virtual SwFieldType *GetSysFieldType( const sal_uInt16 eWhich ) const override; + virtual SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const override; + virtual void RemoveFieldType(size_t nField) override; + virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) override; + virtual void InsDeletedFieldType(SwFieldType &) override; + virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) override; + virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) override; + virtual void UpdateRefFields(SfxPoolItem* pHt) override; + virtual void UpdateTableFields(SfxPoolItem* pHt) override; + virtual void UpdateExpFields(SwTextField* pField, bool bUpdateRefFields) override; + virtual void UpdateUsrFields() override; + virtual void UpdatePageFields(SfxPoolItem*) override; + virtual void LockExpFields() override; + virtual void UnlockExpFields() override; + virtual bool IsExpFieldsLocked() const override; + virtual SwDocUpdateField& GetUpdateFields() const override; + virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) override; + virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) override; + virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) override; + virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) override; + virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) override; + virtual bool IsNewFieldLst() const override; + virtual void SetNewFieldLst( bool bFlag) override; + virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) override; //Non Interface methods diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx b/sw/source/core/inc/DocumentLayoutManager.hxx index 325851735e84..c15b9ec2dcd2 100644 --- a/sw/source/core/inc/DocumentLayoutManager.hxx +++ b/sw/source/core/inc/DocumentLayoutManager.hxx @@ -37,21 +37,21 @@ public: DocumentLayoutManager( SwDoc& i_rSwdoc ); - virtual const SwViewShell *GetCurrentViewShell() const SAL_OVERRIDE; - virtual SwViewShell *GetCurrentViewShell() SAL_OVERRIDE; //< It must be able to communicate to a SwViewShell.This is going to be removed later. - virtual void SetCurrentViewShell( SwViewShell* pNew ) SAL_OVERRIDE; + virtual const SwViewShell *GetCurrentViewShell() const override; + virtual SwViewShell *GetCurrentViewShell() override; //< It must be able to communicate to a SwViewShell.This is going to be removed later. + virtual void SetCurrentViewShell( SwViewShell* pNew ) override; - virtual const SwRootFrm *GetCurrentLayout() const SAL_OVERRIDE; - virtual SwRootFrm *GetCurrentLayout() SAL_OVERRIDE; - virtual bool HasLayout() const SAL_OVERRIDE; + virtual const SwRootFrm *GetCurrentLayout() const override; + virtual SwRootFrm *GetCurrentLayout() override; + virtual bool HasLayout() const override; - virtual const SwLayouter* GetLayouter() const SAL_OVERRIDE; - virtual SwLayouter* GetLayouter() SAL_OVERRIDE; - virtual void SetLayouter( SwLayouter* pNew ) SAL_OVERRIDE; + virtual const SwLayouter* GetLayouter() const override; + virtual SwLayouter* GetLayouter() override; + virtual void SetLayouter( SwLayouter* pNew ) override; - virtual SwFrameFormat* MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void DelLayoutFormat( SwFrameFormat *pFormat ) SAL_OVERRIDE; - virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor, bool bSetTextFlyAtt, bool bMakeFrms ) SAL_OVERRIDE; + virtual SwFrameFormat* MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet ) override; + virtual void DelLayoutFormat( SwFrameFormat *pFormat ) override; + virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor, bool bSetTextFlyAtt, bool bMakeFrms ) override; //Non Interface methods void ClearSwLayouterEntries(); diff --git a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx index 54b5b21a3fb4..cac16e282e04 100644 --- a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx +++ b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx @@ -39,27 +39,27 @@ public: DocumentLinksAdministrationManager( SwDoc& i_rSwdoc ); - bool IsVisibleLinks() const SAL_OVERRIDE; + bool IsVisibleLinks() const override; - void SetVisibleLinks(bool bFlag) SAL_OVERRIDE; + void SetVisibleLinks(bool bFlag) override; - sfx2::LinkManager& GetLinkManager() SAL_OVERRIDE; + sfx2::LinkManager& GetLinkManager() override; - const sfx2::LinkManager& GetLinkManager() const SAL_OVERRIDE; + const sfx2::LinkManager& GetLinkManager() const override; - void UpdateLinks(bool bUI) SAL_OVERRIDE; + void UpdateLinks(bool bUI) override; - bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const SAL_OVERRIDE; + bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const override; - bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue) SAL_OVERRIDE; + bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue) override; - ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) SAL_OVERRIDE; + ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) override; - bool EmbedAllLinks() SAL_OVERRIDE; + bool EmbedAllLinks() override; - void SetLinksUpdated(const bool bNewLinksUpdated) SAL_OVERRIDE; + void SetLinksUpdated(const bool bNewLinksUpdated) override; - bool LinksUpdated() const SAL_OVERRIDE; + bool LinksUpdated() const override; //Non-Interface method bool SelectServerObj( const OUString& rStr, SwPaM*& rpPam, SwNodeRange*& rpRange ) const; diff --git a/sw/source/core/inc/DocumentListItemsManager.hxx b/sw/source/core/inc/DocumentListItemsManager.hxx index 0074881230be..c08c19e5318e 100644 --- a/sw/source/core/inc/DocumentListItemsManager.hxx +++ b/sw/source/core/inc/DocumentListItemsManager.hxx @@ -34,14 +34,14 @@ public: DocumentListItemsManager(); - void addListItem( const SwNodeNum& rNodeNum ) SAL_OVERRIDE; - void removeListItem( const SwNodeNum& rNodeNum ) SAL_OVERRIDE; + void addListItem( const SwNodeNum& rNodeNum ) override; + void removeListItem( const SwNodeNum& rNodeNum ) override; OUString getListItemText( const SwNodeNum& rNodeNum, const bool bWithNumber = true, - const bool bWithSpacesForLevel = false ) const SAL_OVERRIDE; + const bool bWithSpacesForLevel = false ) const override; - void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const SAL_OVERRIDE; + void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const override; virtual ~DocumentListItemsManager(); diff --git a/sw/source/core/inc/DocumentListsManager.hxx b/sw/source/core/inc/DocumentListsManager.hxx index 20927d33ee9e..bf11ae119989 100644 --- a/sw/source/core/inc/DocumentListsManager.hxx +++ b/sw/source/core/inc/DocumentListsManager.hxx @@ -39,17 +39,17 @@ class DocumentListsManager : public IDocumentListsAccess, DocumentListsManager( SwDoc& i_rSwdoc ); SwList* createList( const OUString& rListId, - const OUString& rDefaultListStyleName ) SAL_OVERRIDE; - void deleteList( const OUString& rListId ) SAL_OVERRIDE; - SwList* getListByName( const OUString& rListId ) const SAL_OVERRIDE; - - SwList* createListForListStyle( const OUString& rListStyleName ) SAL_OVERRIDE; - SwList* getListForListStyle( const OUString& rListStyleName ) const SAL_OVERRIDE; - void deleteListForListStyle( const OUString& rListStyleName ) SAL_OVERRIDE; - void deleteListsByDefaultListStyle( const OUString& rListStyleName ) SAL_OVERRIDE; + const OUString& rDefaultListStyleName ) override; + void deleteList( const OUString& rListId ) override; + SwList* getListByName( const OUString& rListId ) const override; + + SwList* createListForListStyle( const OUString& rListStyleName ) override; + SwList* getListForListStyle( const OUString& rListStyleName ) const override; + void deleteListForListStyle( const OUString& rListStyleName ) override; + void deleteListsByDefaultListStyle( const OUString& rListStyleName ) override; // #i91400# void trackChangeOfListStyleName( const OUString& rListStyleName, - const OUString& rNewListStyleName ) SAL_OVERRIDE; + const OUString& rNewListStyleName ) override; virtual ~DocumentListsManager(); private: diff --git a/sw/source/core/inc/DocumentOutlineNodesManager.hxx b/sw/source/core/inc/DocumentOutlineNodesManager.hxx index 237b435f1bf2..1b932aacb141 100644 --- a/sw/source/core/inc/DocumentOutlineNodesManager.hxx +++ b/sw/source/core/inc/DocumentOutlineNodesManager.hxx @@ -37,15 +37,15 @@ public: //typedef ::std::vector< const SwTextNode* > tSortedOutlineNodeList; - sal_Int32 getOutlineNodesCount() const SAL_OVERRIDE; + sal_Int32 getOutlineNodesCount() const override; - int getOutlineLevel( const sal_Int32 nIdx ) const SAL_OVERRIDE; + int getOutlineLevel( const sal_Int32 nIdx ) const override; OUString getOutlineText( const sal_Int32 nIdx, const bool bWithNumber = true, const bool bWithSpacesForLevel = false, - const bool bWithFootnote = true ) const SAL_OVERRIDE; - SwTextNode* getOutlineNode( const sal_Int32 nIdx ) const SAL_OVERRIDE; - void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const SAL_OVERRIDE; + const bool bWithFootnote = true ) const override; + SwTextNode* getOutlineNode( const sal_Int32 nIdx ) const override; + void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const override; virtual ~DocumentOutlineNodesManager(); diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx index 23578fc814dc..30d04f6f2cb9 100644 --- a/sw/source/core/inc/DocumentRedlineManager.hxx +++ b/sw/source/core/inc/DocumentRedlineManager.hxx @@ -34,81 +34,81 @@ class DocumentRedlineManager : public IDocumentRedlineAccess, public: DocumentRedlineManager( SwDoc& i_rSwdoc ); - virtual RedlineMode_t GetRedlineMode() const SAL_OVERRIDE; + virtual RedlineMode_t GetRedlineMode() const override; - virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode) SAL_OVERRIDE; + virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode) override; - virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode) SAL_OVERRIDE; + virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode) override; - virtual bool IsRedlineOn() const SAL_OVERRIDE; + virtual bool IsRedlineOn() const override; - virtual bool IsIgnoreRedline() const SAL_OVERRIDE; + virtual bool IsIgnoreRedline() const override; - virtual const SwRedlineTable& GetRedlineTable() const SAL_OVERRIDE; - virtual SwRedlineTable& GetRedlineTable() SAL_OVERRIDE; - virtual const SwExtraRedlineTable& GetExtraRedlineTable() const SAL_OVERRIDE; - virtual SwExtraRedlineTable& GetExtraRedlineTable() SAL_OVERRIDE; - virtual bool HasExtraRedlineTable() const SAL_OVERRIDE; + virtual const SwRedlineTable& GetRedlineTable() const override; + virtual SwRedlineTable& GetRedlineTable() override; + virtual const SwExtraRedlineTable& GetExtraRedlineTable() const override; + virtual SwExtraRedlineTable& GetExtraRedlineTable() override; + virtual bool HasExtraRedlineTable() const override; - virtual bool IsInRedlines(const SwNode& rNode) const SAL_OVERRIDE; + virtual bool IsInRedlines(const SwNode& rNode) const override; - virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool AppendRedline(/*[in]*/SwRangeRedline* pPtr, /*[in]*/bool bCallDelete) override; - virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr, /*[in]*/bool bCallDelete) SAL_OVERRIDE; - virtual bool AppendTableCellRedline(/*[in]*/SwTableCellRedline* pPtr, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool AppendTableRowRedline(/*[in]*/SwTableRowRedline* pPtr, /*[in]*/bool bCallDelete) override; + virtual bool AppendTableCellRedline(/*[in]*/SwTableCellRedline* pPtr, /*[in]*/bool bCallDelete) override; - virtual bool SplitRedline(/*[in]*/const SwPaM& rPam) SAL_OVERRIDE; + virtual bool SplitRedline(/*[in]*/const SwPaM& rPam) override; virtual bool DeleteRedline( /*[in]*/const SwPaM& rPam, /*[in]*/bool bSaveInUndo, - /*[in]*/sal_uInt16 nDelType) SAL_OVERRIDE; + /*[in]*/sal_uInt16 nDelType) override; virtual bool DeleteRedline( /*[in]*/const SwStartNode& rSection, /*[in]*/bool bSaveInUndo, - /*[in]*/sal_uInt16 nDelType) SAL_OVERRIDE; + /*[in]*/sal_uInt16 nDelType) override; virtual sal_uInt16 GetRedlinePos( /*[in]*/const SwNode& rNode, - /*[in]*/sal_uInt16 nType) const SAL_OVERRIDE; + /*[in]*/sal_uInt16 nType) const override; - virtual void CompressRedlines() SAL_OVERRIDE; + virtual void CompressRedlines() override; virtual const SwRangeRedline* GetRedline( /*[in]*/const SwPosition& rPos, - /*[in]*/sal_uInt16* pFndPos) const SAL_OVERRIDE; + /*[in]*/sal_uInt16* pFndPos) const override; - virtual bool IsRedlineMove() const SAL_OVERRIDE; + virtual bool IsRedlineMove() const override; - virtual void SetRedlineMove(/*[in]*/bool bFlag) SAL_OVERRIDE; + virtual void SetRedlineMove(/*[in]*/bool bFlag) override; - virtual bool AcceptRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool AcceptRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) override; - virtual bool AcceptRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool AcceptRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) override; - virtual bool RejectRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool RejectRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) override; - virtual bool RejectRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) SAL_OVERRIDE; + virtual bool RejectRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) override; - virtual const SwRangeRedline* SelNextRedline(/*[in]*/SwPaM& rPam) const SAL_OVERRIDE; + virtual const SwRangeRedline* SelNextRedline(/*[in]*/SwPaM& rPam) const override; - virtual const SwRangeRedline* SelPrevRedline(/*[in]*/SwPaM& rPam) const SAL_OVERRIDE; + virtual const SwRangeRedline* SelPrevRedline(/*[in]*/SwPaM& rPam) const override; - virtual void UpdateRedlineAttr() SAL_OVERRIDE; + virtual void UpdateRedlineAttr() override; - virtual sal_uInt16 GetRedlineAuthor() SAL_OVERRIDE; + virtual sal_uInt16 GetRedlineAuthor() override; - virtual sal_uInt16 InsertRedlineAuthor(const OUString& rAuthor) SAL_OVERRIDE; + virtual sal_uInt16 InsertRedlineAuthor(const OUString& rAuthor) override; virtual bool SetRedlineComment( /*[in]*/const SwPaM& rPam, - /*[in]*/const OUString& rComment) SAL_OVERRIDE; + /*[in]*/const OUString& rComment) override; - virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const SAL_OVERRIDE; + virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const override; virtual void SetRedlinePassword( - /*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) SAL_OVERRIDE; + /*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) override; //Non Interface methods; diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx index 9ff978c40b04..8a0f12db218e 100644 --- a/sw/source/core/inc/DocumentSettingManager.hxx +++ b/sw/source/core/inc/DocumentSettingManager.hxx @@ -159,27 +159,27 @@ public: virtual ~DocumentSettingManager(); // IDocumentSettingAccess - virtual bool get(/*[in]*/ DocumentSettingId id) const SAL_OVERRIDE; - virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) SAL_OVERRIDE; - virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const SAL_OVERRIDE; - virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) SAL_OVERRIDE; - virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() SAL_OVERRIDE; - virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const SAL_OVERRIDE; - virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE; - virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ) SAL_OVERRIDE; - virtual SwFieldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE; - virtual void setFieldUpdateFlags( /*[in]*/ SwFieldUpdateFlags eMode ) SAL_OVERRIDE; - virtual SwCharCompressType getCharacterCompressionType() const SAL_OVERRIDE; - virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ) SAL_OVERRIDE; + virtual bool get(/*[in]*/ DocumentSettingId id) const override; + virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) override; + virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const override; + virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) override; + virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() override; + virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const override; + virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const override; + virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ) override; + virtual SwFieldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const override; + virtual void setFieldUpdateFlags( /*[in]*/ SwFieldUpdateFlags eMode ) override; + virtual SwCharCompressType getCharacterCompressionType() const override; + virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ) override; // Replace all compatibility options with those from rSource. void ReplaceCompatibilityOptions(const DocumentSettingManager& rSource); - sal_uInt32 Getn32DummyCompatibilityOptions1() const SAL_OVERRIDE; - void Setn32DummyCompatibilityOptions1( const sal_uInt32 CompatibilityOptions1 ) SAL_OVERRIDE; - sal_uInt32 Getn32DummyCompatibilityOptions2() const SAL_OVERRIDE; - void Setn32DummyCompatibilityOptions2( const sal_uInt32 CompatibilityOptions2 ) SAL_OVERRIDE; + sal_uInt32 Getn32DummyCompatibilityOptions1() const override; + void Setn32DummyCompatibilityOptions1( const sal_uInt32 CompatibilityOptions1 ) override; + sal_uInt32 Getn32DummyCompatibilityOptions2() const override; + void Setn32DummyCompatibilityOptions2( const sal_uInt32 CompatibilityOptions2 ) override; }; diff --git a/sw/source/core/inc/DocumentStateManager.hxx b/sw/source/core/inc/DocumentStateManager.hxx index f5c834384f1f..6d2f831c569f 100644 --- a/sw/source/core/inc/DocumentStateManager.hxx +++ b/sw/source/core/inc/DocumentStateManager.hxx @@ -35,15 +35,15 @@ class DocumentStateManager : public IDocumentState, public: DocumentStateManager( SwDoc& i_rSwdoc ); - void SetModified() SAL_OVERRIDE; - void ResetModified() SAL_OVERRIDE; - bool IsModified() const SAL_OVERRIDE; - bool IsInCallModified() const SAL_OVERRIDE; - bool IsUpdateExpField() const SAL_OVERRIDE; - bool IsNewDoc() const SAL_OVERRIDE; - void SetNewDoc(bool b) SAL_OVERRIDE; - void SetUpdateExpFieldStat(bool b) SAL_OVERRIDE; - void SetLoaded(bool b) SAL_OVERRIDE; + void SetModified() override; + void ResetModified() override; + bool IsModified() const override; + bool IsInCallModified() const override; + bool IsUpdateExpField() const override; + bool IsNewDoc() const override; + void SetNewDoc(bool b) override; + void SetUpdateExpFieldStat(bool b) override; + void SetLoaded(bool b) override; private: SwDoc& m_rDoc; diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx index c62170a348c1..b35aaf5729c1 100644 --- a/sw/source/core/inc/DocumentStatisticsManager.hxx +++ b/sw/source/core/inc/DocumentStatisticsManager.hxx @@ -37,12 +37,12 @@ public: DocumentStatisticsManager( SwDoc& i_rSwdoc ); - void DocInfoChgd(bool isEnableSetModified) SAL_OVERRIDE; - const SwDocStat &GetDocStat() const SAL_OVERRIDE; + void DocInfoChgd(bool isEnableSetModified) override; + const SwDocStat &GetDocStat() const override; SwDocStat & GetDocStat(); //Non const version of the above, not part of the interface. - const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true) SAL_OVERRIDE; - void SetDocStat(const SwDocStat& rStat) SAL_OVERRIDE; - void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true) SAL_OVERRIDE; + const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true) override; + void SetDocStat(const SwDocStat& rStat) override; + void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true) override; virtual ~DocumentStatisticsManager(); diff --git a/sw/source/core/inc/DocumentStylePoolManager.hxx b/sw/source/core/inc/DocumentStylePoolManager.hxx index 363fc959c8ac..0637765e80ec 100644 --- a/sw/source/core/inc/DocumentStylePoolManager.hxx +++ b/sw/source/core/inc/DocumentStylePoolManager.hxx @@ -35,15 +35,15 @@ public: DocumentStylePoolManager( SwDoc& i_rSwdoc ); - virtual SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) SAL_OVERRIDE; - virtual SwFormat* GetFormatFromPool( sal_uInt16 nId ) SAL_OVERRIDE; - virtual SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) SAL_OVERRIDE; - virtual SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) SAL_OVERRIDE; - virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) SAL_OVERRIDE; - virtual SwNumRule* GetNumRuleFromPool( sal_uInt16 nId ) SAL_OVERRIDE; - virtual bool IsPoolTextCollUsed( sal_uInt16 nId ) const SAL_OVERRIDE; - virtual bool IsPoolFormatUsed( sal_uInt16 nId ) const SAL_OVERRIDE; - virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const SAL_OVERRIDE; + virtual SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) override; + virtual SwFormat* GetFormatFromPool( sal_uInt16 nId ) override; + virtual SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) override; + virtual SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) override; + virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) override; + virtual SwNumRule* GetNumRuleFromPool( sal_uInt16 nId ) override; + virtual bool IsPoolTextCollUsed( sal_uInt16 nId ) const override; + virtual bool IsPoolFormatUsed( sal_uInt16 nId ) const override; + virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const override; virtual ~DocumentStylePoolManager(); diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx index d3a276d3f762..a1dbf2e5aa6b 100644 --- a/sw/source/core/inc/DocumentTimerManager.hxx +++ b/sw/source/core/inc/DocumentTimerManager.hxx @@ -39,15 +39,15 @@ public: DocumentTimerManager( SwDoc& i_rSwdoc ); - void StartIdling() SAL_OVERRIDE; + void StartIdling() override; - void StopIdling() SAL_OVERRIDE; + void StopIdling() override; - void BlockIdling() SAL_OVERRIDE; + void BlockIdling() override; - void UnblockIdling() SAL_OVERRIDE; + void UnblockIdling() override; - void StartBackgroundJobs() SAL_OVERRIDE; + void StartBackgroundJobs() override; // Our own 'IdleTimer' calls the following method DECL_LINK_TYPED( DoIdleJobs, Idle *, void ); diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index 479a0ee0f3a9..78be5ea6b3c2 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -37,64 +37,64 @@ namespace sw { public: MarkManager(/*[in/out]*/ SwDoc& rDoc); // IDocumentMarkAccess - virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE; + virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rName, IDocumentMarkAccess::MarkType eMark) override; virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, const OUString& rName, - const OUString& rType) SAL_OVERRIDE; + const OUString& rType) override; virtual sw::mark::IFieldmark* makeNoTextFieldBookmark( const SwPaM& rPaM, const OUString& rName, - const OUString& rType) SAL_OVERRIDE; + const OUString& rType) override; - virtual ::sw::mark::IMark* getMarkForTextNode(const SwTextNode& rTextNode, IDocumentMarkAccess::MarkType eMark) SAL_OVERRIDE; + virtual ::sw::mark::IMark* getMarkForTextNode(const SwTextNode& rTextNode, IDocumentMarkAccess::MarkType eMark) override; virtual sw::mark::IMark* makeAnnotationMark( const SwPaM& rPaM, - const OUString& rName ) SAL_OVERRIDE; + const OUString& rName ) override; - virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM) SAL_OVERRIDE; - virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName) SAL_OVERRIDE; - virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) SAL_OVERRIDE; - virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) SAL_OVERRIDE; + virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM) override; + virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName) override; + virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) override; + virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) override; - virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) SAL_OVERRIDE; + virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) override; // deleters virtual std::shared_ptr<ILazyDeleter> - deleteMark(const const_iterator_t& ppMark) SAL_OVERRIDE; - virtual void deleteMark(const ::sw::mark::IMark* const pMark) SAL_OVERRIDE; - virtual void clearAllMarks() SAL_OVERRIDE; + deleteMark(const const_iterator_t& ppMark) override; + virtual void deleteMark(const ::sw::mark::IMark* const pMark) override; + virtual void clearAllMarks() override; // marks - virtual const_iterator_t getAllMarksBegin() const SAL_OVERRIDE; - virtual const_iterator_t getAllMarksEnd() const SAL_OVERRIDE; - virtual sal_Int32 getAllMarksCount() const SAL_OVERRIDE; - virtual const_iterator_t findMark(const OUString& rName) const SAL_OVERRIDE; + virtual const_iterator_t getAllMarksBegin() const override; + virtual const_iterator_t getAllMarksEnd() const override; + virtual sal_Int32 getAllMarksCount() const override; + virtual const_iterator_t findMark(const OUString& rName) const override; // bookmarks - virtual const_iterator_t getBookmarksBegin() const SAL_OVERRIDE; - virtual const_iterator_t getBookmarksEnd() const SAL_OVERRIDE; - virtual sal_Int32 getBookmarksCount() const SAL_OVERRIDE; - virtual const_iterator_t findBookmark(const OUString& rName) const SAL_OVERRIDE; + virtual const_iterator_t getBookmarksBegin() const override; + virtual const_iterator_t getBookmarksEnd() const override; + virtual sal_Int32 getBookmarksCount() const override; + virtual const_iterator_t findBookmark(const OUString& rName) const override; // Fieldmarks - virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const SAL_OVERRIDE; - virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const SAL_OVERRIDE; - virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& rPos) const SAL_OVERRIDE; + virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const override; + virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const override; + virtual ::sw::mark::IFieldmark* getFieldmarkAfter(const SwPosition& rPos) const override; - virtual ::sw::mark::IFieldmark* getDropDownFor(const SwPosition &rPos) const SAL_OVERRIDE; - virtual std::vector< ::sw::mark::IFieldmark* > getDropDownsFor(const SwPaM &rPaM) const SAL_OVERRIDE; + virtual ::sw::mark::IFieldmark* getDropDownFor(const SwPosition &rPos) const override; + virtual std::vector< ::sw::mark::IFieldmark* > getDropDownsFor(const SwPaM &rPaM) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const; // Annotation Marks - virtual const_iterator_t getAnnotationMarksBegin() const SAL_OVERRIDE; - virtual const_iterator_t getAnnotationMarksEnd() const SAL_OVERRIDE; - virtual sal_Int32 getAnnotationMarksCount() const SAL_OVERRIDE; - virtual const_iterator_t findAnnotationMark( const OUString& rName ) const SAL_OVERRIDE; - virtual sw::mark::IMark* getAnnotationMarkFor(const SwPosition& rPos) const SAL_OVERRIDE; + virtual const_iterator_t getAnnotationMarksBegin() const override; + virtual const_iterator_t getAnnotationMarksEnd() const override; + virtual sal_Int32 getAnnotationMarksCount() const override; + virtual const_iterator_t findAnnotationMark( const OUString& rName ) const override; + virtual sw::mark::IMark* getAnnotationMarkFor(const SwPosition& rPos) const override; - virtual void assureSortedMarkContainers() const SAL_OVERRIDE; + virtual void assureSortedMarkContainers() const override; private: // make names diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx index 17c566b6a430..4ef492711bc9 100644 --- a/sw/source/core/inc/SwGrammarMarkUp.hxx +++ b/sw/source/core/inc/SwGrammarMarkUp.hxx @@ -42,8 +42,8 @@ public: SwGrammarMarkUp( const SwGrammarMarkUp* ); virtual ~SwGrammarMarkUp(); - virtual SwWrongList* Clone() SAL_OVERRIDE; - virtual void CopyFrom( const SwWrongList& rCopy ) SAL_OVERRIDE; + virtual SwWrongList* Clone() override; + virtual void CopyFrom( const SwWrongList& rCopy ) override; /* SwWrongList::Move() + handling of maSentence */ void MoveGrammar( sal_Int32 nPos, sal_Int32 nDiff ); diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx index 48881f766d1c..a5f588ce815a 100644 --- a/sw/source/core/inc/SwUndoFmt.hxx +++ b/sw/source/core/inc/SwUndoFmt.hxx @@ -46,10 +46,10 @@ public: SwDoc * pDoc); virtual ~SwUndoFormatCreate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; virtual SwFormat * Create(SwFormat * pDerivedFrom) = 0; virtual void Delete() = 0; @@ -70,10 +70,10 @@ public: SwUndoFormatDelete(SwUndoId nUndoId, SwFormat * pOld, SwDoc * pDoc); virtual ~SwUndoFormatDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; virtual SwFormat * Create(SwFormat * pDerivedFrom) = 0; virtual void Delete(SwFormat * pFormat) = 0; @@ -92,10 +92,10 @@ public: SwDoc * pDoc); virtual ~SwUndoRenameFormat(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - SwRewriter GetRewriter() const SAL_OVERRIDE; + SwRewriter GetRewriter() const override; virtual SwFormat * Find(const OUString & rName) const = 0; }; @@ -106,9 +106,9 @@ public: SwUndoTextFormatCollCreate(SwTextFormatColl * pNew, SwTextFormatColl * pDerivedFrom, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete() SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete() override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoTextFormatCollDelete : public SwUndoFormatDelete @@ -116,23 +116,23 @@ class SwUndoTextFormatCollDelete : public SwUndoFormatDelete public: SwUndoTextFormatCollDelete(SwTextFormatColl * pOld, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete(SwFormat * pFormat) SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete(SwFormat * pFormat) override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoCondTextFormatCollCreate : public SwUndoTextFormatCollCreate { public: SwUndoCondTextFormatCollCreate(SwConditionTextFormatColl * pNew, SwTextFormatColl * pDerivedFrom, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; }; class SwUndoCondTextFormatCollDelete : public SwUndoTextFormatCollDelete { public: SwUndoCondTextFormatCollDelete(SwTextFormatColl * pOld, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; }; class SwUndoRenameFormatColl : public SwUndoRenameFormat @@ -142,7 +142,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoCharFormatCreate : public SwUndoFormatCreate @@ -151,9 +151,9 @@ public: SwUndoCharFormatCreate(SwCharFormat * pNew, SwCharFormat * pDerivedFrom, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete() SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete() override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoCharFormatDelete : public SwUndoFormatDelete @@ -161,9 +161,9 @@ class SwUndoCharFormatDelete : public SwUndoFormatDelete public: SwUndoCharFormatDelete(SwCharFormat * pOld, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete(SwFormat * pFormat) SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete(SwFormat * pFormat) override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoRenameCharFormat : public SwUndoRenameFormat @@ -173,7 +173,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoFrameFormatCreate : public SwUndoFormatCreate @@ -184,9 +184,9 @@ public: SwUndoFrameFormatCreate(SwFrameFormat * pNew, SwFrameFormat * pDerivedFrom, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete() SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete() override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoFrameFormatDelete : public SwUndoFormatDelete @@ -194,9 +194,9 @@ class SwUndoFrameFormatDelete : public SwUndoFormatDelete public: SwUndoFrameFormatDelete(SwFrameFormat * pOld, SwDoc * pDoc); - virtual SwFormat * Create(SwFormat * pDerivedFrom) SAL_OVERRIDE; - virtual void Delete(SwFormat * pFormat) SAL_OVERRIDE; - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Create(SwFormat * pDerivedFrom) override; + virtual void Delete(SwFormat * pFormat) override; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoRenameFrameFormat : public SwUndoRenameFormat @@ -206,7 +206,7 @@ public: const OUString & sNewName, SwDoc * pDoc); - virtual SwFormat * Find(const OUString & rName) const SAL_OVERRIDE; + virtual SwFormat * Find(const OUString & rName) const override; }; class SwUndoNumruleCreate : public SwUndo @@ -219,10 +219,10 @@ class SwUndoNumruleCreate : public SwUndo public: SwUndoNumruleCreate(const SwNumRule * pNew, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - SwRewriter GetRewriter() const SAL_OVERRIDE; + SwRewriter GetRewriter() const override; }; class SwUndoNumruleDelete : public SwUndo @@ -233,10 +233,10 @@ class SwUndoNumruleDelete : public SwUndo public: SwUndoNumruleDelete(const SwNumRule & aRule, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - SwRewriter GetRewriter() const SAL_OVERRIDE; + SwRewriter GetRewriter() const override; }; class SwUndoNumruleRename : public SwUndo @@ -248,10 +248,10 @@ class SwUndoNumruleRename : public SwUndo SwUndoNumruleRename(const OUString & aOldName, const OUString & aNewName, SwDoc * pDoc); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - SwRewriter GetRewriter() const SAL_OVERRIDE; + SwRewriter GetRewriter() const override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOFMT_HXX diff --git a/sw/source/core/inc/SwUndoPageDesc.hxx b/sw/source/core/inc/SwUndoPageDesc.hxx index a8c7c13668a6..34b2851904f5 100644 --- a/sw/source/core/inc/SwUndoPageDesc.hxx +++ b/sw/source/core/inc/SwUndoPageDesc.hxx @@ -40,10 +40,10 @@ public: SwDoc * pDoc); virtual ~SwUndoPageDesc(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; }; class SwUndoPageDescCreate : public SwUndo @@ -58,11 +58,11 @@ public: SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc); virtual ~SwUndoPageDescCreate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; }; class SwUndoPageDescDelete : public SwUndo @@ -76,11 +76,11 @@ public: SwUndoPageDescDelete(const SwPageDesc & aOld, SwDoc * pDoc); virtual ~SwUndoPageDescDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; }; #endif // _SW_UNDO_PAGE_DESC_CHANGE_HXX diff --git a/sw/source/core/inc/SwUndoTOXChange.hxx b/sw/source/core/inc/SwUndoTOXChange.hxx index ed6aeca07608..c3964a861124 100644 --- a/sw/source/core/inc/SwUndoTOXChange.hxx +++ b/sw/source/core/inc/SwUndoTOXChange.hxx @@ -34,9 +34,9 @@ public: SwUndoTOXChange(SwTOXBase * pTOX, const SwTOXBase & rNew); virtual ~SwUndoTOXChange(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index 9aed97903670..bb1d0232c4bd 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -37,10 +37,10 @@ public: com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLBlockListExport() {} - sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE; - void _ExportAutoStyles() SAL_OVERRIDE {} - void _ExportMasterStyles () SAL_OVERRIDE {} - void _ExportContent() SAL_OVERRIDE {} + sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) override; + void _ExportAutoStyles() override {} + void _ExportMasterStyles () override {} + void _ExportContent() override {} }; class SwXMLTextBlockExport : public SvXMLExport @@ -56,11 +56,11 @@ public: com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLTextBlockExport() {} - sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) SAL_OVERRIDE {return 0;} + sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) override {return 0;} sal_uInt32 exportDoc(const OUString & rText); - void _ExportAutoStyles() SAL_OVERRIDE {} - void _ExportMasterStyles () SAL_OVERRIDE {} - void _ExportContent() SAL_OVERRIDE {} + void _ExportAutoStyles() override {} + void _ExportMasterStyles () override {} + void _ExportContent() override {} }; #endif diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index f6044938adb4..31c28c15b4e6 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -41,7 +41,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext* CreateFastContext( sal_Int32 Element, - const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) SAL_OVERRIDE; + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; public: SwXMLBlockListImport( @@ -62,7 +62,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext* CreateFastContext( sal_Int32 Element, - const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) SAL_OVERRIDE; + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; public: bool bTextOnly; @@ -74,7 +74,7 @@ public: virtual ~SwXMLTextBlockImport() throw(); virtual void SAL_CALL endDocument() - 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; }; enum SwXMLTextBlockToken : sal_Int32 @@ -96,12 +96,12 @@ public: //XFastTokenHandler sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //Much fast direct C++ shortcut to the method that matters - virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const SAL_OVERRIDE; + virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const override; }; enum SwXMLBlockListToken : sal_Int32 @@ -125,12 +125,12 @@ public: //XFastTokenHandler sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //Much fast direct C++ shortcut to the method that matters - virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const SAL_OVERRIDE; + virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const override; }; #endif diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 110dca125389..2767df653223 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -53,38 +53,38 @@ public: SwXMLTextBlocks( const OUString& rFile ); SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFile ); void AddName( const OUString&, const OUString&, const OUString&, bool bOnlyText = false ); - virtual void AddName( const OUString&, const OUString&, bool bOnlyText = false ) SAL_OVERRIDE; + virtual void AddName( const OUString&, const OUString&, bool bOnlyText = false ) override; static OUString GeneratePackageName ( const OUString& rShort ); virtual ~SwXMLTextBlocks(); - virtual sal_uLong Delete( sal_uInt16 ) SAL_OVERRIDE; - virtual sal_uLong Rename( sal_uInt16, const OUString&, const OUString& ) SAL_OVERRIDE; - virtual sal_uLong CopyBlock( SwImpBlocks& rImp, OUString& rShort, const OUString& rLong) SAL_OVERRIDE; - virtual void ClearDoc() SAL_OVERRIDE; - virtual sal_uLong GetDoc( sal_uInt16 ) SAL_OVERRIDE; - virtual sal_uLong BeginPutDoc( const OUString&, const OUString& ) SAL_OVERRIDE; - virtual sal_uLong PutDoc() SAL_OVERRIDE; - virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ) SAL_OVERRIDE; - virtual sal_uLong MakeBlockList() SAL_OVERRIDE; - - virtual short GetFileType() const SAL_OVERRIDE; - virtual sal_uLong OpenFile( bool bReadOnly = true ) SAL_OVERRIDE; - virtual void CloseFile() SAL_OVERRIDE; + virtual sal_uLong Delete( sal_uInt16 ) override; + virtual sal_uLong Rename( sal_uInt16, const OUString&, const OUString& ) override; + virtual sal_uLong CopyBlock( SwImpBlocks& rImp, OUString& rShort, const OUString& rLong) override; + virtual void ClearDoc() override; + virtual sal_uLong GetDoc( sal_uInt16 ) override; + virtual sal_uLong BeginPutDoc( const OUString&, const OUString& ) override; + virtual sal_uLong PutDoc() override; + virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ) override; + virtual sal_uLong MakeBlockList() override; + + virtual short GetFileType() const override; + virtual sal_uLong OpenFile( bool bReadOnly = true ) override; + virtual void CloseFile() override; static bool IsFileUCBStorage( const OUString & rFileName); // Methods for the new Autocorrecter sal_uLong GetText( const OUString& rShort, OUString& ); - virtual bool IsOnlyTextBlock( const OUString& rShort ) const SAL_OVERRIDE; + virtual bool IsOnlyTextBlock( const OUString& rShort ) const override; bool IsOnlyTextBlock( sal_uInt16 nIdx ) const; void SetIsTextOnly( const OUString& rShort, bool bNewValue ); virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTable, - bool bFileAlreadyOpen = false ) SAL_OVERRIDE; + bool bFileAlreadyOpen = false ) override; virtual sal_uLong SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTable, - bool bFileAlreadyOpen = false ) SAL_OVERRIDE; - virtual bool PutMuchEntries( bool bOn ) SAL_OVERRIDE; + bool bFileAlreadyOpen = false ) override; + virtual bool PutMuchEntries( bool bOn ) override; public: SwDoc* GetDoc() const { return pDoc; } diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index 632f606a92d3..42eb62a61b2d 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -43,34 +43,34 @@ 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& rPropertyName, 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; + 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) 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; + 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& rPropertyName, 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& rPropertyName, 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& rPropertyName, 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& rPropertyName, 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; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::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 >& rPropertyNames ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) - 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; - 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/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index a6ed6feed14c..f0320d924cfb 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -50,9 +50,9 @@ public: virtual ~SwUndoAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SaveRedlineData( const SwPaM& rPam, bool bInsContent ); @@ -71,9 +71,9 @@ public: virtual ~SwUndoResetAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetAttrs( const std::set<sal_uInt16> &rAttrs ); @@ -115,11 +115,11 @@ public: virtual ~SwUndoFormatAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; void PutAttr( const SfxPoolItem& rItem ); SwFormat* GetFormat( SwDoc& rDoc ); // checks if it is still in the Doc! @@ -133,8 +133,8 @@ class SwUndoFormatResetAttr : public SwUndo const sal_uInt16 nWhichId ); virtual ~SwUndoFormatResetAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; private: // format at which a certain attribute is reset. @@ -153,9 +153,9 @@ class SwUndoDontExpandFormat : public SwUndo public: SwUndoDontExpandFormat( const SwPosition& rPos ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; // helper class to receive changed attribute sets @@ -167,7 +167,7 @@ class SwUndoFormatAttrHelper : public SwClient public: SwUndoFormatAttrHelper( SwFormat& rFormat, bool bSaveDrawPt = true ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; SwUndoFormatAttr* GetUndo() const { return m_pUndo.get(); } // release the undo object (so it is not deleted here), and return it @@ -184,9 +184,9 @@ public: virtual ~SwUndoMoveLeftMargin(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; SwHistory& GetHistory() { return *m_pHistory; } @@ -203,8 +203,8 @@ public: virtual ~SwUndoDefaultAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoChangeFootNote : public SwUndo, private SwUndRng @@ -219,9 +219,9 @@ public: sal_uInt16 nNum, bool bIsEndNote ); virtual ~SwUndoChangeFootNote(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; SwHistory& GetHistory() { return *m_pHistory; } }; @@ -235,8 +235,8 @@ public: virtual ~SwUndoFootNoteInfo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoEndNoteInfo : public SwUndo @@ -248,8 +248,8 @@ public: virtual ~SwUndoEndNoteInfo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOATTRIBUTE_HXX diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx index 82524568d3d6..7cfb4624f5fe 100644 --- a/sw/source/core/inc/UndoBookmark.hxx +++ b/sw/source/core/inc/UndoBookmark.hxx @@ -55,7 +55,7 @@ public: @return the rewriter for this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; }; class SwUndoInsBookmark : public SwUndoBookmark @@ -63,8 +63,8 @@ class SwUndoInsBookmark : public SwUndoBookmark public: SwUndoInsBookmark( const ::sw::mark::IMark& ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoDeleteBookmark : public SwUndoBookmark @@ -72,8 +72,8 @@ class SwUndoDeleteBookmark : public SwUndoBookmark public: SwUndoDeleteBookmark( const ::sw::mark::IMark& ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoRenameBookmark : public SwUndo @@ -86,10 +86,10 @@ public: virtual ~SwUndoRenameBookmark(); private: - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; static void Rename( ::sw::UndoRedoContext &, const OUString& sFrom, const OUString& sTo ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx index c3e219e1f132..d97f7faa1ab7 100644 --- a/sw/source/core/inc/UndoCore.hxx +++ b/sw/source/core/inc/UndoCore.hxx @@ -162,9 +162,9 @@ public: const bool bResetListAttrs ); virtual ~SwUndoFormatColl(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; /** Returns the rewriter for this undo object. @@ -179,7 +179,7 @@ public: @return the rewriter for this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; SwHistory* GetHistory() { return pHistory; } @@ -197,17 +197,17 @@ class SwUndoSetFlyFormat : public SwUndo, public SwClient bool bAnchorChgd; void PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem ); - void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; void GetAnchor( SwFormatAnchor& rAnhor, sal_uLong nNode, sal_Int32 nContent ); public: SwUndoSetFlyFormat( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFrameFormat ); virtual ~SwUndoSetFlyFormat(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; void DeRegisterFromFormat( SwFormat& ); }; @@ -218,9 +218,9 @@ class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng public: SwUndoOutlineLeftRight( const SwPaM& rPam, short nOffset ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; const int nUndoStringLength = 20; diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx index 7316cc9d7b85..dd6724273265 100644 --- a/sw/source/core/inc/UndoDelete.hxx +++ b/sw/source/core/inc/UndoDelete.hxx @@ -70,9 +70,9 @@ public: bool bCalledByTableCpy = false ); virtual ~SwUndoDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; /** Returns rewriter for this undo object. @@ -84,7 +84,7 @@ public: @return rewriter for this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; bool CanGrouping( SwDoc*, const SwPaM& ); diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx index f1b8fa59d6f8..b603c263a132 100644 --- a/sw/source/core/inc/UndoDraw.hxx +++ b/sw/source/core/inc/UndoDraw.hxx @@ -42,10 +42,10 @@ public: virtual ~SwSdrUndo(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; }; class SwUndoDrawGroup : public SwUndo @@ -59,8 +59,8 @@ public: virtual ~SwUndoDrawGroup(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void AddObj( sal_uInt16 nPos, SwDrawFrameFormat*, SdrObject* ); void SetGroupFormat( SwDrawFrameFormat* ); @@ -88,8 +88,8 @@ public: virtual ~SwUndoDrawUnGroup(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void AddObj( sal_uInt16 nPos, SwDrawFrameFormat* ); }; @@ -104,8 +104,8 @@ public: virtual ~SwUndoDrawUnGroupConnectToLayout(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void AddFormatAndObj( SwDrawFrameFormat* pDrawFrameFormat, SdrObject* pDrawObject ); @@ -123,8 +123,8 @@ public: virtual ~SwUndoDrawDelete(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void AddObj( sal_uInt16 nPos, SwDrawFrameFormat*, const SdrMark& ); }; diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx index b3b21e502914..f9e7a3c90eb5 100644 --- a/sw/source/core/inc/UndoInsert.hxx +++ b/sw/source/core/inc/UndoInsert.hxx @@ -64,9 +64,9 @@ public: SwUndoInsert( const SwNodeIndex& rNode ); virtual ~SwUndoInsert(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; /** Returns rewriter for this undo object. @@ -79,7 +79,7 @@ public: @return rewriter for this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; void SetWithRsid() { m_bWithRsid = true; } @@ -99,8 +99,8 @@ public: virtual ~SwUndoReplace(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; /** Returns the rewriter of this undo object. @@ -121,7 +121,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; void SetEnd( const SwPaM& rPam ); @@ -146,8 +146,8 @@ public: virtual ~SwUndoReRead(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoInsertLabel : public SwUndo @@ -188,9 +188,9 @@ public: const bool bCpyBrd ); virtual ~SwUndoInsertLabel(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; /** Returns the rewriter of this undo object. @@ -204,7 +204,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; static SwRewriter CreateRewriter(const OUString &rStr); void SetNodePos( sal_uLong nNd ) diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx index f025789ff36b..9987c519284d 100644 --- a/sw/source/core/inc/UndoManager.hxx +++ b/sw/source/core/inc/UndoManager.hxx @@ -42,43 +42,43 @@ public: IDocumentState & rState); /** IDocumentUndoRedo */ - virtual void DoUndo(bool const bDoUndo) SAL_OVERRIDE; - virtual bool DoesUndo() const SAL_OVERRIDE; - virtual void DoGroupUndo(bool const bDoUndo) SAL_OVERRIDE; - virtual bool DoesGroupUndo() const SAL_OVERRIDE; - virtual void DoDrawUndo(bool const bDoUndo) SAL_OVERRIDE; - virtual bool DoesDrawUndo() const SAL_OVERRIDE; - virtual void SetUndoNoModifiedPosition() SAL_OVERRIDE; - virtual void LockUndoNoModifiedPosition() SAL_OVERRIDE; - virtual void UnLockUndoNoModifiedPosition() SAL_OVERRIDE; - virtual void SetUndoNoResetModified() SAL_OVERRIDE; - virtual bool IsUndoNoResetModified() const SAL_OVERRIDE; + virtual void DoUndo(bool const bDoUndo) override; + virtual bool DoesUndo() const override; + virtual void DoGroupUndo(bool const bDoUndo) override; + virtual bool DoesGroupUndo() const override; + virtual void DoDrawUndo(bool const bDoUndo) override; + virtual bool DoesDrawUndo() const override; + virtual void SetUndoNoModifiedPosition() override; + virtual void LockUndoNoModifiedPosition() override; + virtual void UnLockUndoNoModifiedPosition() override; + virtual void SetUndoNoResetModified() override; + virtual bool IsUndoNoResetModified() const override; virtual SwUndoId StartUndo(SwUndoId const eUndoId, - SwRewriter const*const pRewriter) SAL_OVERRIDE; + SwRewriter const*const pRewriter) override; virtual SwUndoId EndUndo(SwUndoId const eUndoId, - SwRewriter const*const pRewriter) SAL_OVERRIDE; - virtual void DelAllUndoObj() SAL_OVERRIDE; + SwRewriter const*const pRewriter) override; + virtual void DelAllUndoObj() override; virtual bool GetLastUndoInfo(OUString *const o_pStr, - SwUndoId *const o_pId) const SAL_OVERRIDE; - virtual SwUndoComments_t GetUndoComments() const SAL_OVERRIDE; + SwUndoId *const o_pId) const override; + virtual SwUndoComments_t GetUndoComments() const override; virtual bool GetFirstRedoInfo(OUString *const o_pStr, - SwUndoId *const o_pId = 0) const SAL_OVERRIDE; - virtual SwUndoComments_t GetRedoComments() const SAL_OVERRIDE; + SwUndoId *const o_pId = 0) const override; + virtual SwUndoComments_t GetRedoComments() const override; virtual bool Repeat(::sw::RepeatContext & rContext, - sal_uInt16 const nRepeatCnt) SAL_OVERRIDE; - virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const SAL_OVERRIDE; - virtual void AppendUndo(SwUndo *const pUndo) SAL_OVERRIDE; - virtual void ClearRedo() SAL_OVERRIDE; - virtual bool IsUndoNodes(SwNodes const& rNodes) const SAL_OVERRIDE; - virtual size_t GetUndoActionCount(const bool bCurrentLevel = true) const SAL_OVERRIDE; + sal_uInt16 const nRepeatCnt) override; + virtual SwUndoId GetRepeatInfo(OUString *const o_pStr) const override; + virtual void AppendUndo(SwUndo *const pUndo) override; + virtual void ClearRedo() override; + virtual bool IsUndoNodes(SwNodes const& rNodes) const override; + virtual size_t GetUndoActionCount(const bool bCurrentLevel = true) const override; // ::svl::IUndoManager virtual void AddUndoAction(SfxUndoAction *pAction, - bool bTryMerg = false) SAL_OVERRIDE; - virtual bool Undo() SAL_OVERRIDE; - virtual bool Redo() SAL_OVERRIDE; - virtual void EnableUndo(bool bEnable) SAL_OVERRIDE; + bool bTryMerg = false) override; + virtual bool Undo() override; + virtual bool Redo() override; + virtual void EnableUndo(bool bEnable) override; SwUndo * RemoveLastUndo(); SwUndo * GetLastUndo(); diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx index eb2a48341426..5b5b7164d32e 100644 --- a/sw/source/core/inc/UndoNumbering.hxx +++ b/sw/source/core/inc/UndoNumbering.hxx @@ -43,11 +43,11 @@ public: virtual ~SwUndoInsNum(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; SwHistory* GetHistory(); // will be created if necessary void SaveOldNumRule( const SwNumRule& rOld ); @@ -72,9 +72,9 @@ public: virtual ~SwUndoDelNum(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void AddNode( const SwTextNode& rNd, bool bResetLRSpace ); SwHistory* GetHistory() { return pHistory; } @@ -88,9 +88,9 @@ class SwUndoMoveNum : public SwUndo, private SwUndRng public: SwUndoMoveNum( const SwPaM& rPam, long nOffset, bool bIsOutlMv = false ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetStartNode( sal_uLong nValue ) { nNewStt = nValue; } }; @@ -102,9 +102,9 @@ class SwUndoNumUpDown : public SwUndo, private SwUndRng public: SwUndoNumUpDown( const SwPaM& rPam, short nOffset ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; class SwUndoNumOrNoNum : public SwUndo @@ -116,9 +116,9 @@ public: SwUndoNumOrNoNum( const SwNodeIndex& rIdx, bool mbOldNum, bool mbNewNum ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; class SwUndoNumRuleStart : public SwUndo @@ -132,9 +132,9 @@ public: SwUndoNumRuleStart( const SwPosition& rPos, bool bDelete ); SwUndoNumRuleStart( const SwPosition& rPos, sal_uInt16 nStt ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDONUMBERING_HXX diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx index dabc8e1f452f..60c2eb67fad0 100644 --- a/sw/source/core/inc/UndoOverwrite.hxx +++ b/sw/source/core/inc/UndoOverwrite.hxx @@ -45,9 +45,9 @@ public: virtual ~SwUndoOverwrite(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; /** Returns the rewriter of this undo object. @@ -60,7 +60,7 @@ public: @return the rewriter of this undo object */ - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; bool CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns ); }; @@ -79,9 +79,9 @@ public: virtual ~SwUndoTransliterate(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void AddChanges( SwTextNode& rTNd, sal_Int32 nStart, sal_Int32 nLen, ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets ); diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx index 9fd448f51e3b..44059e7c6f73 100644 --- a/sw/source/core/inc/UndoRedline.hxx +++ b/sw/source/core/inc/UndoRedline.hxx @@ -43,8 +43,8 @@ public: virtual ~SwUndoRedline(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; sal_uInt16 GetRedlSaveCount() const; }; @@ -55,8 +55,8 @@ class SwUndoRedlineDelete : public SwUndoRedline bool bIsDelim : 1; bool bIsBackspace : 1; - virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; public: SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUserId = UNDO_EMPTY ); @@ -74,15 +74,15 @@ class SwUndoRedlineSort : public SwUndoRedline sal_uLong nSaveEndNode, nOffset; sal_Int32 nSaveEndContent; - virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; public: SwUndoRedlineSort( const SwPaM& rRange, const SwSortOptions& rOpt ); virtual ~SwUndoRedlineSort(); - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetSaveRange( const SwPaM& rRange ); void SetOffset( const SwNodeIndex& rIdx ); @@ -91,23 +91,23 @@ public: class SwUndoAcceptRedline : public SwUndoRedline { private: - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; public: SwUndoAcceptRedline( const SwPaM& rRange ); - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; class SwUndoRejectRedline : public SwUndoRedline { private: - virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE; + virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) override; public: SwUndoRejectRedline( const SwPaM& rRange ); - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; class SwUndoCompDoc : public SwUndo, public SwUndRng @@ -123,8 +123,8 @@ public: virtual ~SwUndoCompDoc(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOREDLINE_HXX diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx index 16f1f1131c76..fa70a7303e86 100644 --- a/sw/source/core/inc/UndoSection.hxx +++ b/sw/source/core/inc/UndoSection.hxx @@ -52,9 +52,9 @@ public: virtual ~SwUndoInsSection(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetSectNdPos(sal_uLong const nPos) { m_nSectionNodePos = nPos; } void SaveSplitNode(SwTextNode *const pTextNd, bool const bAtStart); diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index 4bc178bf44e4..f5d4f528c77c 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -74,9 +74,9 @@ public: virtual ~SwUndoSort(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void Insert( const OUString& rOrgPos, const OUString& rNewPos ); void Insert( sal_uLong nOrgPos, sal_uLong nNewPos ); diff --git a/sw/source/core/inc/UndoSplitMove.hxx b/sw/source/core/inc/UndoSplitMove.hxx index dbe69d0fef5d..cc13f1c60e63 100644 --- a/sw/source/core/inc/UndoSplitMove.hxx +++ b/sw/source/core/inc/UndoSplitMove.hxx @@ -37,9 +37,9 @@ public: virtual ~SwUndoSplitNode(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetTableFlag() { bTableFlag = true; } }; @@ -66,8 +66,8 @@ public: SwUndoMove( const SwPaM&, const SwPosition& ); SwUndoMove( SwDoc* pDoc, const SwNodeRange&, const SwNodeIndex& ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; /// set the destination range after the move void SetDestRange( const SwPaM&, const SwPosition&, bool, bool ); diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index fbd5f05fdf38..201a00e33d89 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -65,11 +65,11 @@ public: virtual ~SwUndoInsTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; }; class SwUndoTextToTable : public SwUndo, public SwUndRng @@ -90,9 +90,9 @@ public: virtual ~SwUndoTextToTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; SwHistory& GetHistory(); // will be created if necessary void AddFillBox( const SwTableBox& rBox ); @@ -115,9 +115,9 @@ public: virtual ~SwUndoTableToText(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetRange( const SwNodeRange& ); void AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong nEndIdx, @@ -135,8 +135,8 @@ public: virtual ~SwUndoAttrTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; class SwUndoTableNumFormat; @@ -156,8 +156,8 @@ public: virtual ~SwUndoTableAutoFormat(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void SaveBoxContent( const SwTableBox& rBox ); }; @@ -194,8 +194,8 @@ public: virtual ~SwUndoTableNdsChg(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void SaveNewBoxes( const SwTableNode& rTableNd, const SwTableSortBoxes& rOld ); void SaveNewBoxes( const SwTableNode& rTableNd, const SwTableSortBoxes& rOld, @@ -228,8 +228,8 @@ public: virtual ~SwUndoTableMerge(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void MoveBoxContent( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos ); @@ -261,8 +261,8 @@ public: virtual ~SwUndoTableNumFormat(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void SetNumFormat( sal_uLong nNewNumFormatIdx, const double& rNewNumber ) { nFormatIdx = nNewNumFormatIdx; fNum = rNewNumber; } @@ -286,8 +286,8 @@ public: virtual ~SwUndoTableCpyTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void AddBoxBefore( const SwTableBox& rBox, bool bDelContent ); void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, @@ -307,8 +307,8 @@ public: virtual ~SwUndoCpyTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; void SetTableSttIdx( sal_uLong nIdx ) { nTableNode = nIdx; } }; @@ -328,9 +328,9 @@ public: virtual ~SwUndoSplitTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SetTableNodeOffset( sal_uLong nIdx ) { nOffset = nIdx - nTableNode; } SwHistory* GetHistory() { return pHistory; } @@ -352,9 +352,9 @@ public: virtual ~SwUndoMergeTable(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; void SaveFormula( SwHistory& rHistory ); }; @@ -368,9 +368,9 @@ class SwUndoTableHeadline : public SwUndo public: SwUndoTableHeadline( const SwTable&, sal_uInt16 nOldHdl, sal_uInt16 nNewHdl ); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; + virtual void RepeatImpl( ::sw::RepeatContext & ) override; }; void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 ); diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index f5129d96d973..0d3bc22d84ad 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -57,34 +57,34 @@ public: SwAutoCorrDoc( SwEditShell& rEditShell, SwPaM& rPam, sal_Unicode cIns = 0 ); virtual ~SwAutoCorrDoc(); - virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE; - virtual bool Insert( sal_Int32 nPos, const OUString& rText ) SAL_OVERRIDE; - virtual bool Replace( sal_Int32 nPos, const OUString& rText ) SAL_OVERRIDE; - virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rText ) SAL_OVERRIDE; + virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) override; + virtual bool Insert( sal_Int32 nPos, const OUString& rText ) override; + virtual bool Replace( sal_Int32 nPos, const OUString& rText ) override; + virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rText ) override; virtual bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, - SfxPoolItem& ) SAL_OVERRIDE; + SfxPoolItem& ) override; - virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) SAL_OVERRIDE; + virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) override; // return text of a previous paragraph // If it does not exist or if there is nothing before, return blank. // - true: paragraph before "normal" insertion position // - false: paragraph in that the corrected word was inserted // (does not need to be the same paragraph) - virtual OUString const* GetPrevPara(bool bAtNormalPos) SAL_OVERRIDE; + virtual OUString const* GetPrevPara(bool bAtNormalPos) override; virtual bool ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, SvxAutoCorrect& rACorrect, - OUString* pPara ) SAL_OVERRIDE; + OUString* pPara ) override; // Will be called after swapping characters by the functions // - FnCapitalStartWord and // - FnCapitalStartSentence. // Afterwards the words can be added into exception list if needed. virtual void SaveCpltSttWord( sal_uLong nFlag, sal_Int32 nPos, - const OUString& rExceptWord, sal_Unicode cChar ) SAL_OVERRIDE; - virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const SAL_OVERRIDE; + const OUString& rExceptWord, sal_Unicode cChar ) override; + virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara ) const override; }; class SwAutoCorrExceptWord diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx index 8dc5508ba55d..7bd4ad8b4a51 100644 --- a/sw/source/core/inc/annotationmark.hxx +++ b/sw/source/core/inc/annotationmark.hxx @@ -36,7 +36,7 @@ namespace sw { namespace mark virtual ~AnnotationMark(); - virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE; + virtual void InitDoc(SwDoc* const io_Doc) override; const SwFormatField* GetAnnotationFormatField() const; }; diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index fee7518d58cb..b346908ab86d 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -125,7 +125,7 @@ namespace objectpositioning <mnLineAlignment> are calculated. calculated position is set at the given object. */ - virtual void CalcPosition() SAL_OVERRIDE; + virtual void CalcPosition() override; // calculated anchored position for object position type AS_CHAR const Point& GetAnchorPos() const { return maAnchorPos;} diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx index 375dec9ef4e9..4ac9df775543 100644 --- a/sw/source/core/inc/bodyfrm.hxx +++ b/sw/source/core/inc/bodyfrm.hxx @@ -27,12 +27,12 @@ class SwBorderAttrs; class SwBodyFrm: public SwLayoutFrm { protected: - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; public: SwBodyFrm( SwFrameFormat*, SwFrm* ); - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm) }; diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index df6671f9c097..8a960a5c1bd8 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -50,16 +50,16 @@ namespace sw { { public: //getters - virtual SwPosition& GetMarkPos() const SAL_OVERRIDE + virtual SwPosition& GetMarkPos() const override { return *m_pPos1; } - virtual const OUString& GetName() const SAL_OVERRIDE + virtual const OUString& GetName() const override { return m_aName; } - virtual SwPosition& GetOtherMarkPos() const SAL_OVERRIDE + virtual SwPosition& GetOtherMarkPos() const override { OSL_PRECOND(IsExpanded(), "<SwPosition::GetOtherMarkPos(..)> - I have no other Pos set." ); return *m_pPos2; } - virtual SwPosition& GetMarkStart() const SAL_OVERRIDE + virtual SwPosition& GetMarkStart() const override { if( !IsExpanded() ) return GetMarkPos( ); if ( GetMarkPos( ) < GetOtherMarkPos( ) ) @@ -67,7 +67,7 @@ namespace sw { else return GetOtherMarkPos( ); } - virtual SwPosition& GetMarkEnd() const SAL_OVERRIDE + virtual SwPosition& GetMarkEnd() const override { if( !IsExpanded() ) return GetMarkPos(); if ( GetMarkPos( ) >= GetOtherMarkPos( ) ) @@ -76,8 +76,8 @@ namespace sw { return GetOtherMarkPos( ); } - virtual bool IsCoveringPosition(const SwPosition& rPos) const SAL_OVERRIDE; - virtual bool IsExpanded() const SAL_OVERRIDE + virtual bool IsCoveringPosition(const SwPosition& rPos) const override; + virtual bool IsExpanded() const override { return static_cast< bool >(m_pPos2); } void SetName(const OUString& rName) @@ -87,8 +87,8 @@ namespace sw { virtual void ClearOtherMarkPos() { m_pPos2.reset(); } - virtual OUString ToString( ) const SAL_OVERRIDE; - virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; + virtual OUString ToString( ) const override; + virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; void Swap() { @@ -111,7 +111,7 @@ namespace sw { protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; MarkBase(const SwPaM& rPaM, const OUString& rName); std::unique_ptr<SwPosition> m_pPos1; @@ -170,26 +170,26 @@ namespace sw { const vcl::KeyCode& rCode, const OUString& rName, const OUString& rShortName); - virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE; + virtual void InitDoc(SwDoc* const io_Doc) override; - virtual void DeregisterFromDoc(SwDoc* const io_pDoc) SAL_OVERRIDE; + virtual void DeregisterFromDoc(SwDoc* const io_pDoc) override; - virtual const OUString& GetShortName() const SAL_OVERRIDE + virtual const OUString& GetShortName() const override { return m_sShortName; } - virtual const vcl::KeyCode& GetKeyCode() const SAL_OVERRIDE + virtual const vcl::KeyCode& GetKeyCode() const override { return m_aCode; } - virtual void SetShortName(const OUString& rShortName) SAL_OVERRIDE + virtual void SetShortName(const OUString& rShortName) override { m_sShortName = rShortName; } - virtual void SetKeyCode(const vcl::KeyCode& rCode) SAL_OVERRIDE + virtual void SetKeyCode(const vcl::KeyCode& rCode) override { m_aCode = rCode; } // ::sfx2::Metadatable - virtual ::sfx2::IXmlIdRegistry& GetRegistry() SAL_OVERRIDE; - virtual bool IsInClipboard() const SAL_OVERRIDE; - virtual bool IsInUndo() const SAL_OVERRIDE; - virtual bool IsInContent() const SAL_OVERRIDE; + virtual ::sfx2::IXmlIdRegistry& GetRegistry() override; + virtual bool IsInClipboard() const override; + virtual bool IsInUndo() const override; + virtual bool IsInContent() const override; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE; + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override; private: vcl::KeyCode m_aCode; @@ -203,20 +203,20 @@ namespace sw { public: Fieldmark(const SwPaM& rPaM); - virtual OUString GetFieldname() const SAL_OVERRIDE + virtual OUString GetFieldname() const override { return m_aFieldname; } - virtual OUString GetFieldHelptext() const SAL_OVERRIDE + virtual OUString GetFieldHelptext() const override { return m_aFieldHelptext; } - virtual IFieldmark::parameter_map_t* GetParameters() SAL_OVERRIDE + virtual IFieldmark::parameter_map_t* GetParameters() override { return &m_vParams; } - virtual const IFieldmark::parameter_map_t* GetParameters() const SAL_OVERRIDE + virtual const IFieldmark::parameter_map_t* GetParameters() const override { return &m_vParams; } - virtual void SetFieldname(const OUString& aFieldname) SAL_OVERRIDE + virtual void SetFieldname(const OUString& aFieldname) override { m_aFieldname = aFieldname; } - virtual void SetFieldHelptext(const OUString& aFieldHelptext) SAL_OVERRIDE + virtual void SetFieldHelptext(const OUString& aFieldHelptext) override { m_aFieldHelptext = aFieldHelptext; } virtual void ReleaseDoc(SwDoc* const) = 0; @@ -224,9 +224,9 @@ namespace sw { void SetMarkStartPos( const SwPosition& rNewStartPos ); void SetMarkEndPos( const SwPosition& rNewEndPos ); - virtual void Invalidate() SAL_OVERRIDE; - virtual OUString ToString() const SAL_OVERRIDE; - virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; + virtual void Invalidate() override; + virtual OUString ToString() const override; + virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; private: OUString m_aFieldname; @@ -239,8 +239,8 @@ namespace sw { { public: TextFieldmark(const SwPaM& rPaM); - virtual void InitDoc(SwDoc* const io_pDoc) SAL_OVERRIDE; - virtual void ReleaseDoc(SwDoc* const pDoc) SAL_OVERRIDE; + virtual void InitDoc(SwDoc* const io_pDoc) override; + virtual void ReleaseDoc(SwDoc* const pDoc) override; }; class CheckboxFieldmark @@ -249,10 +249,10 @@ namespace sw { { public: CheckboxFieldmark(const SwPaM& rPaM); - virtual void InitDoc(SwDoc* const io_pDoc) SAL_OVERRIDE; - virtual void ReleaseDoc(SwDoc* const pDoc) SAL_OVERRIDE; - bool IsChecked() const SAL_OVERRIDE; - void SetChecked(bool checked) SAL_OVERRIDE; + virtual void InitDoc(SwDoc* const io_pDoc) override; + virtual void ReleaseDoc(SwDoc* const pDoc) override; + bool IsChecked() const override; + void SetChecked(bool checked) override; }; } } diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index 040cc032f1f5..573a84e322b5 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -32,23 +32,23 @@ class SwCellFrm: public SwLayoutFrm { const SwTableBox* m_pTabBox; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwCellFrm(); protected: - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: SwCellFrm( const SwTableBox &, SwFrm*, bool bInsertContent = true ); - virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual void CheckDirection( bool bVert ) override; // #i103961# - virtual void Cut() SAL_OVERRIDE; + virtual void Cut() override; const SwTableBox *GetTabBox() const { return m_pTabBox; } diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index 76b3544ba2cf..cabf271d8436 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -45,32 +45,32 @@ class SwContentFrm: public SwFrm, public SwFlowFrm bool bTstMove, const bool bObjsInNewUpper ); - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ) SAL_OVERRIDE; + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ) override; const SwContentFrm* ImplGetNextContentFrm( bool bFwd ) const; protected: bool MakePrtArea( const SwBorderAttrs & ); - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; SwContentFrm( SwContentNode * const, SwFrm* ); - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwContentFrm(); public: TYPEINFO_OVERRIDE(); // already in base class - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; inline const SwContentNode *GetNode() const; inline SwContentNode *GetNode(); diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx index 1a22e394e16c..66e4e387be59 100644 --- a/sw/source/core/inc/colfrm.hxx +++ b/sw/source/core/inc/colfrm.hxx @@ -26,14 +26,14 @@ class SwColumnFrm: public SwFootnoteBossFrm { private: - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwColumnFrm(); public: SwColumnFrm( SwFrameFormat*, SwFrm* ); - virtual void PaintBreak() const SAL_OVERRIDE; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + virtual void PaintBreak() const override; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrm) }; diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx index 9c90319eee4a..85bf999a5a34 100644 --- a/sw/source/core/inc/crossrefbookmark.hxx +++ b/sw/source/core/inc/crossrefbookmark.hxx @@ -38,22 +38,22 @@ namespace sw { const OUString& rPrefix); // getters - virtual SwPosition& GetOtherMarkPos() const SAL_OVERRIDE; - virtual SwPosition& GetMarkStart() const SAL_OVERRIDE + virtual SwPosition& GetOtherMarkPos() const override; + virtual SwPosition& GetMarkStart() const override { return *m_pPos1; } - virtual SwPosition& GetMarkEnd() const SAL_OVERRIDE + virtual SwPosition& GetMarkEnd() const override { return *m_pPos1; } - virtual bool IsExpanded() const SAL_OVERRIDE + virtual bool IsExpanded() const override { return false; } - virtual void SetMarkPos(const SwPosition& rNewPos) SAL_OVERRIDE; - virtual void SetOtherMarkPos(const SwPosition&) SAL_OVERRIDE + virtual void SetMarkPos(const SwPosition& rNewPos) override; + virtual void SetOtherMarkPos(const SwPosition&) override { assert(false && "<CrossRefBookmark::SetOtherMarkPos(..)>" " - misusage of CrossRefBookmark: other bookmark position isn't allowed to be set." ); } - virtual void ClearOtherMarkPos() SAL_OVERRIDE + virtual void ClearOtherMarkPos() override { assert(false && "<SwCrossRefBookmark::ClearOtherMarkPos(..)>" diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 5a2c0d635ec0..36e9c7747721 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -37,12 +37,12 @@ const sal_uInt16 SwFlyDrawObjIdentifier = 0x0001; class SwFlyDrawObj : public SdrObject { private: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; protected: // #i95264# SwFlyDrawObj needs an own VC since createViewIndependentPrimitive2DSequence() // is called when RecalcBoundRect() is used - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; public: TYPEINFO_OVERRIDE(); @@ -51,8 +51,8 @@ public: virtual ~SwFlyDrawObj(); // for instantiation of this class while loading (via factory) - virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE; - virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual sal_uInt32 GetObjInventor() const override; + virtual sal_uInt16 GetObjIdentifier() const override; }; // virtual objects for Flys @@ -67,7 +67,7 @@ protected: // AW: Need own sdr::contact::ViewContact since AnchorPos from parent is // not used but something own (top left of new SnapRect minus top left // of original SnapRect) - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; public: // for paints triggered form ExecutePrimitive @@ -84,29 +84,29 @@ public: virtual ~SwVirtFlyDrawObj(); // override method of base class SdrVirtObj - virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const SAL_OVERRIDE; + virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const override; // we treat the size calculation completely on ourself here - virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE; - virtual const Rectangle& GetLastBoundRect() const SAL_OVERRIDE; - virtual void RecalcBoundRect() SAL_OVERRIDE; - virtual void RecalcSnapRect() SAL_OVERRIDE; - virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; - virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE; - virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; - virtual void NbcMove (const Size& rSiz) SAL_OVERRIDE; + virtual const Rectangle& GetCurrentBoundRect() const override; + virtual const Rectangle& GetLastBoundRect() const override; + virtual void RecalcBoundRect() override; + virtual void RecalcSnapRect() override; + virtual const Rectangle& GetSnapRect() const override; + virtual void SetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual const Rectangle& GetLogicRect() const override; + virtual void SetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const override; + virtual void NbcMove (const Size& rSiz) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, - const Fraction& yFact) SAL_OVERRIDE; - virtual void NbcCrop(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; - virtual void Move (const Size& rSiz) SAL_OVERRIDE; + const Fraction& yFact) override; + virtual void NbcCrop(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; + virtual void Move (const Size& rSiz) override; virtual void Resize(const Point& rRef, const Fraction& xFact, - const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE; - virtual void Crop(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; - virtual void addCropHandles(SdrHdlList& rTarget) const SAL_OVERRIDE; + const Fraction& yFact, bool bUnsetRelative = true) override; + virtual void Crop(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; + virtual void addCropHandles(SdrHdlList& rTarget) const override; const SwFrameFormat *GetFormat() const; SwFrameFormat *GetFormat(); @@ -118,13 +118,13 @@ public: void SetRect() const; // if an URL is attached to a graphic than this is a macro object - virtual bool HasMacro() const SAL_OVERRIDE; - virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; - virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; + virtual bool HasMacro() const override; + virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const override; + virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; // FullDrag support - virtual bool supportsFullDrag() const SAL_OVERRIDE; - virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; + virtual bool supportsFullDrag() const override; + virtual SdrObject* getFullDragClone() const override; }; #endif diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 1dc937f72c90..8a9c48e0e1a5 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -99,7 +99,7 @@ struct SwSortTextElement : public SwSortElement SwSortTextElement( const SwNodeIndex& rPos ); virtual ~SwSortTextElement(); - virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE; + virtual OUString GetKey( sal_uInt16 nKey ) const override; }; // sort table @@ -110,8 +110,8 @@ struct SwSortBoxElement : public SwSortElement SwSortBoxElement( sal_uInt16 nRC ); virtual ~SwSortBoxElement(); - virtual OUString GetKey( sal_uInt16 nKey ) const SAL_OVERRIDE; - virtual double GetValue( sal_uInt16 nKey ) const SAL_OVERRIDE; + virtual OUString GetKey( sal_uInt16 nKey ) const override; + virtual double GetValue( sal_uInt16 nKey ) const override; }; // two-dimensional array of FndBoxes diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx index f13dc85534bc..06cbff670c79 100644 --- a/sw/source/core/inc/dumpfilter.hxx +++ b/sw/source/core/inc/dumpfilter.hxx @@ -39,25 +39,25 @@ namespace sw { // 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::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; + throw (::com::sun::star::lang::IllegalArgumentException, ::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; + throw (::com::sun::star::uno::Exception, ::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; }; } diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index aae273697353..0141db0cf85a 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -69,32 +69,32 @@ class SwDrawView : public FmFormView protected: // add custom handles (used by other apps, e.g. AnchorPos) - virtual void AddCustomHdl() SAL_OVERRIDE; + virtual void AddCustomHdl() override; // override to allow extra handling when picking SwVirtFlyDrawObj's using FmFormView::CheckSingleSdrObjectHit; - virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay) const SAL_OVERRIDE; + virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay) const override; // support enhanced text edit for draw objects - virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const SAL_OVERRIDE; + virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const override; public: SwDrawView( SwViewShellImp &rI, SdrModel *pMd, OutputDevice* pOutDev=NULL ); // from base class - virtual SdrObject* GetMaxToTopObj(SdrObject* pObj) const SAL_OVERRIDE; - virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const SAL_OVERRIDE; - virtual void MarkListHasChanged() SAL_OVERRIDE; + virtual SdrObject* GetMaxToTopObj(SdrObject* pObj) const override; + virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const override; + virtual void MarkListHasChanged() override; // #i7672# // Override to reuse edit background color in active text edit view (OutlinerView) - virtual void ModelHasChanged() SAL_OVERRIDE; + virtual void ModelHasChanged() override; virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, - sal_uLong nNewPos ) SAL_OVERRIDE; - virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const SAL_OVERRIDE; - virtual void MakeVisible( const Rectangle&, vcl::Window &rWin ) SAL_OVERRIDE; - virtual void CheckPossibilities() SAL_OVERRIDE; + sal_uLong nNewPos ) override; + virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const override; + virtual void MakeVisible( const Rectangle&, vcl::Window &rWin ) override; + virtual void CheckPossibilities() override; const SwViewShellImp &Imp() const { return rImp; } SwViewShellImp &Imp() { return rImp; } @@ -102,7 +102,7 @@ public: // anchor and Xor for dragging void ShowDragAnchor(); - virtual void DeleteMarked() SAL_OVERRIDE; + virtual void DeleteMarked() override; inline void ValidateMarkList() { FlushComeBackTimer(); } diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 054318b47b54..0e781ae4e29a 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -121,7 +121,7 @@ protected: Point m_aContentPos; // content area's position relatively to Frm bool m_bValidContentPos; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; void MakePrtArea( const SwBorderAttrs &rAttrs ); void MakeContentPos( const SwBorderAttrs &rAttrs ); @@ -133,21 +133,21 @@ protected: SwFlyFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwFlyFrm(); /** method to assure that anchored object is registered at the correct page frame */ - virtual void RegisterAtCorrectPage() SAL_OVERRIDE; + virtual void RegisterAtCorrectPage() override; - virtual bool _SetObjTop( const SwTwips _nTop ) SAL_OVERRIDE; - virtual bool _SetObjLeft( const SwTwips _nLeft ) SAL_OVERRIDE; + virtual bool _SetObjTop( const SwTwips _nTop ) override; + virtual bool _SetObjLeft( const SwTwips _nLeft ) override; - virtual const SwRect GetObjBoundRect() const SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual const SwRect GetObjBoundRect() const override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; - virtual const IDocumentDrawModelAccess& getIDocumentDrawModelAccess( ) SAL_OVERRIDE; + virtual const IDocumentDrawModelAccess& getIDocumentDrawModelAccess( ) override; SwTwips CalcContentHeight(const SwBorderAttrs *pAttrs, const SwTwips nMinHeight, const SwTwips nUL); @@ -156,17 +156,17 @@ public: TYPEINFO_OVERRIDE(); // get client information - virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool GetInfo( SfxPoolItem& ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual Size ChgSize( const Size& aNewSize ) override; virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; - virtual void Cut() SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) override; + virtual void Cut() override; #ifdef DBG_UTIL - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; #endif SwTwips _Shrink( SwTwips, bool bTst ); @@ -244,13 +244,13 @@ public: void InsertColumns(); // #i26791# - pure virtual methods of base class <SwAnchoredObject> - virtual void MakeObjPos() SAL_OVERRIDE; - virtual void InvalidateObjPos() SAL_OVERRIDE; + virtual void MakeObjPos() override; + virtual void InvalidateObjPos() override; - virtual SwFrameFormat& GetFrameFormat() SAL_OVERRIDE; - virtual const SwFrameFormat& GetFrameFormat() const SAL_OVERRIDE; + virtual SwFrameFormat& GetFrameFormat() override; + virtual const SwFrameFormat& GetFrameFormat() const override; - virtual const SwRect GetObjRect() const SAL_OVERRIDE; + virtual const SwRect GetObjRect() const override; /** method to determine if a format on the Writer fly frame is possible @@ -259,18 +259,18 @@ public: <SwAnchoredObject::IsFormatPossible()> by: format isn't possible, if Writer fly frame is locked resp. col-locked. */ - virtual bool IsFormatPossible() const SAL_OVERRIDE; + virtual bool IsFormatPossible() const override; static void GetAnchoredObjects( std::list<SwAnchoredObject*>&, const SwFormat& rFormat ); // overwriting "SwFrameFormat *SwLayoutFrm::GetFormat" to provide the correct derived return type. // (This is in order to skip on the otherwise necessary casting of the result to // 'SwFlyFrameFormat *' after calls to this function. The casting is now done in this function.) - virtual const SwFlyFrameFormat *GetFormat() const SAL_OVERRIDE; - virtual SwFlyFrameFormat *GetFormat() SAL_OVERRIDE; + virtual const SwFlyFrameFormat *GetFormat() const override; + virtual SwFlyFrameFormat *GetFormat() override; - virtual void dumpAsXml( xmlTextWriterPtr writer ) const SAL_OVERRIDE { SwLayoutFrm::dumpAsXml( writer ); }; + virtual void dumpAsXml( xmlTextWriterPtr writer ) const override { SwLayoutFrm::dumpAsXml( writer ); }; - virtual void Calc(vcl::RenderContext* pRenderContext) const SAL_OVERRIDE; + virtual void Calc(vcl::RenderContext* pRenderContext) const override; const Point& ContentPos() const { return m_aContentPos; } Point& ContentPos() { return m_aContentPos; } diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx index 01c3cb6a7e9d..080d2be0c039 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -61,17 +61,17 @@ protected: // method <NotifyBackground> friend class SwFlyNotify; virtual void NotifyBackground( SwPageFrm *pPage, - const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE; + const SwRect& rRect, PrepareHint eHint) override; SwFlyFreeFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwFlyFreeFrm(); public: // #i28701# TYPEINFO_OVERRIDE(); - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; // #i37068# - accessors for member <mbNoMoveOnCheckClip> inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip ) @@ -118,7 +118,7 @@ public: format isn't possible, if Writer fly frame isn't registered at a page frame and its anchor frame isn't inside another Writer fly frame. */ - virtual bool IsFormatPossible() const SAL_OVERRIDE; + virtual bool IsFormatPossible() const override; }; // Flys that are bound to LayoutFrms and not to Content @@ -131,25 +131,25 @@ public: SwFlyLayFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; }; // Flys that are bound to Content but not in Content class SwFlyAtCntFrm : public SwFlyFreeFrm { protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; // #i28701# - virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const SAL_OVERRIDE; + virtual bool _InvalidationAllowed( const InvalidationType _nInvalid ) const override; /** method to assure that anchored object is registered at the correct page frame #i28701# */ - virtual void RegisterAtCorrectPage() SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void RegisterAtCorrectPage() override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: // #i28701# @@ -160,7 +160,7 @@ public: void SetAbsPos( const Point &rNew ); // #i26791# - virtual void MakeObjPos() SAL_OVERRIDE; + virtual void MakeObjPos() override; /** method to determine, if a format on the Writer fly frame is possible @@ -169,7 +169,7 @@ public: <SwFlyFreeFrm::IsFormatPossible()> by: format isn't possible, if method <MakeAll()> is already in progress. */ - virtual bool IsFormatPossible() const SAL_OVERRIDE; + virtual bool IsFormatPossible() const override; }; // Flys that are bound to a character in Content @@ -180,14 +180,14 @@ class SwFlyInCntFrm : public SwFlyFrm bool bInvalidLayout :1; bool bInvalidContent :1; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwFlyInCntFrm(); protected: virtual void NotifyBackground( SwPageFrm *pPage, - const SwRect& rRect, PrepareHint eHint) SAL_OVERRIDE; - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + const SwRect& rRect, PrepareHint eHint) override; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: // #i28701# @@ -195,7 +195,7 @@ public: SwFlyInCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; void SetRefPoint( const Point& rPoint, const Point &rRelAttr, const Point &rRelPos ); @@ -217,11 +217,11 @@ public: void AddRefOfst( long nOfst ) { aRef.Y() += nOfst; } // #i26791# - virtual void MakeObjPos() SAL_OVERRIDE; + virtual void MakeObjPos() override; // invalidate anchor frame on invalidation of the position, because the // position is calculated during the format of the anchor frame - virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ) SAL_OVERRIDE; + virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ) override; }; inline void SwFlyInCntFrm::InvalidateLayout() const diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index a73901d3de94..1a70f1f6e358 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -130,7 +130,7 @@ class SwFntAccess : public SwCacheAccess { SwViewShell const *pShell; protected: - virtual SwCacheObj *NewObj( ) SAL_OVERRIDE; + virtual SwCacheObj *NewObj( ) override; public: SwFntAccess( const void * &rMagic, sal_uInt16 &rIndex, const void *pOwner, diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 3e14805ec917..e6c245ee4d1c 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -411,7 +411,7 @@ protected: // draw shadow and borders void PaintShadow( const SwRect&, SwRect&, const SwBorderAttrs& ) const; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; virtual const IDocumentDrawModelAccess& getIDocumentDrawModelAccess( ); diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 68e9cc0413e2..b8d1b727db1a 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -379,7 +379,7 @@ class SwBorderAttrAccess : public SwCacheAccess const SwFrm *pConstructor; //opt: for passing on to SwBorderAttrs protected: - virtual SwCacheObj *NewObj() SAL_OVERRIDE; + virtual SwCacheObj *NewObj() override; public: SwBorderAttrAccess( SwCache &rCache, const SwFrm *pOwner ); diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index fe5b10eddfdf..d17c70804ee9 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -40,12 +40,12 @@ public: const SwFootnoteFrm* FindFootNote() const; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; virtual void PaintBorder( const SwRect &, const SwPageFrm *pPage, - const SwBorderAttrs & ) const SAL_OVERRIDE; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + const SwBorderAttrs & ) const override; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; void PaintLine( const SwRect &, const SwPageFrm * ) const; }; @@ -66,17 +66,17 @@ class SwFootnoteFrm: public SwLayoutFrm bool mbUnlockPosOfLowerObjs : 1; #ifdef DBG_UTIL protected: - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; #endif public: SwFootnoteFrm( SwFrameFormat*, SwFrm*, SwContentFrm*, SwTextFootnote* ); - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; bool operator<( const SwTextFootnote* pTextFootnote ) const; diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx index 3adcec787e7c..50315e12fc51 100644 --- a/sw/source/core/inc/hffrm.hxx +++ b/sw/source/core/inc/hffrm.hxx @@ -32,12 +32,12 @@ protected: public: SwHeadFootFrm(SwFrameFormat * pFrm, SwFrm*, sal_uInt16 aType); - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; virtual SwTwips GrowFrm( SwTwips, - bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + bool bTst = false, bool bInfo = false ) override; virtual SwTwips ShrinkFrm( SwTwips, - bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + bool bTst = false, bool bInfo = false ) override; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; }; /// Header in the document layout, inside a page. diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index 0a39fc113997..bcc568c12785 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -48,17 +48,17 @@ class SwLayoutFrm: public SwFrm protected: - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwLayoutFrm(); - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; SwFrm * m_pLower; std::vector<SwAnchoredObject*> m_VertPosOrientFrmsFor; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; long CalcRel( const SwFormatFrmSize &rSz, bool bWidth ) const; @@ -82,13 +82,13 @@ public: void PaintColLines( const SwRect &, const SwFormatCol &, const SwPageFrm * ) const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; /** * Finds the closest Content for the SPoint @@ -103,7 +103,7 @@ public: SwLayoutFrm( SwFrameFormat*, SwFrm* ); virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; const SwFrm *Lower() const { return m_pLower; } SwFrm *Lower() { return m_pLower; } const SwContentFrm *ContainsContent() const; diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index f4241e096e6f..72638294e1ae 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -34,24 +34,24 @@ class SwNoTextFrm: public SwContentFrm void InitCtor(); - void Format ( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + void Format ( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; void PaintPicture( vcl::RenderContext*, const SwRect& ) const; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwNoTextFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: SwNoTextFrm( SwNoTextNode * const, SwFrm* ); virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; virtual bool GetCharRect( SwRect &, const SwPosition&, - SwCrsrMoveState* = 0) const SAL_OVERRIDE; + SwCrsrMoveState* = 0) const override; virtual bool GetCrsrOfst(SwPosition* pPos, Point& aPoint, - SwCrsrMoveState* = 0, bool bTestBackground = false) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false) const override; void GetGrfArea( SwRect &rRect, SwRect * = 0, bool bMirror = true ) const; diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx index 1f41868696ed..408b256b8738 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -63,7 +63,7 @@ class ObservableThread : public osl::Thread, Otherwise, it's not guaranteed, that its ref-count is increased during the execution of the thread. */ - virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL run() override; virtual void threadFunction() = 0; @@ -75,7 +75,7 @@ class ObservableThread : public osl::Thread, the end of its execution and that the observer is notified, that the thread has finished its work. */ - virtual void SAL_CALL onTerminated() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() override; private: diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 1318e1444cbd..d2e797e53b6f 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -102,13 +102,13 @@ class SwPageFrm: public SwFootnoteBossFrm bool bPaintRightShadow, bool bRightSidebar ); - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwPageFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; - virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; + virtual void SwClientNotify(const SwModify&, const SfxHint&) override; public: DECL_FIXEDMEMPOOL_NEWDEL(SwPageFrm) @@ -165,20 +165,20 @@ public: void PlaceFly( SwFlyFrm* pFly, SwFlyFrameFormat* pFormat ); virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; /// Get info from Client - virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool GetInfo( SfxPoolItem& ) const override; - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; + virtual void CheckDirection( bool bVert ) override; void CheckGrid( bool bInvalidate ); void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const; bool HasGrid() const { return bHasGrid; } void PaintDecorators( ) const; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; - virtual void PaintBreak() const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; + virtual void PaintBreak() const override; /// Paint line number etc. void RefreshExtraData( const SwRect & ) const; @@ -316,7 +316,7 @@ public: */ sw::sidebarwindows::SidebarPosition SidebarPosition() const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; const SwRect PrtWithoutHeaderAndFooter() const; diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx index 6fe273e35516..3e4e94af960b 100644 --- a/sw/source/core/inc/retrieveinputstream.hxx +++ b/sw/source/core/inc/retrieveinputstream.hxx @@ -40,7 +40,7 @@ class SwAsyncRetrieveInputStreamThread : public ObservableThread protected: - virtual void threadFunction() SAL_OVERRIDE; + virtual void threadFunction() override; private: diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index 6d4ca2f1f6b6..c955e61eaa42 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -97,8 +97,8 @@ class SwHistorySetFormat : public SwHistoryHint public: SwHistorySetFormat( const SfxPoolItem* pFormatHt, sal_uLong nNode ); virtual ~SwHistorySetFormat(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; - virtual OUString GetDescription() const SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; + virtual OUString GetDescription() const override; }; @@ -109,7 +109,7 @@ class SwHistoryResetFormat : public SwHistoryHint public: SwHistoryResetFormat( const SfxPoolItem* pFormatHt, sal_uLong nNodeIdx ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -125,7 +125,7 @@ class SwHistorySetText : public SwHistoryHint public: SwHistorySetText( SwTextAttr* pTextHt, sal_uLong nNode ); virtual ~SwHistorySetText(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -143,9 +143,9 @@ class SwHistorySetTextField : public SwHistoryHint public: SwHistorySetTextField( SwTextField* pTextField, sal_uLong nNode ); virtual ~SwHistorySetTextField(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; - virtual OUString GetDescription() const SAL_OVERRIDE; + virtual OUString GetDescription() const override; }; @@ -158,7 +158,7 @@ class SwHistorySetRefMark : public SwHistoryHint public: SwHistorySetRefMark( SwTextRefMark* pTextHt, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -173,7 +173,7 @@ class SwHistorySetTOXMark : public SwHistoryHint public: SwHistorySetTOXMark( SwTextTOXMark* pTextHt, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; bool IsEqual( const SwTOXMark& rCmp ) const; }; @@ -188,7 +188,7 @@ class SwHistoryResetText : public SwHistoryHint public: SwHistoryResetText( sal_uInt16 nWhich, sal_Int32 nStt, sal_Int32 nEnd, sal_uLong nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; sal_uInt16 GetWhich() const { return m_nAttr; } sal_uLong GetNode() const { return m_nNodeIndex; } @@ -208,9 +208,9 @@ public: SwHistorySetFootnote( SwTextFootnote* pTextFootnote, sal_uLong nNode ); SwHistorySetFootnote( const SwTextFootnote& ); virtual ~SwHistorySetFootnote(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; - virtual OUString GetDescription() const SAL_OVERRIDE; + virtual OUString GetDescription() const override; }; @@ -222,7 +222,7 @@ class SwHistoryChangeFormatColl : public SwHistoryHint public: SwHistoryChangeFormatColl( SwFormatColl* pColl, sal_uLong nNode, sal_uInt8 nNodeWhich ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -233,7 +233,7 @@ class SwHistoryTextFlyCnt : public SwHistoryHint public: SwHistoryTextFlyCnt( SwFrameFormat* const pFlyFormat ); virtual ~SwHistoryTextFlyCnt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; SwUndoDelLayFormat* GetUDelLFormat() { return m_pUndo.get(); } }; @@ -243,7 +243,7 @@ class SwHistoryBookmark : public SwHistoryHint public: SwHistoryBookmark(const ::sw::mark::IMark& rBkmk, bool bSavePos, bool bSaveOtherPos); - virtual void SetInDoc(SwDoc * pDoc, bool) SAL_OVERRIDE; + virtual void SetInDoc(SwDoc * pDoc, bool) override; bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk); const OUString& GetName() const { return m_aName;} @@ -272,7 +272,7 @@ class SwHistorySetAttrSet : public SwHistoryHint public: SwHistorySetAttrSet( const SfxItemSet& rSet, sal_uLong nNode, const std::set<sal_uInt16> &rSetArr ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -287,7 +287,7 @@ public: SwHistoryResetAttrSet( const SfxItemSet& rSet, sal_uLong nNode, sal_Int32 nStt, sal_Int32 nEnd); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; const std::vector<sal_uInt16>& GetArr() const { return m_Array; } sal_uLong GetNode() const { return m_nNodeIndex; } @@ -303,7 +303,7 @@ class SwHistoryChangeFlyAnchor : public SwHistoryHint public: SwHistoryChangeFlyAnchor( SwFrameFormat& rFormat ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; class SwHistoryChangeFlyChain : public SwHistoryHint @@ -314,7 +314,7 @@ class SwHistoryChangeFlyChain : public SwHistoryHint public: SwHistoryChangeFlyChain( SwFlyFrameFormat& rFormat, const SwFormatChain& rAttr ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; class SwHistoryChangeCharFormat : public SwHistoryHint @@ -324,7 +324,7 @@ class SwHistoryChangeCharFormat : public SwHistoryHint public: SwHistoryChangeCharFormat( const SfxItemSet& rSet, const OUString & sFormat); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) SAL_OVERRIDE; + virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; @@ -398,7 +398,7 @@ private: void _MakeSetWhichIds(); protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override; public: SwRegHistory( SwHistory* pHst ); diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 61cac40a16cb..30fb92d92932 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -145,12 +145,12 @@ class SwRootFrm: public SwLayoutFrm void _DeleteEmptySct(); // Destroys the registered SectionFrms void _RemoveFromList( SwSectionFrm* pSct ); // Removes SectionFrms from the Delete List - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwRootFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; public: @@ -197,22 +197,22 @@ public: void SetDrawPage( SdrPage* pNew ){ mpDrawPage = pNew; } virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; #ifdef DBG_UTIL - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; #endif - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; Point GetNextPrevContentPos( const Point &rPoint, bool bNext ) const; - virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE; + virtual Size ChgSize( const Size& aNewSize ) override; void SetIdleFlags() { diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index d86379b77008..78f88aaac0f9 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -29,10 +29,10 @@ class SwBorderAttrs; /// SwRowFrm is one table row in the document layout. class SwRowFrm: public SwLayoutFrm { - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; /// Only change the Frame size, not the PrtArea SSize - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; const SwTableLine * m_pTabLine; SwRowFrm * m_pFollowRow; @@ -45,17 +45,17 @@ class SwRowFrm: public SwLayoutFrm bool m_bIsRepeatedHeadline; bool m_bIsRowSpanLine; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwRowFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: SwRowFrm( const SwTableLine &, SwFrm*, bool bInsertContent = true ); - virtual void Cut() SAL_OVERRIDE; + virtual void Cut() override; /** * Register Flys after a line was created _AND_ inserted diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index cbdfbe27365c..208c32562b79 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -54,27 +54,27 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm const SwSectionFormat* _GetEndSectFormat() const; bool IsEndnoteAtMyEnd() const; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwSectionFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; - virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) override; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; + virtual void SwClientNotify( const SwModify&, const SfxHint& ) override; public: SwSectionFrm( SwSection &, SwFrm* ); // Content is not created! SwSectionFrm( SwSectionFrm &, bool bMaster ); // _ONLY_ for creating Master/Follows! void Init(); - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + virtual void CheckDirection( bool bVert ) override; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE; + virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; inline const SwSectionFrm *GetFollow() const; inline SwSectionFrm *GetFollow(); @@ -138,7 +138,7 @@ public: bool IsBalancedSection() const; - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE; + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override; bool IsFootnoteAtEnd() const { return bFootnoteAtEnd; } bool IsEndnAtEnd() const { return bEndnAtEnd; } diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index 24b39d0405c7..69338d5c3f86 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -68,7 +68,7 @@ class SwFontAccess : public SwCacheAccess { SwViewShell *pShell; protected: - virtual SwCacheObj *NewObj( ) SAL_OVERRIDE; + virtual SwCacheObj *NewObj( ) override; public: SwFontAccess( const void *pOwner, SwViewShell *pSh ); diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index a6e9363e8d4f..e88bd4d826cc 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -99,17 +99,17 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE; + virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) override; - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwTabFrm(); protected: - virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void MakeAll(vcl::RenderContext* pRenderContext) override; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; // only changes the Framesize, not the PrtArea size - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE; + virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; public: SwTabFrm( SwTable &, SwFrm* ); // calling Regist Flys always after creation _and_pasting! @@ -124,16 +124,16 @@ public: inline SwTabFrm *GetFollow(); SwTabFrm* FindMaster( bool bFirstMaster = false ) const; - virtual bool GetInfo( SfxPoolItem &rHint ) const SAL_OVERRIDE; + virtual bool GetInfo( SfxPoolItem &rHint ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual void CheckDirection( bool bVert ) override; - virtual void Cut() SAL_OVERRIDE; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE; + virtual void Cut() override; + virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) override; virtual bool Prepare( const PrepareHint ePrep = PREP_CLEAR, - const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE; + const void *pVoid = 0, bool bNotify = true ) override; SwContentFrm *FindLastContent(); inline const SwContentFrm *FindLastContent() const; @@ -218,7 +218,7 @@ public: sal_uInt16 GetBottomLineSize() const; - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE; + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override; DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrm) }; diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx index 412df33720f7..8600e9b40034 100644 --- a/sw/source/core/inc/textapi.hxx +++ b/sw/source/core/inc/textapi.hxx @@ -35,9 +35,9 @@ class SwTextAPIEditSource : public SvxEditSource { SwTextAPIEditSource_Impl* pImpl; - 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; explicit SwTextAPIEditSource( const SwTextAPIEditSource& rSource ); public: diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx index 7d39c45e08c6..0dd65310b539 100644 --- a/sw/source/core/inc/threadlistener.hxx +++ b/sw/source/core/inc/threadlistener.hxx @@ -44,7 +44,7 @@ class ThreadListener : public IFinishedThreadListener void ListenToThread( const oslInterlockedCount nThreadID, ObservableThread& rThread ); - virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) SAL_OVERRIDE; + virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) override; private: diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 077d5fbd14c9..e332af4c4b9c 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -43,11 +43,11 @@ namespace objectpositioning const SwRect* mpToCharRect; SwTwips mnToCharTopOfLine; - virtual bool IsAnchoredToChar() const SAL_OVERRIDE; - virtual const SwFrm* ToCharOrientFrm() const SAL_OVERRIDE; - virtual const SwRect* ToCharRect() const SAL_OVERRIDE; + virtual bool IsAnchoredToChar() const override; + virtual const SwFrm* ToCharOrientFrm() const override; + virtual const SwRect* ToCharRect() const override; // #i22341# - virtual SwTwips ToCharTopOfLine() const SAL_OVERRIDE; + virtual SwTwips ToCharTopOfLine() const override; // method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> to // the needed type @@ -76,7 +76,7 @@ namespace objectpositioning /** calculate position of object */ - virtual void CalcPosition() SAL_OVERRIDE; + virtual void CalcPosition() override; /** frame, at which the vertical position is oriented at */ diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx index ca89944a37f4..debc00fb6e79 100644 --- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx +++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx @@ -41,7 +41,7 @@ namespace objectpositioning /** calculate position for object */ - virtual void CalcPosition() SAL_OVERRIDE; + virtual void CalcPosition() override; /** calculated relative position for object */ diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 1fd7a0816b5b..c0235ad5a1fd 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -182,13 +182,13 @@ struct SwTOXIndex : public SwTOXSortTabBase const ::com::sun::star::lang::Locale& rLocale ); virtual ~SwTOXIndex() {} - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; - virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; - virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual sal_uInt16 GetLevel() const override; + virtual bool operator==( const SwTOXSortTabBase& ) override; + virtual bool operator<( const SwTOXSortTabBase& ) override; private: - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const override; sal_uInt8 nKeyLevel; }; @@ -200,12 +200,12 @@ struct SwTOXCustom : public SwTOXSortTabBase const ::com::sun::star::lang::Locale& rLocale ); virtual ~SwTOXCustom() {} - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; - virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; - virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const override; + virtual bool operator==( const SwTOXSortTabBase& ) override; + virtual bool operator<( const SwTOXSortTabBase& ) override; private: - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const override; TextAndReading m_aKey; sal_uInt16 nLev; @@ -220,10 +220,10 @@ struct SwTOXContent : public SwTOXSortTabBase const SwTOXInternational& rIntl ); virtual ~SwTOXContent() {} - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual sal_uInt16 GetLevel() const override; private: - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const override; }; @@ -235,12 +235,12 @@ struct SwTOXPara : public SwTOXSortTabBase void SetStartIndex(sal_Int32 nSet) { nStartIndex = nSet; } void SetEndIndex(sal_Int32 nSet) { nEndIndex = nSet; } - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual sal_uInt16 GetLevel() const override; - virtual OUString GetURL() const SAL_OVERRIDE; + virtual OUString GetURL() const override; private: - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const override; SwTOXElement eType; sal_uInt16 m_nLevel; @@ -256,11 +256,11 @@ struct SwTOXTable : public SwTOXSortTabBase void SetLevel(sal_uInt16 nSet){nLevel = nSet;} - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual sal_uInt16 GetLevel() const override; - virtual OUString GetURL() const SAL_OVERRIDE; + virtual OUString GetURL() const override; private: - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual TextAndReading GetText_Impl() const override; sal_uInt16 nLevel; }; @@ -269,8 +269,8 @@ struct SwTOXAuthority : public SwTOXSortTabBase { private: SwFormatField& m_rField; - virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const SAL_OVERRIDE; - virtual TextAndReading GetText_Impl() const SAL_OVERRIDE; + virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; + virtual TextAndReading GetText_Impl() const override; public: SwTOXAuthority( const SwContentNode& rNd, SwFormatField& rField, const SwTOXInternational& rIntl ); @@ -278,9 +278,9 @@ public: SwFormatField& GetFieldFormat() {return m_rField;} - virtual bool operator==( const SwTOXSortTabBase& ) SAL_OVERRIDE; - virtual bool operator<( const SwTOXSortTabBase& ) SAL_OVERRIDE; - virtual sal_uInt16 GetLevel() const SAL_OVERRIDE; + virtual bool operator==( const SwTOXSortTabBase& ) override; + virtual bool operator<( const SwTOXSortTabBase& ) override; + virtual sal_uInt16 GetLevel() const override; }; #endif // INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 72446daa9690..978ba81f944c 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -196,15 +196,15 @@ class SwTextFrm: public SwContentFrm */ void _CalcHeightOfLastLine( const bool _bUseFont = false ); - virtual void DestroyImpl() SAL_OVERRIDE; + virtual void DestroyImpl() override; virtual ~SwTextFrm(); protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: - com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) SAL_OVERRIDE; + com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) override; /** * This is public, as it needs to be called by some methods in order to save the Prepare @@ -228,7 +228,7 @@ public: * Returns false if rPos > number of character is string */ virtual bool GetCharRect( SwRect& rRect, const SwPosition& rPos, - SwCrsrMoveState* pCMS = 0 ) const SAL_OVERRIDE; + SwCrsrMoveState* pCMS = 0 ) const override; /// A slimmer version of GetCharRect for autopositioning Frames bool GetAutoPos( SwRect &, const SwPosition& ) const; @@ -256,7 +256,7 @@ public: bool GetTopOfLine( SwTwips& _onTopOfLine, const SwPosition& _rPos ) const; - virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; + virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; /** * In nOffset returns the offset of the char within the set @@ -267,7 +267,7 @@ public: * returns true */ virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; + SwCrsrMoveState* = 0, bool bTestBackground = false ) const override; /** * Makes sure that the Frame is not switched (e.g. switched for a @@ -279,21 +279,21 @@ public: void PaintExtraData( const SwRect & rRect ) const; /// Page number etc. SwRect Paint(); virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, - SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE; - virtual bool GetInfo( SfxPoolItem & ) const SAL_OVERRIDE; + SwPrintData const*const pPrintData = NULL ) const override; + virtual bool GetInfo( SfxPoolItem & ) const override; /** * Layout oriented cursor travelling: * Left border, right border, previous Line, following Line, * same horizontal position */ - virtual bool LeftMargin(SwPaM *) const SAL_OVERRIDE; - virtual bool RightMargin(SwPaM *, bool bAPI = false) const SAL_OVERRIDE; + virtual bool LeftMargin(SwPaM *) const override; + virtual bool RightMargin(SwPaM *, bool bAPI = false) const override; virtual bool UnitUp(SwPaM *, const SwTwips nOffset = 0, - bool bSetInReadOnly = false ) const SAL_OVERRIDE; + bool bSetInReadOnly = false ) const override; virtual bool UnitDown(SwPaM *, const SwTwips nOffset = 0, - bool bSetInReadOnly = false ) const SAL_OVERRIDE; + bool bSetInReadOnly = false ) const override; bool _UnitUp(SwPaM *, const SwTwips nOffset = 0, bool bSetInReadOnly = false ) const; bool _UnitDown(SwPaM *, const SwTwips nOffset = 0, @@ -338,14 +338,14 @@ public: * potentially destroyed and replaced by Prepare */ virtual bool Prepare( const PrepareHint ePrep = PREP_CLEAR, - const void *pVoid = 0, bool bNotify = true ) SAL_OVERRIDE; + const void *pVoid = 0, bool bNotify = true ) override; /** * nMaxHeight is the required height * bSplit indicates, that the paragraph has to be split * bTst indicates, that we are currently doing a test formatting */ - virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst ) SAL_OVERRIDE; + virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst ) override; /** * The WouldFit equivalent for temporarily rewired TextFrames @@ -433,8 +433,8 @@ public: */ SwTwips GetFootnoteLine( const SwTextFootnote *pFootnote ) const; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; - virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; + virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) override; + virtual void CheckDirection( bool bVert ) override; /// Returns the sum of line height in pLine sal_uInt16 GetParHeight() const; @@ -629,7 +629,7 @@ public: static void repaintTextFrames( const SwTextNode& rNode ); - virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const SAL_OVERRIDE; + virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override; }; //use this to protect a SwTextFrm for a given scope from getting merged with diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx index 66440e8696eb..130a1f95779e 100644 --- a/sw/source/core/inc/undoflystrattr.hxx +++ b/sw/source/core/inc/undoflystrattr.hxx @@ -33,10 +33,10 @@ class SwUndoFlyStrAttr : public SwUndo const OUString& sNewStr ); virtual ~SwUndoFlyStrAttr(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; - virtual SwRewriter GetRewriter() const SAL_OVERRIDE; + virtual SwRewriter GetRewriter() const override; private: SwFlyFrameFormat& mrFlyFrameFormat; diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 22bf7de4b6bc..612cacb898a4 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -92,44 +92,44 @@ public: ::com::sun::star::lang::XUnoTunnel> & xUT); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; + virtual ::sfx2::Metadatable* GetCoreObject() override; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > GetModel() SAL_OVERRIDE; + ::com::sun::star::frame::XModel > GetModel() override; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - 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& 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; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 > & xListener) - 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& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -137,56 +137,56 @@ 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, 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& rPropertyName, 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 addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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 removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; @@ -201,20 +201,20 @@ class SwXFieldmarkParameters } // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) 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; - 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; + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::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) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) 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; + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::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; - 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; + 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) 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; // 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; protected: //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; private: ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (::com::sun::star::uno::RuntimeException); }; @@ -246,13 +246,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException) override; virtual OUString SAL_CALL getFieldType() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setFieldType(const OUString& description ) - 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::XNameContainer > SAL_CALL getParameters( ) - 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& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -260,13 +260,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; }; class SwXODFCheckboxField : public SwXFieldmark diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index 26fb808c7ebf..db01ae888c96 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -37,7 +37,7 @@ class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor //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; protected: virtual ~SwHyperlinkEventDescriptor(); public: @@ -71,12 +71,12 @@ public: virtual ~SwFrameEventDescriptor(); virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; protected: - virtual void setMacroItem(const SvxMacroItem& rItem) SAL_OVERRIDE; - virtual const SvxMacroItem& getMacroItem() SAL_OVERRIDE; - virtual sal_uInt16 getMacroItemWhich() const SAL_OVERRIDE; + virtual void setMacroItem(const SvxMacroItem& rItem) override; + virtual const SvxMacroItem& getMacroItem() override; + virtual sal_uInt16 getMacroItemWhich() const override; }; class SwFrameStyleEventDescriptor : public SvEventDescriptor @@ -91,12 +91,12 @@ public: virtual ~SwFrameStyleEventDescriptor(); virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; protected: - virtual void setMacroItem(const SvxMacroItem& rItem) SAL_OVERRIDE; - virtual const SvxMacroItem& getMacroItem() SAL_OVERRIDE; - virtual sal_uInt16 getMacroItemWhich() const SAL_OVERRIDE; + virtual void setMacroItem(const SvxMacroItem& rItem) override; + virtual const SvxMacroItem& getMacroItem() override; + virtual sal_uInt16 getMacroItemWhich() const override; }; #endif diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx index b2aa572d9cdb..7669abd6f018 100644 --- a/sw/source/core/inc/unofield.hxx +++ b/sw/source/core/inc/unofield.hxx @@ -76,35 +76,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - 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& 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; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 > & xListener) - 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& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -112,40 +112,40 @@ 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, 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& rPropertyName, 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 addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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 removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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; }; @@ -185,35 +185,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - 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& 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; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 > & xListener) - 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& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -221,68 +221,68 @@ 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, 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& rPropertyName, 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 addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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 removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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; // XUpdatable virtual void SAL_CALL update() - 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // 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; // XDependentTextField virtual void SAL_CALL attachTextFieldMaster( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xFieldMaster) 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::beans::XPropertySet> SAL_CALL getTextFieldMaster() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; @@ -306,21 +306,21 @@ 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& 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; // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - 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 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; }; diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index a9cd27892fe6..b173d03bc930 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -61,7 +61,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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -69,60 +69,60 @@ 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, 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& rPropertyName, 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 addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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 removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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; // text::XTextMarkup: - virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange, - const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; // text::XFlatParagraph: - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setChecked(::sal_Int32 nType, sal_Bool bVal) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; - virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setChecked(::sal_Int32 nType, sal_Bool bVal) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) override; using SwXTextMarkup::GetTextNode; @@ -130,7 +130,7 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence< sal_Int8 >& rId) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: SwXFlatParagraph( const SwXFlatParagraph & ) = delete; @@ -151,15 +151,15 @@ public: virtual ~SwXFlatParagraphIterator(); // text::XFlatParagraphIterator: - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; private: SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ) = delete; diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx index 67eae2330250..d687dbb644b2 100644 --- a/sw/source/core/inc/unofootnote.hxx +++ b/sw/source/core/inc/unofootnote.hxx @@ -57,12 +57,12 @@ private: protected: - virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE; + virtual const SwStartNode *GetStartNode() const override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException) override; virtual ~SwXFootnote(); @@ -78,52 +78,52 @@ 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 { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } + throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // 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; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - 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& 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; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 > & xListener) - 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& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -131,80 +131,80 @@ 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, 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& rPropertyName, 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 addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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 removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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; // XElementAccess 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; // 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; + 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XFootnote virtual OUString SAL_CALL getLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLabel(const OUString& rLabel) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::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; + 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 > & xTextPosition) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx index fb0f948d974a..8d662c25988b 100644 --- a/sw/source/core/inc/unoidx.hxx +++ b/sw/source/core/inc/unoidx.hxx @@ -76,44 +76,44 @@ public: TOXTypes eTypes = TOX_INDEX); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; + virtual ::sfx2::Metadatable* GetCoreObject() override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel() SAL_OVERRIDE; + GetModel() override; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - 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& 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; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 > & xListener) - 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& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -121,74 +121,74 @@ 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, 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& rPropertyName, 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 addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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 removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - 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>& xListener) - 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>& xListener) - 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XDocumentIndex virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; @@ -228,35 +228,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - 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& 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; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 > & xListener) - 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& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -264,56 +264,56 @@ 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, 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& rPropertyName, 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 addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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 removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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; // 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XDocumentIndexMark virtual OUString SAL_CALL getMarkEntry() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 029999d61444..c80ea70f7e03 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -113,108 +113,108 @@ public: ::com::sun::star::uno::RuntimeException); // MetadatableMixin - virtual ::sfx2::Metadatable * GetCoreObject() SAL_OVERRIDE; + virtual ::sfx2::Metadatable * GetCoreObject() override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel() SAL_OVERRIDE; + GetModel() override; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) - 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& 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; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 > & xListener) - 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( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> const& xParent) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::NoSupportException, std::exception) SAL_OVERRIDE; + ::com::sun::star::lang::NoSupportException, std::exception) override; // XElementAccess 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; // 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; + 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; + throw (::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; + SAL_CALL 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; + 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getString() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString(const OUString& rString) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::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; + 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 > & xTextPosition) - 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; // XText virtual void SAL_CALL insertTextContent( @@ -224,12 +224,12 @@ 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; }; @@ -268,31 +268,31 @@ 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; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 > & xListener) - 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& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -300,54 +300,54 @@ 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, 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& rPropertyName, 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 addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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 removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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; // 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // 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; }; diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 036ab7e4b9a6..ac180a65433e 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -144,7 +144,7 @@ protected: virtual ~SwXTextPortion(); //SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwTextPortionType eType ); @@ -158,51 +158,51 @@ public: bool bIsEnd ); //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; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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; - virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL 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 ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL 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 ) 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; - 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; - 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; + 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) 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) 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) override; //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) 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; - 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; - 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; - 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; - 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; + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::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) 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) 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) 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) 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 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; - 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; - 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; - 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; - 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; - 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; + 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) 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) 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) 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) 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) 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) 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; - 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; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_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; + 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) 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) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::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) override; //XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - 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; //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; //XContentEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::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 ) override; void SetRefMark( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > xMark) @@ -266,24 +266,24 @@ public: //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; //XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - 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 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 SwXRedlinePortion : public SwXTextPortion @@ -312,14 +312,14 @@ public: SwRangeRedline const& rRedline, bool const bIsStart) throw(); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet 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; }; #endif diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx index 29641aa16384..cac6f29d3dae 100644 --- a/sw/source/core/inc/unorefmark.hxx +++ b/sw/source/core/inc/unorefmark.hxx @@ -65,35 +65,35 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - 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& 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; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 > & xListener) - 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& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -101,56 +101,56 @@ 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, 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& rPropertyName, 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 addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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 removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index 3c0fea4cecc0..31fa12473e0e 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -73,44 +73,44 @@ public: const bool bIndexHeader = false); // MetadatableMixin - virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE; + virtual ::sfx2::Metadatable* GetCoreObject() override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetModel() SAL_OVERRIDE; + GetModel() override; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - 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& 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; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 > & xListener) - 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& rPropertyName, const ::com::sun::star::uno::Any& rValue) @@ -118,62 +118,62 @@ 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, 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& rPropertyName, 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 addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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 removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& 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; // XPropertyState virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& rPropertyName) 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 >& rPropertyNames) 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& rPropertyName) 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& 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; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( @@ -184,55 +184,55 @@ 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 >& rPropertyNames) - 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 >& rPropertyNames, 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 >& rPropertyNames, 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; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - 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; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XTextSection virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection > SAL_CALL getParentSection() - 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::text::XTextSection > > SAL_CALL getChildSections() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index f24fc9731a9b..55ecb9036f55 100644 --- a/sw/source/core/inc/unotextmarkup.hxx +++ b/sw/source/core/inc/unotextmarkup.hxx @@ -55,16 +55,16 @@ public: virtual ~SwXTextMarkup(); // ::com::sun::star::text::XTextMarkup: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // ::com::sun::star::text::XMultiTextMarkup: - virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; private: SwXTextMarkup( const SwXTextMarkup & ) = delete; @@ -89,12 +89,12 @@ public: SwXStringKeyMap(); // ::com::sun::star::container::XStringKeyMap: - virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException, std::exception) override; + virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; private: SwXStringKeyMap(SwXStringKeyMap &) = delete; diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx index 109b9b55cf80..f9647fbcaf8c 100644 --- a/sw/source/core/inc/visiturl.hxx +++ b/sw/source/core/inc/visiturl.hxx @@ -31,7 +31,7 @@ public: SwURLStateChanged( SwDoc* pD ); virtual ~SwURLStateChanged(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; #endif diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index b2bd9785432d..2e82142222c3 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -177,7 +177,7 @@ public: SwSizeEnterLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrmHeight( pF->Frm().Height() ) {} virtual ~SwSizeEnterLeave() {} - virtual void Leave() SAL_OVERRIDE; // resize message + virtual void Leave() override; // resize message }; class SwUpperEnterLeave : public SwImplEnterLeave @@ -187,8 +187,8 @@ public: SwUpperEnterLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrmId( 0 ) {} virtual ~SwUpperEnterLeave() {} - virtual void Enter() SAL_OVERRIDE; // message - virtual void Leave() SAL_OVERRIDE; // message of FrmId from upper + virtual void Enter() override; // message + virtual void Leave() override; // message of FrmId from upper }; class SwFrmChangesLeave : public SwImplEnterLeave @@ -198,8 +198,8 @@ public: SwFrmChangesLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), aFrm( pF->Frm() ) {} virtual ~SwFrmChangesLeave() {} - virtual void Enter() SAL_OVERRIDE; // no message - virtual void Leave() SAL_OVERRIDE; // message when resizing the Frm area + virtual void Enter() override; // no message + virtual void Leave() override; // message when resizing the Frm area }; void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, void* pParam ) diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 69fe058ba771..1b5e10d7f6bf 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -3241,7 +3241,7 @@ class SwFrmHolder : private SfxListener { SwFrm* pFrm; bool bSet; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; public: SwFrmHolder() : pFrm(0), bSet(false) {} void SetFrm( SwFrm* pHold ); diff --git a/sw/source/core/layout/objectformatterlayfrm.hxx b/sw/source/core/layout/objectformatterlayfrm.hxx index 99ba0e13292a..ae86b9cbb5f4 100644 --- a/sw/source/core/layout/objectformatterlayfrm.hxx +++ b/sw/source/core/layout/objectformatterlayfrm.hxx @@ -48,7 +48,7 @@ class SwObjectFormatterLayFrm : public SwObjectFormatter protected: - virtual SwFrm& GetAnchorFrm() SAL_OVERRIDE; + virtual SwFrm& GetAnchorFrm() override; public: virtual ~SwObjectFormatterLayFrm(); @@ -56,8 +56,8 @@ class SwObjectFormatterLayFrm : public SwObjectFormatter // #i40147# - add parameter <_bCheckForMovedFwd>. // Not relevant for objects anchored at layout frame. virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj, - const bool _bCheckForMovedFwd = false ) SAL_OVERRIDE; - virtual bool DoFormatObjs() SAL_OVERRIDE; + const bool _bCheckForMovedFwd = false ) override; + virtual bool DoFormatObjs() override; static SwObjectFormatterLayFrm* CreateObjFormatter( SwLayoutFrm& _rAnchorLayFrm, diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx index 4caa869bce3b..06d65f9e3db7 100644 --- a/sw/source/core/layout/objectformattertxtfrm.hxx +++ b/sw/source/core/layout/objectformattertxtfrm.hxx @@ -116,15 +116,15 @@ class SwObjectFormatterTextFrm : public SwObjectFormatter protected: - virtual SwFrm& GetAnchorFrm() SAL_OVERRIDE; + virtual SwFrm& GetAnchorFrm() override; public: virtual ~SwObjectFormatterTextFrm(); // #i40147# - add parameter <_bCheckForMovedFwd>. virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj, - const bool _bCheckForMovedFwd = false ) SAL_OVERRIDE; - virtual bool DoFormatObjs() SAL_OVERRIDE; + const bool _bCheckForMovedFwd = false ) override; + virtual bool DoFormatObjs() override; /** method to create an instance of <SwObjectFormatterTextFrm> is necessary. diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 661709877981..f51953ca30c4 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3140,7 +3140,7 @@ namespace virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, - const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE + const sdr::contact::DisplayInfo& rDisplayInfo) override { bool bPaint( true ); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 0bb77e69cd37..d2dcfd94b1e7 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -71,13 +71,13 @@ private: sal_Int32 m_nLRU_InitSize; static uno::Sequence< OUString > GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwOLELRUCache(); virtual void Notify( const uno::Sequence< - OUString>& aPropertyNames ) SAL_OVERRIDE; + OUString>& aPropertyNames ) override; void Load(); void InsertObj( SwOLEObj& rObj ); @@ -92,9 +92,9 @@ class SwOLEListener_Impl : public ::cppu::WeakImplHelper< embed::XStateChangeLis public: explicit SwOLEListener_Impl( SwOLEObj* pObj ); void Release(); - virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception) override; }; SwOLEListener_Impl::SwOLEListener_Impl( SwOLEObj* pObj ) @@ -150,9 +150,9 @@ public: explicit SwEmbedObjectLink(SwOLENode* pNode); virtual ~SwEmbedObjectLink(); - 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; bool Connect() { return GetRealObject() != NULL; } }; diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx index 8c715df865bd..dc91f13ba594 100644 --- a/sw/source/core/swg/SwXMLBlockImport.cxx +++ b/sw/source/core/swg/SwXMLBlockImport.cxx @@ -55,7 +55,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; }; class SwXMLBlockContext : public SvXMLImportContext @@ -77,7 +77,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual ~SwXMLTextBlockDocumentContext(); }; @@ -93,7 +93,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual ~SwXMLTextBlockBodyContext(); }; @@ -110,7 +110,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual ~SwXMLTextBlockTextContext(); }; @@ -125,7 +125,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); virtual void SAL_CALL characters( const OUString & aChars ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual ~SwXMLTextBlockParContext(); }; diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 47ed32b0e3c1..83f50b91fdf8 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -814,7 +814,7 @@ class SwMetaPortion : public SwTextPortion { public: inline SwMetaPortion() { SetWhichPor( POR_META ); } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; // OUTPUT_OPERATOR }; diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx index 568b03ff48d5..11598ab1d899 100644 --- a/sw/source/core/text/pordrop.hxx +++ b/sw/source/core/text/pordrop.hxx @@ -81,11 +81,11 @@ public: const sal_uInt16 nDistance ); virtual ~SwDropPortion(); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; void PaintDrop( const SwTextPaintInfo &rInf ) const; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE; - virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override; + virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override; inline sal_uInt16 GetLines() const { return nLines; } inline sal_uInt16 GetDistance() const { return nDistance; } diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx index c9f9c7b24556..166c77c58422 100644 --- a/sw/source/core/text/porexp.hxx +++ b/sw/source/core/text/porexp.hxx @@ -26,14 +26,14 @@ class SwExpandPortion : public SwTextPortion { public: inline SwExpandPortion() { SetWhichPor( POR_EXP ); } - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; - virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; + virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -47,16 +47,16 @@ public: : cChar( cCh ), bMulti( bMult ) { cChar = cCh; SetLen(1); SetWhichPor( POR_BLANK ); } - virtual SwLinePortion *Compress() SAL_OVERRIDE; - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; - virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual SwLinePortion *Compress() override; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; + virtual void FormatEOL( SwTextFormatInfo &rInf ) override; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; static sal_uInt16 MayUnderflow( const SwTextFormatInfo &rInf, sal_Int32 nIdx, bool bUnderflow ); // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -66,10 +66,10 @@ class SwPostItsPortion : public SwExpandPortion bool bScript; public: explicit SwPostItsPortion( bool bScrpt ); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; bool IsScript() const { return bScript; } OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx index 3f574987786f..56739b441c6d 100644 --- a/sw/source/core/text/porfld.hxx +++ b/sw/source/core/text/porfld.hxx @@ -65,14 +65,14 @@ public: inline const SwFont *GetFont() const { return pFnt; } inline OUString GetExp() const { return aExpand; } - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; // Empty fields are also allowed - virtual SwLinePortion *Compress() SAL_OVERRIDE; + virtual SwLinePortion *Compress() override; - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; inline bool IsFollow() const { return bFollow; } inline void SetFollow( bool bNew ) { bFollow = bNew; } @@ -98,10 +98,10 @@ public: virtual SwFieldPortion *Clone( const OUString &rExpand ) const; // Extra GetTextSize because of pFnt - virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE; + virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -115,11 +115,11 @@ public: inline SwHiddenPortion( const OUString &rExpand, SwFont *pFntL = 0 ) : SwFieldPortion( rExpand, pFntL ) { SetLen(1); SetWhichPor( POR_HIDDEN ); } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; // Field cloner for SplitGlue - virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE; + virtual SwFieldPortion *Clone( const OUString &rExpand ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -137,13 +137,13 @@ public: const bool bCenter, const sal_uInt16 nMinDst, const bool bLabelAlignmentPosAndSpaceModeActive ); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; // Field cloner for SplitGlue - virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE; - virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual SwFieldPortion *Clone( const OUString &rExpand ) const override; + virtual void FormatEOL( SwTextFormatInfo &rInf ) override; OUTPUT_OPERATOR_OVERRIDE }; @@ -179,8 +179,8 @@ public: const sal_uInt16 nMinDst, const bool bLabelAlignmentPosAndSpaceModeActive ); virtual ~SwGrfNumPortion(); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; void SetBase( long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent ); @@ -219,9 +219,9 @@ class SwCombinedPortion : public SwFieldPortion sal_uInt8 nProportion; // relative font height public: explicit SwCombinedPortion( const OUString &rExpand ); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -237,7 +237,7 @@ public: { } // Field cloner for SplitGlue - virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE; + virtual SwFieldPortion *Clone( const OUString &rExpand ) const override; }; #endif diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index 9b9aef0373bc..941388a86fc6 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -36,8 +36,8 @@ public: : SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); } inline sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; } inline void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; OUTPUT_OPERATOR_OVERRIDE }; @@ -49,7 +49,7 @@ class SwFlyCntPortion : public SwLinePortion bool bDraw : 1; // DrawContact? bool bMax : 1; // Line adjustment and height == line height sal_uInt8 nAlign : 3; // Line adjustment? No, above, middle, bottom - virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; + virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override; public: // Use new datatype for parameter <nFlags> @@ -81,8 +81,8 @@ public: objectpositioning::AsCharFlags nFlags ); sal_Int32 GetFlyCrsrOfst( const sal_uInt16 nOfst, const Point &rPoint, SwPosition *pPos, SwCrsrMoveState* pCMS ) const; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx index 2a532022c386..6051c26dbcb1 100644 --- a/sw/source/core/text/porftn.hxx +++ b/sw/source/core/text/porftn.hxx @@ -36,10 +36,10 @@ public: sal_uInt16 nOrig = USHRT_MAX ); sal_uInt16& Orig() { return nOrigHeight; } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; - virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; + virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; // #i98418# void SetPreferredScriptType( sal_uInt8 nPreferredScriptType ); @@ -63,19 +63,19 @@ class SwQuoVadisPortion : public SwFieldPortion OUString aErgo; public: SwQuoVadisPortion( const OUString &rExp, const OUString& rStr ); - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; void SetNumber( const OUString& rStr ) { aErgo = rStr; } const OUString GetQuoText() const { return aExpand; } const OUString &GetContText() const { return aErgo; } // Field cloner for SplitGlue - virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE; + virtual SwFieldPortion *Clone( const OUString &rExpand ) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -84,11 +84,11 @@ class SwErgoSumPortion : public SwFieldPortion { public: SwErgoSumPortion( const OUString &rExp, const OUString& rStr ); - virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; // Field cloner for SplitGlue - virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE; + virtual SwFieldPortion *Clone( const OUString &rExpand ) const override; OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx index 182faab066b8..c43f0418d196 100644 --- a/sw/source/core/text/porglue.hxx +++ b/sw/source/core/text/porglue.hxx @@ -40,10 +40,10 @@ public: inline void MoveAllGlue( SwGluePortion *pTarget ); inline void MoveHalfGlue( SwGluePortion *pTarget ); inline void AdjFixWidth(); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; - virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE; - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override; + virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx index 90af3bf74632..aecf4523e36c 100644 --- a/sw/source/core/text/porhyph.hxx +++ b/sw/source/core/text/porhyph.hxx @@ -28,11 +28,11 @@ public: { SetWhichPor( POR_HYPH ); } - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -47,10 +47,10 @@ public: SetWhichPor( POR_HYPHSTR ); } - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -63,18 +63,18 @@ class SwSoftHyphPortion : public SwHyphPortion public: SwSoftHyphPortion(); - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; - virtual SwLinePortion *Compress() SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; + virtual SwLinePortion *Compress() override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void FormatEOL( SwTextFormatInfo &rInf ) override; inline void SetExpand( const bool bNew ) { bExpand = bNew; } bool IsExpand() const { return bExpand; } - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -83,7 +83,7 @@ class SwSoftHyphStrPortion : public SwHyphStrPortion { public: explicit SwSoftHyphStrPortion( const OUString &rStr ); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx index 777f6f1d7e30..8e398446e748 100644 --- a/sw/source/core/text/porlay.hxx +++ b/sw/source/core/text/porlay.hxx @@ -101,8 +101,8 @@ private: public: // From SwLinePortion - virtual SwLinePortion *Insert( SwLinePortion *pPortion ) SAL_OVERRIDE; - virtual SwLinePortion *Append( SwLinePortion *pPortion ) SAL_OVERRIDE; + virtual SwLinePortion *Insert( SwLinePortion *pPortion ) override; + virtual SwLinePortion *Append( SwLinePortion *pPortion ) override; inline SwLinePortion *GetFirstPortion() const; // Flags @@ -158,7 +158,7 @@ public: { return _GetHangingMargin(); } // For special treatment for empty lines - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) override; // Stuff for justified alignment inline bool IsSpaceAdd() { return pLLSpaceAdd != NULL; } diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index 9d410f0802d1..e78d96e25e5c 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -34,7 +34,7 @@ class SwPortionHandler; // The portions output operators are virtual methods of the portion. #ifdef DBG_UTIL #define OUTPUT_OPERATOR virtual SvStream & operator<<( SvStream & aOs ) const; -#define OUTPUT_OPERATOR_OVERRIDE virtual SvStream & operator<<( SvStream & aOs ) const SAL_OVERRIDE; +#define OUTPUT_OPERATOR_OVERRIDE virtual SvStream & operator<<( SvStream & aOs ) const override; #else #define OUTPUT_OPERATOR #define OUTPUT_OPERATOR_OVERRIDE diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx index 8e323aa2a3a2..5ec7998c17ee 100644 --- a/sw/source/core/text/pormulti.hxx +++ b/sw/source/core/text/pormulti.hxx @@ -128,8 +128,8 @@ public: inline bool OnTop() const { return bTop; } void ActualizeTabulator(); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override; virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const; // Summarize the internal lines to calculate the (external) size @@ -141,7 +141,7 @@ public: inline sal_uInt8 GetDirection() const { return nDirection; } // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -175,8 +175,8 @@ public: inline sal_Int32 GetSmallerSpaceCnt() const { return ( nLineDiff < 0 ) ? nBlank1 : nBlank2; } - virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; - virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE; + virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override; + virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const override; }; class SwRubyPortion : public SwMultiPortion @@ -219,9 +219,9 @@ public: // Get number of blanks for justified alignment sal_Int32 GetSpaceCnt( const SwTextSizeInfo &rInf ) const; // Calculates extra spacing based on number of blanks - virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; + virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override; // Manipulate the spacing array at pCurr - virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE; + virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const override; }; // For cursor travelling in multiportions diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx index 8035d7f462c2..593acb05edc6 100644 --- a/sw/source/core/text/porref.hxx +++ b/sw/source/core/text/porref.hxx @@ -25,7 +25,7 @@ class SwRefPortion : public SwTextPortion { public: inline SwRefPortion(){ SetWhichPor( POR_REF ); } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -35,13 +35,13 @@ class SwIsoRefPortion : public SwRefPortion public: SwIsoRefPortion(); - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual SwLinePortion *Compress() SAL_OVERRIDE; - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual SwLinePortion *Compress() override; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx index 31f8ab0448bd..4e5dd7a339b2 100644 --- a/sw/source/core/text/porrst.hxx +++ b/sw/source/core/text/porrst.hxx @@ -30,7 +30,7 @@ class SwTmpEndPortion : public SwLinePortion { public: explicit SwTmpEndPortion( const SwLinePortion &rPortion ); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -39,14 +39,14 @@ class SwBreakPortion : public SwLinePortion public: explicit SwBreakPortion( const SwLinePortion &rPortion ); // Returns 0 if we have no usable data - virtual SwLinePortion *Compress() SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; - virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; + virtual SwLinePortion *Compress() override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; + virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -71,8 +71,8 @@ public: // of rPortion. It is only used for kerning portions for grid mode explicit SwKernPortion( const SwLinePortion &rPortion ); - virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void FormatEOL( SwTextFormatInfo &rInf ) override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -84,8 +84,8 @@ class SwArrowPortion : public SwLinePortion public: explicit SwArrowPortion( const SwLinePortion &rPortion ); explicit SwArrowPortion( const SwTextPaintInfo &rInf ); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual SwLinePortion *Compress() SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual SwLinePortion *Compress() override; inline bool IsLeft() const { return bLeft; } inline const Point& GetPos() const { return aPos; } OUTPUT_OPERATOR_OVERRIDE @@ -112,8 +112,8 @@ public: explicit SwHiddenTextPortion( sal_Int32 nLen ) { SetWhichPor( POR_HIDDEN_TXT ); SetLen( nLen ); } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; }; class SwControlCharPortion : public SwLinePortion @@ -132,9 +132,9 @@ public: SetWhichPor( POR_CONTROLCHAR ); SetLen( 1 ); } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo& rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo& rInf ) const override; }; #endif diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx index fa635c1f0359..5261a96d6325 100644 --- a/sw/source/core/text/portab.hxx +++ b/sw/source/core/text/portab.hxx @@ -31,16 +31,16 @@ class SwTabPortion : public SwFixPortion bool PreFormat( SwTextFormatInfo &rInf ); public: SwTabPortion( const sal_uInt16 nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true ); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void FormatEOL( SwTextFormatInfo &rInf ) override; bool PostFormat( SwTextFormatInfo &rInf ); inline bool IsFilled() const { return 0 != cFill; } inline sal_uInt16 GetTabPos() const { return nTabPos; } inline bool IsAutoTabStop() const { return bAutoTabStop; } // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -112,7 +112,7 @@ public: const sal_Unicode cFillChar = '\0' ) : SwTabDecimalPortion( nTabPosVal, cTab, cFillChar ) { SetLen( 0 ); } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; }; #endif diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx index 2d5811ed9bda..3d4937e65e27 100644 --- a/sw/source/core/text/portox.hxx +++ b/sw/source/core/text/portox.hxx @@ -26,7 +26,7 @@ class SwToxPortion : public SwTextPortion { public: inline SwToxPortion(){ SetWhichPor( POR_TOX ); } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -36,13 +36,13 @@ class SwIsoToxPortion : public SwToxPortion public: SwIsoToxPortion(); - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual SwLinePortion *Compress() SAL_OVERRIDE; - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual SwLinePortion *Compress() override; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx index 644915f3cd3f..08710b07f513 100644 --- a/sw/source/core/text/portxt.hxx +++ b/sw/source/core/text/portxt.hxx @@ -35,13 +35,13 @@ class SwTextPortion : public SwLinePortion public: inline SwTextPortion(){ SetWhichPor( POR_TXT ); } static SwTextPortion * CopyLinePortion(const SwLinePortion &rPortion); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE; - virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE; - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; - virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void FormatEOL( SwTextFormatInfo &rInf ) override; + virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override; + virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; + virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override; // Counts the spaces for justified paragraph sal_Int32 GetSpaceCnt( const SwTextSizeInfo &rInf, sal_Int32& rCnt ) const; @@ -49,7 +49,7 @@ public: bool CreateHyphen( SwTextFormatInfo &rInf, SwTextGuess &rGuess ); // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE DECL_FIXEDMEMPOOL_NEWDEL(SwTextPortion) @@ -60,11 +60,11 @@ class SwTextInputFieldPortion : public SwTextPortion public: SwTextInputFieldPortion(); - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; - virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE; - virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; + virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; + virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override; private: bool mbContainsInputFieldStart; @@ -79,12 +79,12 @@ public: explicit SwHolePortion( const SwTextPortion &rPor ); sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; } void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; } - virtual SwLinePortion *Compress() SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; + virtual SwLinePortion *Compress() override; + virtual bool Format( SwTextFormatInfo &rInf ) override; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE DECL_FIXEDMEMPOOL_NEWDEL(SwHolePortion) @@ -95,8 +95,8 @@ class SwFieldMarkPortion : public SwTextPortion public: inline SwFieldMarkPortion() : SwTextPortion() { } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; }; class SwFieldFormCheckboxPortion : public SwTextPortion @@ -105,8 +105,8 @@ public: SwFieldFormCheckboxPortion() : SwTextPortion() { } - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual bool Format( SwTextFormatInfo &rInf ) override; }; #endif diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx index c3bdd80391b3..0f1435b66a2b 100644 --- a/sw/source/core/text/txtcache.hxx +++ b/sw/source/core/text/txtcache.hxx @@ -46,14 +46,14 @@ class SwTextLineAccess : public SwCacheAccess { protected: - virtual SwCacheObj *NewObj() SAL_OVERRIDE; + virtual SwCacheObj *NewObj() override; public: explicit SwTextLineAccess( const SwTextFrm *pOwner ); SwParaPortion *GetPara(); - virtual bool IsAvailable() const SAL_OVERRIDE; + virtual bool IsAvailable() const override; }; #endif diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index fa985610241b..e3f90dd71579 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -118,7 +118,7 @@ class XmlPortionDumper:public SwPortionHandler virtual void Text( sal_Int32 nLength, sal_uInt16 nType, sal_Int32 nHeight, - sal_Int32 nWidth) SAL_OVERRIDE + sal_Int32 nWidth) override { ofs += nLength; xmlTextWriterStartElement( writer, BAD_CAST( "Text" ) ); @@ -151,7 +151,7 @@ class XmlPortionDumper:public SwPortionHandler sal_uInt16 nType, sal_Int32 nHeight, sal_Int32 nWidth, - const SwFont* pFont ) SAL_OVERRIDE + const SwFont* pFont ) override { xmlTextWriterStartElement( writer, BAD_CAST( "Special" ) ); xmlTextWriterWriteFormatAttribute( writer, @@ -179,7 +179,7 @@ class XmlPortionDumper:public SwPortionHandler ofs += nLength; } - virtual void LineBreak( sal_Int32 nWidth ) SAL_OVERRIDE + virtual void LineBreak( sal_Int32 nWidth ) override { xmlTextWriterStartElement( writer, BAD_CAST( "LineBreak" ) ); if (nWidth > 0) @@ -193,7 +193,7 @@ class XmlPortionDumper:public SwPortionHandler * @param nLength * number of 'model string' characters to be skipped */ - virtual void Skip( sal_Int32 nLength ) SAL_OVERRIDE + virtual void Skip( sal_Int32 nLength ) override { xmlTextWriterStartElement( writer, BAD_CAST( "Skip" ) ); xmlTextWriterWriteFormatAttribute( writer, @@ -203,7 +203,7 @@ class XmlPortionDumper:public SwPortionHandler ofs += nLength; } - virtual void Finish( ) SAL_OVERRIDE + virtual void Finish( ) override { xmlTextWriterStartElement( writer, BAD_CAST( "Finish" ) ); xmlTextWriterEndElement( writer ); diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index 1613c62567ab..262185a61af3 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -51,12 +51,12 @@ public: virtual ~SwGrammarContact() { aTimer.Stop(); delete mpProxyList; } // (pure) virtual functions of IGrammarContact - virtual void updateCursorPosition( const SwPosition& rNewPos ) SAL_OVERRIDE; - virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool bCreate ) SAL_OVERRIDE; - virtual void finishGrammarCheck( SwTextNode& rTextNode ) SAL_OVERRIDE; + virtual void updateCursorPosition( const SwPosition& rNewPos ) override; + virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool bCreate ) override; + virtual void finishGrammarCheck( SwTextNode& rTextNode ) override; protected: // virtual function of SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; }; SwGrammarContact::SwGrammarContact() : mpProxyList(0), mbFinished( false ) diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index bc0fa90bd567..acc88ec5d69a 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -112,8 +112,8 @@ protected: public: explicit SwDoGetCapitalSize( SwDrawTextInfo &rInfo ) : SwDoCapitals ( rInfo ) { } virtual ~SwDoGetCapitalSize() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; - virtual void Do() SAL_OVERRIDE; + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) override; + virtual void Do() override; const Size &GetSize() const { return aTextSize; } }; @@ -165,8 +165,8 @@ public: , m_nBreak( -1 ) { } virtual ~SwDoGetCapitalBreak() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; - virtual void Do() SAL_OVERRIDE; + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) override; + virtual void Do() override; sal_Int32 getBreak() const { return m_nBreak; } }; @@ -240,8 +240,8 @@ public: SwDoCapitals( rInfo ), pUpperFnt(0), pLowerFnt(0) { } virtual ~SwDoDrawCapital() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; - virtual void Do() SAL_OVERRIDE; + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) override; + virtual void Do() override; void DrawSpace( Point &rPos ); }; @@ -324,8 +324,8 @@ public: SwDoCapitals( rInfo ), pUpperFnt(0), pLowerFnt(0), nCrsr( 0 ), nOfst( nOfs ) { } virtual ~SwDoCapitalCrsrOfst() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; - virtual void Do() SAL_OVERRIDE; + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) override; + virtual void Do() override; inline sal_Int32 GetCrsr(){ return nCrsr; } }; @@ -392,7 +392,7 @@ class SwDoDrawStretchCapital : public SwDoDrawCapital const sal_uInt16 nCapWidth; const sal_uInt16 nOrgWidth; public: - virtual void Do() SAL_OVERRIDE; + virtual void Do() override; SwDoDrawStretchCapital( SwDrawTextInfo &rInfo, const sal_uInt16 nCapitalWidth ) : SwDoDrawCapital( rInfo ), diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index 34465b55e212..6419d3c577f2 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -287,8 +287,8 @@ public: virtual ~SwUndoDelSection(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; SwUndo * MakeUndoDelSection(SwSectionFormat const& rFormat) @@ -395,8 +395,8 @@ public: virtual ~SwUndoUpdateSection(); - virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; - virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE; + virtual void UndoImpl( ::sw::UndoRedoContext & ) override; + virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; SwUndo * diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index bd54dde1f043..7a2164e0e049 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -65,7 +65,7 @@ public: void registerInMark(SwXBookmark & rThis, ::sw::mark::IMark *const pBkmk); protected: // SwClient - virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; }; diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 61cddcc67ea7..37046e4953a5 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -100,13 +100,13 @@ public: explicit SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {} // XCodeNameQuery - OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE + OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException, std::exception ) override { // #FIXME not implemented... return OUString(); } - 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 { // Initialise the code name if ( msThisDocumentCodeName.isEmpty() ) @@ -182,17 +182,17 @@ public: SwVbaProjectNameProvider() { } - 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 { return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() ); } - 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::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 { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); return uno::makeAny( mTemplateToProject.find( aName )->second ); } - 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 { uno::Sequence< OUString > aElements( mTemplateToProject.size() ); StringHashMap::iterator it_end = mTemplateToProject.end(); @@ -202,7 +202,7 @@ public: return aElements; } - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, std::exception ) override { OUString sProjectName; @@ -212,24 +212,24 @@ public: mTemplateToProject[ aName ] = sProjectName; } - virtual void SAL_CALL removeByName( const OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL removeByName( const OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) override { if ( !hasByName( Name ) ) throw container::NoSuchElementException(); mTemplateToProject.erase( Name ); } - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); insertByName( aName, aElement ); // insert will overwrite } // XElemenAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) 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 { return ::cppu::UnoType<OUString>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override { return ( !mTemplateToProject.empty() ); @@ -246,7 +246,7 @@ public: // #FIXME #TODO is the code name for ThisDocument read anywhere? } - 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 { // #FIXME #TODO we really need to be checking against the codename for // ThisDocument @@ -255,7 +255,7 @@ public: return sal_False; } - ::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 { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -267,14 +267,14 @@ public: "Creating Object ( ooo.vba.word.Document ) 0x" << xDocObj.get()); return uno::makeAny( xDocObj ); } - 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 { uno::Sequence< OUString > aNames; 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; } }; @@ -1067,13 +1067,13 @@ namespace SwXFrameEnumeration(const SwDoc* const pDoc); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Any SAL_CALL nextElement() throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMoreElements() throw( RuntimeException, std::exception ) override; + virtual Any SAL_CALL nextElement() throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override; }; } diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 431487df0508..d957a74c288b 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -384,13 +384,13 @@ namespace explicit SwXShapesEnumeration(SwXDrawPage* const pDrawPage); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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; + virtual uno::Any SAL_CALL nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(uno::RuntimeException, std::exception) override; + virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException, std::exception) override; }; } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 144a3704dfd7..c5d140c84bcd 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -450,7 +450,7 @@ public: protected: // SwClient - virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) SAL_OVERRIDE; + virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) override; }; namespace @@ -1180,7 +1180,7 @@ public: protected: // SwClient - virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) SAL_OVERRIDE; + virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) override; }; namespace @@ -2987,7 +2987,7 @@ public: protected: // SwClient - virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) SAL_OVERRIDE; + virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) override; }; OUString SAL_CALL diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 7a66ad842a97..a6c728fe5fb9 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -955,7 +955,7 @@ public: SwFrameProperties_Impl(); virtual ~SwFrameProperties_Impl(){} - bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound) SAL_OVERRIDE; + bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound) override; }; SwFrameProperties_Impl::SwFrameProperties_Impl(): @@ -1020,7 +1020,7 @@ public: SwGraphicProperties_Impl(); virtual ~SwGraphicProperties_Impl(){} - virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound) SAL_OVERRIDE; + virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound) override; }; SwGraphicProperties_Impl::SwGraphicProperties_Impl( ) : @@ -1122,7 +1122,7 @@ public: SwFrameProperties_Impl(/*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_EMBEDDED_OBJECT)*/ ){} virtual ~SwOLEProperties_Impl(){} - virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound) SAL_OVERRIDE; + virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound) override; }; bool SwOLEProperties_Impl::AnyToItemSet( diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 9c9c85b0b2ce..4f98988933c3 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -89,7 +89,7 @@ public: void Invalidate(); protected: // SwClient - virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; }; diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index edfe314b9f8a..76184e1d0127 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -199,28 +199,28 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedServiceNames() throw (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; // 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; virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; // XIndexReplace virtual void SAL_CALL replaceByIndex(sal_Int32 Index, const uno::Any& rElement) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + lang::WrappedTargetException, uno::RuntimeException, std::exception) override; }; @@ -245,28 +245,28 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedServiceNames() throw (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; // 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; virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; // XIndexReplace virtual void SAL_CALL replaceByIndex(sal_Int32 Index, const uno::Any& rElement) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + lang::WrappedTargetException, uno::RuntimeException, std::exception) override; }; @@ -377,7 +377,7 @@ public: } protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; }; @@ -1617,7 +1617,7 @@ public: void Invalidate(); protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; }; void SwXDocumentIndexMark::Impl::Invalidate() diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 6a3c7d171f5e..262f4f0806a3 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -490,23 +490,23 @@ struct SwXParagraphEnumerationImpl SAL_FINAL : public SwXParagraphEnumeration virtual ~SwXParagraphEnumerationImpl() { m_pCrsr.reset(nullptr); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE + virtual void SAL_CALL release() throw () override { SolarMutexGuard g; OWeakObject::release(); } // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override { return OUString("SwXParagraphEnumeration"); } - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, rServiceName); }; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) override { return {"com.sun.star.text.ParagraphEnumeration"}; }; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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; + 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) override; SwUnoCrsr& GetCursor() { return *m_pCrsr; } @@ -722,7 +722,7 @@ public: protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; }; void SwXTextRange::Impl::Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) @@ -1476,24 +1476,24 @@ struct SwXTextRangesImpl SAL_FINAL : public SwXTextRanges { // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) 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 + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override { return OUString("SwXTextRanges"); }; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, rServiceName); }; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) override { return { "com.sun.star.text.TextRanges" }; }; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() 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 { return cppu::UnoType<text::XTextRange>::get(); }; - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override { return getCount() > 0; }; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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; + 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) override; explicit SwXTextRangesImpl(SwPaM *const pPaM) { @@ -1504,12 +1504,12 @@ struct SwXTextRangesImpl SAL_FINAL : public SwXTextRanges } MakeRanges(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE + virtual void SAL_CALL release() throw () override { SolarMutexGuard g; OWeakObject::release(); } - virtual SwUnoCrsr* GetCursor() SAL_OVERRIDE + virtual SwUnoCrsr* GetCursor() override { return &(*m_pUnoCursor); }; void MakeRanges(); ::std::vector< uno::Reference< text::XTextRange > > m_Ranges; @@ -1600,19 +1600,19 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString) struct SwXParaFrameEnumerationImpl SAL_FINAL : public SwXParaFrameEnumeration { // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override { return OUString("SwXParaFrameEnumeration"); }; - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, rServiceName); }; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) override { return {"com.sun.star.util.ContentEnumeration"}; }; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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; + 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) override; SwXParaFrameEnumerationImpl(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat = nullptr); - virtual void SAL_CALL release() throw () SAL_OVERRIDE + virtual void SAL_CALL release() throw () override { SolarMutexGuard g; OWeakObject::release(); diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 744b2f73b793..bb11345b36e1 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -174,7 +174,7 @@ public: throw (uno::RuntimeException, std::exception); protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; }; diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index af8bdf86ee6d..fe78e9b12e76 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -74,7 +74,7 @@ public: void Invalidate(); protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; }; @@ -524,15 +524,15 @@ private: SwXMeta & m_rMeta; virtual void PrepareForAttach(uno::Reference< text::XTextRange > & xRange, - const SwPaM & rPam) SAL_OVERRIDE; + const SwPaM & rPam) override; virtual bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb) - throw (lang::IllegalArgumentException, uno::RuntimeException) SAL_OVERRIDE; + throw (lang::IllegalArgumentException, uno::RuntimeException) override; protected: - virtual const SwStartNode *GetStartNode() const SAL_OVERRIDE; + virtual const SwStartNode *GetStartNode() const override; virtual uno::Reference< text::XTextCursor > - CreateCursor() throw (uno::RuntimeException) SAL_OVERRIDE; + CreateCursor() throw (uno::RuntimeException) override; public: SwXMetaText(SwDoc & rDoc, SwXMeta & rMeta); @@ -541,20 +541,20 @@ public: void Invalidate() { SwXText::Invalidate(); }; // XInterface - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { cppu::OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() SAL_OVERRIDE { cppu::OWeakObject::release(); } + virtual void SAL_CALL acquire() throw() override { cppu::OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override { cppu::OWeakObject::release(); } // XTypeProvider virtual uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + getImplementationId() throw (uno::RuntimeException, std::exception) override; // XText virtual uno::Reference< text::XTextCursor > SAL_CALL - createTextCursor() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + createTextCursor() throw (uno::RuntimeException, std::exception) override; virtual uno::Reference< text::XTextCursor > SAL_CALL createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; }; @@ -668,7 +668,7 @@ public: inline const ::sw::MetaField * GetMetaField() const; protected: // SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; }; diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 2751658d330b..150a0ef821e1 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -153,7 +153,7 @@ public: uno::RuntimeException, std::exception); protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; }; diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 58ad2066761e..addbaf396c98 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2619,7 +2619,7 @@ public: } protected: // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; }; diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index 62473ba74c0f..ac213148556a 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -54,7 +54,7 @@ struct SwXTextMarkup::Impl } // SwClient - virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; }; SwXTextMarkup::SwXTextMarkup( diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx index 4082aade4064..fa58306acf04 100644 --- a/sw/source/filter/ascii/wrtasc.hxx +++ b/sw/source/filter/ascii/wrtasc.hxx @@ -30,7 +30,7 @@ class SwASCWriter : public Writer { OUString m_sLineEnd; - virtual sal_uLong WriteStream() SAL_OVERRIDE; + virtual sal_uLong WriteStream() override; public: SwASCWriter( const OUString& rFilterName ); diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 9f413a48dbc1..e6ad7a6fc4d1 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -383,29 +383,29 @@ public: // XImageConsumer virtual void SAL_CALL init( sal_Int32 Width, sal_Int32 Height) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setColorModel( sal_Int16 BitCount, const uno::Sequence< sal_Int32 >& RGBAPal, sal_Int32 RedMask, sal_Int32 GreenMask, sal_Int32 BlueMask, sal_Int32 AlphaMask) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPixelsByBytes( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, const uno::Sequence< sal_Int8 >& ProducerData, sal_Int32 Offset, sal_Int32 Scansize) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPixelsByLongs( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, const uno::Sequence< sal_Int32 >& ProducerData, sal_Int32 Offset, sal_Int32 Scansize) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( uno::RuntimeException, std::exception ) override; virtual void SAL_CALL complete( sal_Int32 Status, const uno::Reference< awt::XImageProducer > & Producer) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( uno::RuntimeException, std::exception ) override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw ( uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const EventObject& Source ) throw ( uno::RuntimeException, std::exception) override; }; SwHTMLImageWatcher::SwHTMLImageWatcher( diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 444750581b32..1ab0bf1c38cf 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -75,7 +75,7 @@ class SwHTMLWrtTable : public SwWriteTable const SvxBrushItem *pBrushItem ) const; virtual bool ShouldExpandSub( const SwTableBox *pBox, - bool bExpandedBefore, sal_uInt16 nDepth ) const SAL_OVERRIDE; + bool bExpandedBefore, sal_uInt16 nDepth ) const override; static bool HasTabBackground( const SwTableLine& rLine, bool bTop, bool bBottom, bool bLeft, bool bRight ); diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx index da9abc0e7162..9926d2adb493 100644 --- a/sw/source/filter/html/htmlvsh.hxx +++ b/sw/source/filter/html/htmlvsh.hxx @@ -26,7 +26,7 @@ class SwViewShell; class SwHTMLViewShellClient : public SwClient { protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; public: explicit SwHTMLViewShellClient( SwViewShell *pVSh ); diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index 445363dde790..231fc49236ad 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -232,13 +232,13 @@ protected: /// the content of the aItemSet will be copied into all recently /// created Styles. /// Derived classes should not override this method! - virtual bool SelectorParsed( CSS1Selector *pSelector, bool bFirst ) SAL_OVERRIDE; + virtual bool SelectorParsed( CSS1Selector *pSelector, bool bFirst ) override; /// Will be called for every parsed Property. Adds the item to the /// pItemSet. /// Derived classes should not override this method! virtual bool DeclarationParsed( const OUString& rProperty, - const CSS1Expression *pExpr ) SAL_OVERRIDE; + const CSS1Expression *pExpr ) override; public: diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx index b7cd01e827c3..abe6ae7acf9d 100644 --- a/sw/source/filter/html/swcss1.hxx +++ b/sw/source/filter/html/swcss1.hxx @@ -67,7 +67,7 @@ class SwCSS1Parser : public SvxCSS1Parser protected: virtual bool StyleParsed( const CSS1Selector *pSelector, SfxItemSet& rItemSet, - SvxCSS1PropertyInfo& rPropInfo ) SAL_OVERRIDE; + SvxCSS1PropertyInfo& rPropInfo ) override; using CSS1Parser::ParseStyleSheet; @@ -75,13 +75,13 @@ public: SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const OUString& rBaseURL, bool bNewDoc ); virtual ~SwCSS1Parser(); - virtual bool ParseStyleSheet( const OUString& rIn ) SAL_OVERRIDE; + virtual bool ParseStyleSheet( const OUString& rIn ) override; // Die Font-Hoehe fuer eine bestimmte Font-Groesse (0-6) ermitteln - virtual sal_uInt32 GetFontHeight( sal_uInt16 nSize ) const SAL_OVERRIDE; + virtual sal_uInt32 GetFontHeight( sal_uInt16 nSize ) const override; // Die aktuelle Font-Liste holen (auch 0 ist erlaubt) - virtual const FontList *GetFontList() const SAL_OVERRIDE; + virtual const FontList *GetFontList() const override; // das Zeichen-Format zu einem Token und einer ggf leeren Klasse // ermitteln @@ -157,7 +157,7 @@ public: inline void SetATagStyles(); inline void SetDelayedStyles(); - virtual void SetDfltEncoding( rtl_TextEncoding eEnc ) SAL_OVERRIDE; + virtual void SetDfltEncoding( rtl_TextEncoding eEnc ) override; }; inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFormatName ) diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 1f052ab3b449..17cbadf39a51 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -875,13 +875,13 @@ public: // used in tables protected: // Executed for each token recognized by CallParser - virtual void NextToken( int nToken ) SAL_OVERRIDE; + virtual void NextToken( int nToken ) override; virtual ~SwHTMLParser(); // If the document is removed, remove the parser as well - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; - virtual void AddMetaUserDefined( OUString const & i_rMetaName ) SAL_OVERRIDE; + virtual void AddMetaUserDefined( OUString const & i_rMetaName ) override; public: @@ -892,16 +892,16 @@ public: SfxMedium* pMed = 0, bool bReadUTF8 = false, bool bIgnoreHTMLComments = false ); - virtual SvParserState CallParser() SAL_OVERRIDE; + virtual SvParserState CallParser() override; static sal_uInt16 ToTwips( sal_uInt16 nPixel ); // for reading asynchronously from SvStream - virtual void Continue( int nToken ) SAL_OVERRIDE; + virtual void Continue( int nToken ) override; virtual bool ParseMetaOptions( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties>&, - SvKeyValueIterator* ) SAL_OVERRIDE; + SvKeyValueIterator* ) override; }; struct SwPendingStackData diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index ba29190c4362..30ea6cca7711 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -279,8 +279,8 @@ class SwHTMLWriter : public Writer void CollectLinkTargets(); protected: - sal_uLong WriteStream() SAL_OVERRIDE; - void SetupFilterOptions(SfxMedium& rMedium) SAL_OVERRIDE; + sal_uLong WriteStream() override; + void SetupFilterOptions(SfxMedium& rMedium) override; public: std::vector<OUString> aImgMapNames; // geschriebene Image Maps diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx index 26a63f81bfef..5cb162fc0fab 100644 --- a/sw/source/filter/inc/fltini.hxx +++ b/sw/source/filter/inc/fltini.hxx @@ -32,25 +32,25 @@ class SwNodeIndex; class HTMLReader: public Reader { // wir wollen die Streams / Storages nicht geoeffnet haben - virtual bool SetStrmStgPtr() SAL_OVERRIDE; - virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE; - virtual OUString GetTemplateName() const SAL_OVERRIDE; + virtual bool SetStrmStgPtr() override; + virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override; + virtual OUString GetTemplateName() const override; public: HTMLReader(); }; class XMLReader : public Reader { - virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE; + virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override; public: - virtual int GetReaderType() SAL_OVERRIDE; + virtual int GetReaderType() override; XMLReader(); // read the sections of the document, which is equal to the medium. // returns the count of it virtual size_t GetSectionList( SfxMedium& rMedium, - std::vector<OUString*>& rStrings ) const SAL_OVERRIDE; + std::vector<OUString*>& rStrings ) const override; }; // die speziellen Writer diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 4720707087b4..572baff5eba0 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -202,8 +202,8 @@ public: virtual ~SwFltAnchor(); // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; + virtual bool operator==(const SfxPoolItem&) const override; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override; void SetFrameFormat(SwFrameFormat * _pFrameFormat); const SwFrameFormat* GetFrameFormat() const { return pFrameFormat;} SwFrameFormat* GetFrameFormat() { return pFrameFormat;} @@ -216,7 +216,7 @@ class SwFltAnchorClient : public SwClient public: SwFltAnchorClient(SwFltAnchor * pFltAnchor); - virtual void Modify (const SfxPoolItem *pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify (const SfxPoolItem *pOld, const SfxPoolItem *pNew) override; }; class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem @@ -254,8 +254,8 @@ public: nAutorNoPrev( rCpy.nAutorNoPrev ) {} // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; + virtual bool operator==(const SfxPoolItem& rItem) const override; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override; }; class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem @@ -275,8 +275,8 @@ public: SwFltBookmark( const SwFltBookmark& ); // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; + virtual bool operator==(const SfxPoolItem&) const override; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override; long GetHandle() const { return mnHandle; } const OUString& GetName() const { return maName; } @@ -297,8 +297,8 @@ public: SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols = 0); SwFltTOX(const SwFltTOX&); // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; + virtual bool operator==(const SfxPoolItem&) const override; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override; SwTOXBase* GetBase() { return pTOXBase; } void SetHadBreakItem( bool bVal ) { bHadBreakItem = bVal; } void SetHadPageDescItem( bool bVal ) { bHadPageDescItem = bVal; } diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 021cff725530..429e3f65b20e 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; /// Glue class to call RtfImport as an internal filter, needed by copy&paste support. class SwRTFReader : public Reader { - virtual sal_uLong Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const OUString&) SAL_OVERRIDE; + virtual sal_uLong Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const OUString&) override; }; sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam, const OUString&) diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 6bdf73a3388c..07e293aa389f 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -142,68 +142,68 @@ class DocxAttributeOutput : public AttributeOutputBase, public oox::vml::VMLText { public: /// Export the state of RTL/CJK. - virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) SAL_OVERRIDE; + virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) override; /// Start of the paragraph. - virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ) SAL_OVERRIDE; + virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo ) override; /// End of the paragraph. - virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; + virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) override; /// Empty paragraph. - virtual void EmptyParagraph() SAL_OVERRIDE; + virtual void EmptyParagraph() override; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwNode& rNode) SAL_OVERRIDE; + virtual void SectionBreaks(const SwNode& rNode) override; /// Called before we start outputting the attributes. - virtual void StartParagraphProperties() SAL_OVERRIDE; + virtual void StartParagraphProperties() override; /// Called after we end outputting the attributes. - virtual void EndParagraphProperties(const SfxItemSet& rParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) SAL_OVERRIDE; + virtual void EndParagraphProperties(const SfxItemSet& rParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) override; /// Start of the text run. - virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) SAL_OVERRIDE; + virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) override; /// End of the text run. - virtual void EndRun() SAL_OVERRIDE; + virtual void EndRun() override; /// Called before we start outputting the attributes. - virtual void StartRunProperties() SAL_OVERRIDE; + virtual void StartRunProperties() override; /// Called after we end outputting the attributes. - virtual void EndRunProperties( const SwRedlineData* pRedlineData ) SAL_OVERRIDE; + virtual void EndRunProperties( const SwRedlineData* pRedlineData ) override; - virtual void FootnoteEndnoteRefTag() SAL_OVERRIDE; + virtual void FootnoteEndnoteRefTag() override; - virtual void SectFootnoteEndnotePr() SAL_OVERRIDE; + virtual void SectFootnoteEndnotePr() override; - virtual void WritePostitFieldReference() SAL_OVERRIDE; + virtual void WritePostitFieldReference() override; /// Output text (inside a run). - virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) SAL_OVERRIDE; + virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) override; /// Output text (without markup). - virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) SAL_OVERRIDE; + virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) override; /// Output ruby start. - virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) SAL_OVERRIDE; + virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) override; /// Output ruby end. - virtual void EndRuby() SAL_OVERRIDE; + virtual void EndRuby() override; /// Output URL start. - virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ) SAL_OVERRIDE; + virtual bool StartURL( const OUString& rUrl, const OUString& rTarget ) override; /// Output URL end. - virtual bool EndURL(bool) SAL_OVERRIDE; + virtual bool EndURL(bool) override; - virtual void FieldVanish( const OUString& rText, ww::eField eType ) SAL_OVERRIDE; + virtual void FieldVanish( const OUString& rText, ww::eField eType ) override; /// Output redlining. /// /// The common attribute that can be among the run properties. - virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE; + virtual void Redline( const SwRedlineData* pRedline ) override; /// Output redlining. /// @@ -216,41 +216,41 @@ public: /// End of the tag that encloses the run. void EndRedline( const SwRedlineData * pRedlineData ); - virtual void SetStateOfFlyFrame( FlyProcessingState nStateOfFlyFrame ) SAL_OVERRIDE; - virtual void SetAnchorIsLinkedToNode( bool bAnchorLinkedToNode = false ) SAL_OVERRIDE; - virtual bool IsFlyProcessingPostponed() SAL_OVERRIDE; - virtual void ResetFlyProcessingFlag() SAL_OVERRIDE; + virtual void SetStateOfFlyFrame( FlyProcessingState nStateOfFlyFrame ) override; + virtual void SetAnchorIsLinkedToNode( bool bAnchorLinkedToNode = false ) override; + virtual bool IsFlyProcessingPostponed() override; + virtual void ResetFlyProcessingFlag() override; - virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; + virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) override; /// Output style. - virtual void ParagraphStyle( sal_uInt16 nStyle ) SAL_OVERRIDE; + virtual void ParagraphStyle( sal_uInt16 nStyle ) override; - virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; + virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) SAL_OVERRIDE; - virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) SAL_OVERRIDE; + virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) override; + virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) override; /// Start of the styles table. - virtual void StartStyles() SAL_OVERRIDE; + virtual void StartStyles() override; /// End of the styles table. - virtual void EndStyles( sal_uInt16 nNumberOfStyles ) SAL_OVERRIDE; + virtual void EndStyles( sal_uInt16 nNumberOfStyles ) override; /// Write default style. - virtual void DefaultStyle( sal_uInt16 nStyle ) SAL_OVERRIDE; + virtual void DefaultStyle( sal_uInt16 nStyle ) override; /// Write Doc Defaults void DocDefaults( ); @@ -268,55 +268,55 @@ public: /// Start of a style in the styles table. virtual void StartStyle( const OUString& rName, StyleType eType, sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 nId, - bool bAutoUpdate ) SAL_OVERRIDE; + bool bAutoUpdate ) override; /// End of a style in the styles table. - virtual void EndStyle() SAL_OVERRIDE; + virtual void EndStyle() override; /// Start of (paragraph or run) properties of a style. - virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) SAL_OVERRIDE; + virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) override; /// End of (paragraph or run) properties of a style. - virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE; + virtual void EndStyleProperties( bool bParProp ) override; /// Numbering rule and Id. - virtual void OutlineNumbering(sal_uInt8 nLvl) SAL_OVERRIDE; + virtual void OutlineNumbering(sal_uInt8 nLvl) override; /// Page break /// As a paragraph property - the paragraph should be on the next page. - virtual void PageBreakBefore( bool bBreak ) SAL_OVERRIDE; + virtual void PageBreakBefore( bool bBreak ) override; /// Write a section break /// msword::ColumnBreak or msword::PageBreak - virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) SAL_OVERRIDE; + virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) override; /// Start of the section properties. - virtual void StartSection() SAL_OVERRIDE; + virtual void StartSection() override; /// End of the section properties. - virtual void EndSection() SAL_OVERRIDE; + virtual void EndSection() override; /// Protection of forms. - virtual void SectionFormProtection( bool bProtected ) SAL_OVERRIDE; + virtual void SectionFormProtection( bool bProtected ) override; /// Numbering of the lines in the document. - virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) SAL_OVERRIDE; + virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) override; /// Has different headers/footers for the title page. - virtual void SectionTitlePage() SAL_OVERRIDE; + virtual void SectionTitlePage() override; /// Description of the page borders. - virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) SAL_OVERRIDE; + virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) override; /// Columns populated from right/numbers on the right side? - virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE; + virtual void SectionBiDi( bool bBiDi ) override; /// The style of the page numbers. /// - virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) SAL_OVERRIDE; + virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) override; /// The type of breaking. - virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE; + virtual void SectionType( sal_uInt8 nBreakCode ) override; /// Start the font. void StartFont( const OUString& rFamilyName ) const; @@ -340,13 +340,13 @@ public: void EmbedFont( const OUString& name, FontFamily family, FontPitch pitch, rtl_TextEncoding encoding ); /// Definition of a numbering instance. - virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE; + virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) override; /// Start of the abstract numbering definition instance. - virtual void StartAbstractNumbering( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void StartAbstractNumbering( sal_uInt16 nId ) override; /// End of the abstract numbering definition instance. - virtual void EndAbstractNumbering() SAL_OVERRIDE; + virtual void EndAbstractNumbering() override; /// All the numbering level information. virtual void NumberingLevel( sal_uInt8 nLevel, @@ -361,7 +361,7 @@ public: sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const OUString &rNumberingString, - const SvxBrushItem* pBrush = 0 ) SAL_OVERRIDE; + const SvxBrushItem* pBrush = 0 ) override; void WriteField_Impl( const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode ); void WriteFormData_Impl( const ::sw::mark::IFieldmark& rFieldmark ); @@ -447,235 +447,235 @@ private: protected: /// Output frames - the implementation. - virtual void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) SAL_OVERRIDE; + virtual void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) override; /// Sfx item Sfx item RES_CHRATR_CASEMAP - virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ) SAL_OVERRIDE; + virtual void CharCaseMap( const SvxCaseMapItem& rCaseMap ) override; /// Sfx item Sfx item RES_CHRATR_COLOR - virtual void CharColor( const SvxColorItem& rColor) SAL_OVERRIDE; + virtual void CharColor( const SvxColorItem& rColor) override; /// Sfx item Sfx item RES_CHRATR_CONTOUR - virtual void CharContour( const SvxContourItem& rContour ) SAL_OVERRIDE; + virtual void CharContour( const SvxContourItem& rContour ) override; /// Sfx item RES_CHRATR_CROSSEDOUT - virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut ) SAL_OVERRIDE; + virtual void CharCrossedOut( const SvxCrossedOutItem& rCrossedOut ) override; /// Sfx item RES_CHRATR_ESCAPEMENT - virtual void CharEscapement( const SvxEscapementItem& rEscapement ) SAL_OVERRIDE; + virtual void CharEscapement( const SvxEscapementItem& rEscapement ) override; /// Sfx item RES_CHRATR_FONT - virtual void CharFont( const SvxFontItem& rFont ) SAL_OVERRIDE; + virtual void CharFont( const SvxFontItem& rFont ) override; /// Sfx item RES_CHRATR_FONTSIZE - virtual void CharFontSize( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE; + virtual void CharFontSize( const SvxFontHeightItem& rFontSize ) override; /// Sfx item RES_CHRATR_KERNING - virtual void CharKerning( const SvxKerningItem& rKerning ) SAL_OVERRIDE; + virtual void CharKerning( const SvxKerningItem& rKerning ) override; /// Sfx item RES_CHRATR_LANGUAGE - virtual void CharLanguage( const SvxLanguageItem& rLanguage ) SAL_OVERRIDE; + virtual void CharLanguage( const SvxLanguageItem& rLanguage ) override; /// Sfx item RES_CHRATR_POSTURE - virtual void CharPosture( const SvxPostureItem& rPosture ) SAL_OVERRIDE; + virtual void CharPosture( const SvxPostureItem& rPosture ) override; /// Sfx item RES_CHRATR_SHADOWED - virtual void CharShadow( const SvxShadowedItem& rShadow ) SAL_OVERRIDE; + virtual void CharShadow( const SvxShadowedItem& rShadow ) override; /// Sfx item RES_CHRATR_UNDERLINE - virtual void CharUnderline( const SvxUnderlineItem& rUnderline ) SAL_OVERRIDE; + virtual void CharUnderline( const SvxUnderlineItem& rUnderline ) override; /// Sfx item RES_CHRATR_WEIGHT - virtual void CharWeight( const SvxWeightItem& rWeight ) SAL_OVERRIDE; + virtual void CharWeight( const SvxWeightItem& rWeight ) override; /// Sfx item RES_CHRATR_AUTOKERN - virtual void CharAutoKern( const SvxAutoKernItem& ) SAL_OVERRIDE; + virtual void CharAutoKern( const SvxAutoKernItem& ) override; /// Sfx item RES_CHRATR_BLINK - virtual void CharAnimatedText( const SvxBlinkItem& rBlink ) SAL_OVERRIDE; + virtual void CharAnimatedText( const SvxBlinkItem& rBlink ) override; /// Sfx item RES_CHRATR_BACKGROUND - virtual void CharBackground( const SvxBrushItem& rBrush ) SAL_OVERRIDE; + virtual void CharBackground( const SvxBrushItem& rBrush ) override; /// Sfx item RES_CHRATR_CJK_FONT - virtual void CharFontCJK( const SvxFontItem& rFont ) SAL_OVERRIDE; + virtual void CharFontCJK( const SvxFontItem& rFont ) override; /// Sfx item RES_CHRATR_CJK_FONTSIZE - virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE { CharFontSize( rFontSize ); } + virtual void CharFontSizeCJK( const SvxFontHeightItem& rFontSize ) override { CharFontSize( rFontSize ); } /// Sfx item RES_CHRATR_CJK_LANGUAGE - virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE { CharLanguage( rLanguageItem ); } + virtual void CharLanguageCJK( const SvxLanguageItem& rLanguageItem ) override { CharLanguage( rLanguageItem ); } /// Sfx item RES_CHRATR_CJK_POSTURE - virtual void CharPostureCJK( const SvxPostureItem& rPosture ) SAL_OVERRIDE; + virtual void CharPostureCJK( const SvxPostureItem& rPosture ) override; /// Sfx item RES_CHRATR_CJK_WEIGHT - virtual void CharWeightCJK( const SvxWeightItem& rWeight ) SAL_OVERRIDE; + virtual void CharWeightCJK( const SvxWeightItem& rWeight ) override; /// Sfx item RES_CHRATR_CTL_FONT - virtual void CharFontCTL( const SvxFontItem& rFont ) SAL_OVERRIDE; + virtual void CharFontCTL( const SvxFontItem& rFont ) override; /// Sfx item RES_CHRATR_CTL_FONTSIZE - virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ) SAL_OVERRIDE { CharFontSize( rFontSize ); } + virtual void CharFontSizeCTL( const SvxFontHeightItem& rFontSize ) override { CharFontSize( rFontSize ); } /// Sfx item RES_CHRATR_CTL_LANGUAGE - virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ) SAL_OVERRIDE { CharLanguage( rLanguageItem); } + virtual void CharLanguageCTL( const SvxLanguageItem& rLanguageItem ) override { CharLanguage( rLanguageItem); } /// Sfx item RES_CHRATR_CTL_POSTURE - virtual void CharPostureCTL( const SvxPostureItem& rWeight ) SAL_OVERRIDE; + virtual void CharPostureCTL( const SvxPostureItem& rWeight ) override; /// Sfx item RES_CHRATR_CTL_WEIGHT - virtual void CharWeightCTL( const SvxWeightItem& rWeight ) SAL_OVERRIDE; + virtual void CharWeightCTL( const SvxWeightItem& rWeight ) override; /// Sfx item RES_CHRATR_BidiRTL - virtual void CharBidiRTL( const SfxPoolItem& ) SAL_OVERRIDE; + virtual void CharBidiRTL( const SfxPoolItem& ) override; /// Sfx item RES_CHRATR_IdctHint - virtual void CharIdctHint( const SfxPoolItem& ) SAL_OVERRIDE; + virtual void CharIdctHint( const SfxPoolItem& ) override; /// Sfx item RES_CHRATR_ROTATE - virtual void CharRotate( const SvxCharRotateItem& rRotate ) SAL_OVERRIDE; + virtual void CharRotate( const SvxCharRotateItem& rRotate ) override; /// Sfx item RES_CHRATR_EMPHASIS_MARK - virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark ) SAL_OVERRIDE; + virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark ) override; /// Sfx item RES_CHRATR_TWO_LINES - virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines ) SAL_OVERRIDE; + virtual void CharTwoLines( const SvxTwoLinesItem& rTwoLines ) override; /// Sfx item RES_CHRATR_SCALEW - virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ) SAL_OVERRIDE; + virtual void CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth ) override; /// Sfx item RES_CHRATR_RELIEF - virtual void CharRelief( const SvxCharReliefItem& rRelief) SAL_OVERRIDE; + virtual void CharRelief( const SvxCharReliefItem& rRelief) override; /// Sfx item RES_CHRATR_HIDDEN - virtual void CharHidden( const SvxCharHiddenItem& rHidden ) SAL_OVERRIDE; + virtual void CharHidden( const SvxCharHiddenItem& rHidden ) override; /// Sfx item RES_CHRATR_BOX - virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) SAL_OVERRIDE; + virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) override; /// Sfx item RES_CHRATR_HIGHLIGHT - virtual void CharHighlight( const SvxBrushItem& rHighlight ) SAL_OVERRIDE; + virtual void CharHighlight( const SvxBrushItem& rHighlight ) override; /// Sfx item RES_TXTATR_INETFMT - virtual void TextINetFormat( const SwFormatINetFormat& ) SAL_OVERRIDE; + virtual void TextINetFormat( const SwFormatINetFormat& ) override; /// Sfx item RES_TXTATR_CHARFMT - virtual void TextCharFormat( const SwFormatCharFormat& ) SAL_OVERRIDE; + virtual void TextCharFormat( const SwFormatCharFormat& ) override; /// Sfx item RES_TXTATR_FTN - virtual void TextFootnote_Impl( const SwFormatFootnote& ) SAL_OVERRIDE; + virtual void TextFootnote_Impl( const SwFormatFootnote& ) override; /// Output the footnote/endnote reference (if there's one to output). void FootnoteEndnoteReference(); /// Sfx item RES_PARATR_LINESPACING - virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE; + virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) override; /// Sfx item RES_PARATR_ADJUST - virtual void ParaAdjust( const SvxAdjustItem& rAdjust ) SAL_OVERRIDE; + virtual void ParaAdjust( const SvxAdjustItem& rAdjust ) override; /// Sfx item RES_PARATR_SPLIT - virtual void ParaSplit( const SvxFormatSplitItem& rSplit ) SAL_OVERRIDE; + virtual void ParaSplit( const SvxFormatSplitItem& rSplit ) override; /// Sfx item RES_PARATR_WIDOWS - virtual void ParaWidows( const SvxWidowsItem& rWidows ) SAL_OVERRIDE; + virtual void ParaWidows( const SvxWidowsItem& rWidows ) override; /// Sfx item RES_PARATR_TABSTOP - virtual void ParaTabStop( const SvxTabStopItem& rTabStop ) SAL_OVERRIDE; + virtual void ParaTabStop( const SvxTabStopItem& rTabStop ) override; /// Sfx item RES_PARATR_HYPHENZONE - virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE; + virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) override; /// Sfx item RES_PARATR_NUMRULE - virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE; + virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) override; /// Sfx item RES_PARATR_SCRIPTSPACE - virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE; + virtual void ParaScriptSpace( const SfxBoolItem& ) override; /// Sfx item RES_PARATR_HANGINGPUNCTUATION - virtual void ParaHangingPunctuation( const SfxBoolItem& ) SAL_OVERRIDE; + virtual void ParaHangingPunctuation( const SfxBoolItem& ) override; /// Sfx item RES_PARATR_FORBIDDEN_RULES - virtual void ParaForbiddenRules( const SfxBoolItem& ) SAL_OVERRIDE; + virtual void ParaForbiddenRules( const SfxBoolItem& ) override; /// Sfx item RES_PARATR_VERTALIGN - virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign ) SAL_OVERRIDE; + virtual void ParaVerticalAlign( const SvxParaVertAlignItem& rAlign ) override; /// Sfx item RES_PARATR_SNAPTOGRID - virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE; + virtual void ParaSnapToGrid( const SvxParaGridItem& ) override; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize( const SwFormatFrmSize& ) SAL_OVERRIDE; + virtual void FormatFrameSize( const SwFormatFrmSize& ) override; /// Sfx item RES_PAPER_BIN - virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE; + virtual void FormatPaperBin( const SvxPaperBinItem& ) override; /// Sfx item RES_LR_SPACE - virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) SAL_OVERRIDE; + virtual void FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) override; /// Sfx item RES_UL_SPACE - virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ) SAL_OVERRIDE; + virtual void FormatULSpace( const SvxULSpaceItem& rULSpace ) override; /// Sfx item RES_SURROUND - virtual void FormatSurround( const SwFormatSurround& ) SAL_OVERRIDE; + virtual void FormatSurround( const SwFormatSurround& ) override; /// Sfx item RES_VERT_ORIENT - virtual void FormatVertOrientation( const SwFormatVertOrient& ) SAL_OVERRIDE; + virtual void FormatVertOrientation( const SwFormatVertOrient& ) override; /// Sfx item RES_HORI_ORIENT - virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) SAL_OVERRIDE; + virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) override; /// Sfx item RES_ANCHOR - virtual void FormatAnchor( const SwFormatAnchor& ) SAL_OVERRIDE; + virtual void FormatAnchor( const SwFormatAnchor& ) override; /// Sfx item RES_BACKGROUND - virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE; + virtual void FormatBackground( const SvxBrushItem& ) override; /// Sfx item RES_FILL_STYLE - virtual void FormatFillStyle( const XFillStyleItem& ) SAL_OVERRIDE; + virtual void FormatFillStyle( const XFillStyleItem& ) override; /// Sfx item RES_FILL_GRADIENT - virtual void FormatFillGradient( const XFillGradientItem& ) SAL_OVERRIDE; + virtual void FormatFillGradient( const XFillGradientItem& ) override; /// Sfx item RES_BOX - virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE; + virtual void FormatBox( const SvxBoxItem& ) override; /// Sfx item RES_COL - virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE; + virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) override; /// Sfx item RES_KEEP - virtual void FormatKeep( const SvxFormatKeepItem& ) SAL_OVERRIDE; + virtual void FormatKeep( const SvxFormatKeepItem& ) override; /// Sfx item RES_TEXTGRID - virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE; + virtual void FormatTextGrid( const SwTextGridItem& ) override; /// Sfx item RES_LINENUMBER - virtual void FormatLineNumbering( const SwFormatLineNumber& ) SAL_OVERRIDE; + virtual void FormatLineNumbering( const SwFormatLineNumber& ) override; /// Sfx item RES_FRAMEDIR - virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE; + virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) override; /// Sfx item RES_PARATR_GRABBAG - virtual void ParaGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE; + virtual void ParaGrabBag( const SfxGrabBagItem& ) override; /// Sfx item RES_CHRATR_GRABBAG - virtual void CharGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE; + virtual void CharGrabBag( const SfxGrabBagItem& ) override; // Sfx item RES_PARATR_OUTLINELEVEL - virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE; + virtual void ParaOutlineLevel( const SfxUInt16Item& ) override; /// Write the expanded field - virtual void WriteExpand( const SwField* pField ) SAL_OVERRIDE; + virtual void WriteExpand( const SwField* pField ) override; - virtual void RefField( const SwField& rField, const OUString& rRef ) SAL_OVERRIDE; - virtual void HiddenField( const SwField& rField ) SAL_OVERRIDE; - virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE; - virtual void PostitField( const SwField* pField ) SAL_OVERRIDE; - virtual bool DropdownField( const SwField* pField ) SAL_OVERRIDE; - virtual bool PlaceholderField( const SwField* pField ) SAL_OVERRIDE; + virtual void RefField( const SwField& rField, const OUString& rRef ) override; + virtual void HiddenField( const SwField& rField ) override; + virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) override; + virtual void PostitField( const SwField* pField ) override; + virtual bool DropdownField( const SwField* pField ) override; + virtual bool PlaceholderField( const SwField* pField ) override; - virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE; + virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) override; /// Reference to the export, where to get the data from DocxExport &m_rExport; @@ -934,7 +934,7 @@ public: virtual ~DocxAttributeOutput(); /// Return the right export class. - virtual DocxExport& GetExport() SAL_OVERRIDE; + virtual DocxExport& GetExport() override; const DocxExport& GetExport() const { return const_cast< DocxAttributeOutput* >( this )->GetExport(); } /// For e.g. the output of the styles, we need to switch the serializer to another one. @@ -959,15 +959,15 @@ public: void WritePostitFields(); /// VMLTextExport - virtual void WriteOutliner(const OutlinerParaObject& rParaObj) SAL_OVERRIDE; - virtual void WriteVMLTextBox(css::uno::Reference<css::drawing::XShape> xShape) SAL_OVERRIDE; + virtual void WriteOutliner(const OutlinerParaObject& rParaObj) override; + virtual void WriteVMLTextBox(css::uno::Reference<css::drawing::XShape> xShape) override; /// DMLTextExport - virtual void WriteTextBox(css::uno::Reference<css::drawing::XShape> xShape) SAL_OVERRIDE; - virtual OUString FindRelId(BitmapChecksum nChecksum) SAL_OVERRIDE; - virtual void CacheRelId(BitmapChecksum nChecksum, const OUString& rRelId) SAL_OVERRIDE; - virtual oox::drawingml::DrawingML& GetDrawingML() SAL_OVERRIDE; + virtual void WriteTextBox(css::uno::Reference<css::drawing::XShape> xShape) override; + virtual OUString FindRelId(BitmapChecksum nChecksum) override; + virtual void CacheRelId(BitmapChecksum nChecksum, const OUString& rRelId) override; + virtual oox::drawingml::DrawingML& GetDrawingML() override; - void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE; + void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) override; void SetWritingHeaderFooter( bool bWritingHeaderFooter ) { m_bWritingHeaderFooter = bWritingHeaderFooter; } bool GetWritingHeaderFooter( ) { return m_bWritingHeaderFooter; } diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 24953b710743..8ce9c1857078 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -108,65 +108,65 @@ public: const DocxExportFilter& GetFilter() const { return *m_pFilter; }; /// Access to the attribute output class. - virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE; + virtual AttributeOutputBase& AttrOutput() const override; /// Access to the derived attribute output class. DocxAttributeOutput& DocxAttrOutput() const; /// Access to the sections/headers/footres. - virtual MSWordSections& Sections() const SAL_OVERRIDE; + virtual MSWordSections& Sections() const override; - virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return true; } + virtual bool SupportsOneColumnBreak() const override { return true; } - virtual bool FieldsQuoted() const SAL_OVERRIDE { return true; } + virtual bool FieldsQuoted() const override { return true; } - virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE { return true; } + virtual bool AddSectionBreaksForTOX() const override { return true; } - virtual bool ignoreAttributeForStyleDefaults( sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual bool ignoreAttributeForStyleDefaults( sal_uInt16 nWhich ) const override; - virtual bool PreferPageBreakBefore() const SAL_OVERRIDE { return false; } + virtual bool PreferPageBreakBefore() const override { return false; } /// Guess the script (asian/western). - virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE; + virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) override; - virtual void AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; + virtual void AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) override; - virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE; + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) override; - virtual void AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; + virtual void AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) override; - virtual void ExportGrfBullet(const SwTextNode&) SAL_OVERRIDE; + virtual void ExportGrfBullet(const SwTextNode&) override; /// Returns the relationd id OString AddRelation( const OUString& rType, const OUString& rTarget ); - virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) SAL_OVERRIDE { /* FIXME no-op for docx, most probably should not even be in MSWordExportBase */ } - virtual void WriteChar( sal_Unicode ) SAL_OVERRIDE { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); } + virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) override { /* FIXME no-op for docx, most probably should not even be in MSWordExportBase */ } + virtual void WriteChar( sal_Unicode ) override { /* FIXME */ fprintf( stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); } /// Return value indicates if an inherited outline numbering is suppressed. - virtual bool DisallowInheritingOutlineNumbering( const SwFormat &rFormat ) SAL_OVERRIDE; + virtual bool DisallowInheritingOutlineNumbering( const SwFormat &rFormat ) override; /// Output the actual headers and footers. virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags, - const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode ) SAL_OVERRIDE; + const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode ) override; /// Write the field virtual void OutputField( const SwField* pField, ww::eField eFieldType, - const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE; + const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) override; /// Write the data of the form field - virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE; - virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE; + virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) override; + virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) override; virtual void DoComboBox(const OUString &rName, const OUString &rHelp, const OUString &ToolTip, const OUString &rSelected, - com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE; + com::sun::star::uno::Sequence<OUString> &rListItems) override; - virtual void DoFormText(const SwInputField * pField) SAL_OVERRIDE; + virtual void DoFormText(const SwInputField * pField) override; - virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_OVERRIDE; + virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override; /// Returns the relationd id OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer ); @@ -180,28 +180,28 @@ public: protected: /// Format-dependent part of the actual export. - virtual void ExportDocument_Impl() SAL_OVERRIDE; + virtual void ExportDocument_Impl() override; /// Output SwEndNode - virtual void OutputEndNode( const SwEndNode& ) SAL_OVERRIDE; + virtual void OutputEndNode( const SwEndNode& ) override; /// Output SwGrfNode - virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE; + virtual void OutputGrfNode( const SwGrfNode& ) override; /// Output SwOLENode - virtual void OutputOLENode( const SwOLENode& ) SAL_OVERRIDE; + virtual void OutputOLENode( const SwOLENode& ) override; - virtual void OutputLinkedOLE( const OUString& ) SAL_OVERRIDE; + virtual void OutputLinkedOLE( const OUString& ) override; - virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) SAL_OVERRIDE; + virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) override; - virtual void SectionBreaksAndFrames( const SwTextNode& /*rNode*/ ) SAL_OVERRIDE {} + virtual void SectionBreaksAndFrames( const SwTextNode& /*rNode*/ ) override {} /// Get ready for a new section. virtual void PrepareNewPageDesc( const SfxItemSet* pSet, const SwNode& rNd, const SwFormatPageDesc* pNewPgDescFormat = 0, - const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE; + const SwPageDesc* pNewPgDesc = 0 ) override; private: /// Setup pStyles and write styles.xml @@ -214,7 +214,7 @@ private: void WritePostitFields(); /// Write the numbering table. - virtual void WriteNumbering() SAL_OVERRIDE; + virtual void WriteNumbering() override; /// Write reference to a header/footer + the actual xml containing the text. void WriteHeaderFooter( const SwFormat& rFormat, bool bHeader, const char* pType ); diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index b688f5c33718..425d2461a93a 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.hxx @@ -34,19 +34,19 @@ public: // FIXME these should not even exist for the export-only filter! // For now, let's just do empty implementations of those. - virtual bool importDocument() SAL_OVERRIDE { return false; } - virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; } - virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; } - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE { return NULL; } - virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return ::oox::drawingml::table::TableStyleListPtr(); } + virtual bool importDocument() override { return false; } + virtual const ::oox::drawingml::Theme* getCurrentTheme() const override { return NULL; } + virtual ::oox::vml::Drawing* getVmlDrawing() override { return NULL; } + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override { return NULL; } + virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() override { return ::oox::drawingml::table::TableStyleListPtr(); } // Actual export of the DOCX document - virtual bool exportDocument() SAL_OVERRIDE; + virtual bool exportDocument() override; private: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE + virtual ::oox::ole::VbaProject* implCreateVbaProject() const override { return NULL; // FIXME: implement me ! } diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index e723b81e7f54..88c08beb789a 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -31,7 +31,7 @@ class SwFormatVertOrient; class WinwordAnchoring : public EscherExClientRecord_Base { public: - void WriteData(EscherEx& rEx) const SAL_OVERRIDE; + void WriteData(EscherEx& rEx) const override; void SetAnchoring(const SwFrameFormat& rFormat); /** method to perform conversion of positioning attributes with the help @@ -81,7 +81,7 @@ public: private: /** Override to create a new memory stream for picture data. */ - virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE; + virtual SvStream* ImplQueryPictureStream() override; private: std::shared_ptr< SvStream > mxPicStrm; @@ -154,23 +154,23 @@ private: sal_uInt32 nTextBox, DrawObjPointerVector &rPVec); void WriteOCXControl(const SwFrameFormat& rFormat,sal_uInt32 nShapeId); virtual sal_Int32 WriteFlyFrameAttr(const SwFrameFormat& rFormat, MSO_SPT eShapeType, - EscherPropertyContainer& rPropOpt) SAL_OVERRIDE; + EscherPropertyContainer& rPropOpt) override; virtual sal_uInt32 QueryTextID( const com::sun::star::uno::Reference< - com::sun::star::drawing::XShape > &,sal_uInt32) SAL_OVERRIDE; + com::sun::star::drawing::XShape > &,sal_uInt32) override; virtual void SetPicId(const SdrObject &rSdrObj, sal_uInt32 nShapeId, - EscherPropertyContainer &rPropOpt) SAL_OVERRIDE; + EscherPropertyContainer &rPropOpt) override; public: SwEscherEx( SvStream* pStrm, WW8Export& rWW8Wrt ); virtual ~SwEscherEx(); void FinishEscher(); - virtual void WritePictures() SAL_OVERRIDE; + virtual void WritePictures() override; - virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) SAL_OVERRIDE; + virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) override; EscherExHostAppData* StartShape(const com::sun::star::uno::Reference< - com::sun::star::drawing::XShape > &, const Rectangle*) SAL_OVERRIDE {return &aHostData;} + com::sun::star::drawing::XShape > &, const Rectangle*) override {return &aHostData;} private: SwEscherEx(const SwEscherEx&) = delete; SwEscherEx &operator=(const SwEscherEx&) = delete; diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index abc8e2d63c00..7f249d544db2 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -41,40 +41,40 @@ class RtfAttributeOutput : public AttributeOutputBase friend class RtfStringBufferValue; public: /// Export the state of RTL/CJK. - virtual void RTLAndCJKState(bool bIsRTL, sal_uInt16 nScript) SAL_OVERRIDE; + virtual void RTLAndCJKState(bool bIsRTL, sal_uInt16 nScript) override; /// Start of the paragraph. - virtual void StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo) SAL_OVERRIDE; + virtual void StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo) override; /// End of the paragraph. - virtual void EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) SAL_OVERRIDE; + virtual void EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) override; /// Empty paragraph. - virtual void EmptyParagraph() SAL_OVERRIDE; + virtual void EmptyParagraph() override; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwNode& rNode) SAL_OVERRIDE; + virtual void SectionBreaks(const SwNode& rNode) override; /// Called before we start outputting the attributes. - virtual void StartParagraphProperties() SAL_OVERRIDE; + virtual void StartParagraphProperties() override; /// Called after we end outputting the attributes. - virtual void EndParagraphProperties(const SfxItemSet& rParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) SAL_OVERRIDE; + virtual void EndParagraphProperties(const SfxItemSet& rParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) override; /// Start of the text run. - virtual void StartRun(const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false) SAL_OVERRIDE; + virtual void StartRun(const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false) override; /// End of the text run. - virtual void EndRun() SAL_OVERRIDE; + virtual void EndRun() override; /// Called before we start outputting the attributes. - virtual void StartRunProperties() SAL_OVERRIDE; + virtual void StartRunProperties() override; /// Called after we end outputting the attributes. - virtual void EndRunProperties(const SwRedlineData* pRedlineData) SAL_OVERRIDE; + virtual void EndRunProperties(const SwRedlineData* pRedlineData) override; /// Output text (inside a run). - virtual void RunText(const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8) SAL_OVERRIDE; + virtual void RunText(const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8) override; // Access to (anyway) private buffers, used by the sdr exporter OStringBuffer& RunText(); @@ -84,118 +84,118 @@ public: } /// Output text (without markup). - virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) SAL_OVERRIDE; + virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) override; /// Output ruby start. - virtual void StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby) SAL_OVERRIDE; + virtual void StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby) override; /// Output ruby end. - virtual void EndRuby() SAL_OVERRIDE; + virtual void EndRuby() override; /// Output URL start. - virtual bool StartURL(const OUString& rUrl, const OUString& rTarget) SAL_OVERRIDE; + virtual bool StartURL(const OUString& rUrl, const OUString& rTarget) override; /// Output URL end. - virtual bool EndURL(bool isAtEndOfParagraph) SAL_OVERRIDE; + virtual bool EndURL(bool isAtEndOfParagraph) override; - virtual void FieldVanish(const OUString& rText, ww::eField eType) SAL_OVERRIDE; + virtual void FieldVanish(const OUString& rText, ww::eField eType) override; /// Output redlining. /// /// The common attribute that can be among the run properties. - virtual void Redline(const SwRedlineData* pRedline) SAL_OVERRIDE; + virtual void Redline(const SwRedlineData* pRedline) override; - virtual void FormatDrop(const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) SAL_OVERRIDE; + virtual void FormatDrop(const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) override; /// Output style. - virtual void ParagraphStyle(sal_uInt16 nStyle) SAL_OVERRIDE; - - virtual void TableInfoCell(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableInfoRow(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableDefaultBorders(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableBackgrounds(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableRowRedline(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableCellRedline(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableHeight(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableCanSplit(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableBidi(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableNodeInfoInner(ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner) SAL_OVERRIDE; - virtual void TableOrientation(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE; - virtual void TableRowEnd(sal_uInt32 nDepth) SAL_OVERRIDE; + virtual void ParagraphStyle(sal_uInt16 nStyle) override; + + virtual void TableInfoCell(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableInfoRow(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableDefaultBorders(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableBackgrounds(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableRowRedline(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableCellRedline(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableHeight(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableCanSplit(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableBidi(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableNodeInfoInner(ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner) override; + virtual void TableOrientation(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) override; + virtual void TableRowEnd(sal_uInt32 nDepth) override; /// Start of the styles table. - virtual void StartStyles() SAL_OVERRIDE; + virtual void StartStyles() override; /// End of the styles table. - virtual void EndStyles(sal_uInt16 nNumberOfStyles) SAL_OVERRIDE; + virtual void EndStyles(sal_uInt16 nNumberOfStyles) override; /// Write default style. - virtual void DefaultStyle(sal_uInt16 nStyle) SAL_OVERRIDE; + virtual void DefaultStyle(sal_uInt16 nStyle) override; /// Start of a style in the styles table. virtual void StartStyle(const OUString& rName, StyleType eType, sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 nId, - bool bAutoUpdate) SAL_OVERRIDE; + bool bAutoUpdate) override; /// End of a style in the styles table. - virtual void EndStyle() SAL_OVERRIDE; + virtual void EndStyle() override; /// Start of (paragraph or run) properties of a style. - virtual void StartStyleProperties(bool bParProp, sal_uInt16 nStyle) SAL_OVERRIDE; + virtual void StartStyleProperties(bool bParProp, sal_uInt16 nStyle) override; /// End of (paragraph or run) properties of a style. - virtual void EndStyleProperties(bool bParProp) SAL_OVERRIDE; + virtual void EndStyleProperties(bool bParProp) override; /// Numbering rule and Id. - virtual void OutlineNumbering(sal_uInt8 nLvl) SAL_OVERRIDE; + virtual void OutlineNumbering(sal_uInt8 nLvl) override; /// Page break /// As a paragraph property - the paragraph should be on the next page. - virtual void PageBreakBefore(bool bBreak) SAL_OVERRIDE; + virtual void PageBreakBefore(bool bBreak) override; /// Write a section break /// msword::ColumnBreak or msword::PageBreak - virtual void SectionBreak(sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL) SAL_OVERRIDE; + virtual void SectionBreak(sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL) override; /// Start of the section properties. - virtual void StartSection() SAL_OVERRIDE; + virtual void StartSection() override; /// End of the section properties. - virtual void EndSection() SAL_OVERRIDE; + virtual void EndSection() override; /// Protection of forms. - virtual void SectionFormProtection(bool bProtected) SAL_OVERRIDE; + virtual void SectionFormProtection(bool bProtected) override; /// Numbering of the lines in the document. - virtual void SectionLineNumbering(sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo) SAL_OVERRIDE; + virtual void SectionLineNumbering(sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo) override; /// Has different headers/footers for the title page. - virtual void SectionTitlePage() SAL_OVERRIDE; + virtual void SectionTitlePage() override; /// Description of the page borders. - virtual void SectionPageBorders(const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat) SAL_OVERRIDE; + virtual void SectionPageBorders(const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat) override; /// Columns populated from right/numbers on the right side? - virtual void SectionBiDi(bool bBiDi) SAL_OVERRIDE; + virtual void SectionBiDi(bool bBiDi) override; /// The style of the page numbers. /// - virtual void SectionPageNumbering(sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber) SAL_OVERRIDE; + virtual void SectionPageNumbering(sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber) override; /// The type of breaking. - virtual void SectionType(sal_uInt8 nBreakCode) SAL_OVERRIDE; + virtual void SectionType(sal_uInt8 nBreakCode) override; /// Definition of a numbering instance. - virtual void NumberingDefinition(sal_uInt16 nId, const SwNumRule& rRule) SAL_OVERRIDE; + virtual void NumberingDefinition(sal_uInt16 nId, const SwNumRule& rRule) override; /// Start of the abstract numbering definition instance. - virtual void StartAbstractNumbering(sal_uInt16 nId) SAL_OVERRIDE; + virtual void StartAbstractNumbering(sal_uInt16 nId) override; /// End of the abstract numbering definition instance. - virtual void EndAbstractNumbering() SAL_OVERRIDE; + virtual void EndAbstractNumbering() override; /// All the numbering level information. virtual void NumberingLevel(sal_uInt8 nLevel, @@ -210,7 +210,7 @@ public: sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const OUString& rNumberingString, - const SvxBrushItem* pBrush = 0) SAL_OVERRIDE;//For i120928,to export graphic of bullet + const SvxBrushItem* pBrush = 0) override;//For i120928,to export graphic of bullet void WriteField_Impl(const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode); void WriteBookmarks_Impl(std::vector< OUString >& rStarts, std::vector< OUString >& rEnds); @@ -219,230 +219,230 @@ public: protected: /// Output frames - the implementation. - virtual void OutputFlyFrame_Impl(const sw::Frame& rFormat, const Point& rNdTopLeft) SAL_OVERRIDE; + virtual void OutputFlyFrame_Impl(const sw::Frame& rFormat, const Point& rNdTopLeft) override; /// Sfx item Sfx item RES_CHRATR_CASEMAP - virtual void CharCaseMap(const SvxCaseMapItem& rCaseMap) SAL_OVERRIDE; + virtual void CharCaseMap(const SvxCaseMapItem& rCaseMap) override; /// Sfx item Sfx item RES_CHRATR_COLOR - virtual void CharColor(const SvxColorItem& rColor) SAL_OVERRIDE; + virtual void CharColor(const SvxColorItem& rColor) override; /// Sfx item Sfx item RES_CHRATR_CONTOUR - virtual void CharContour(const SvxContourItem& rContour) SAL_OVERRIDE; + virtual void CharContour(const SvxContourItem& rContour) override; /// Sfx item RES_CHRATR_CROSSEDOUT - virtual void CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) SAL_OVERRIDE; + virtual void CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) override; /// Sfx item RES_CHRATR_ESCAPEMENT - virtual void CharEscapement(const SvxEscapementItem& rEscapement) SAL_OVERRIDE; + virtual void CharEscapement(const SvxEscapementItem& rEscapement) override; /// Sfx item RES_CHRATR_FONT - virtual void CharFont(const SvxFontItem& rFont) SAL_OVERRIDE; + virtual void CharFont(const SvxFontItem& rFont) override; /// Sfx item RES_CHRATR_FONTSIZE - virtual void CharFontSize(const SvxFontHeightItem& rFontSize) SAL_OVERRIDE; + virtual void CharFontSize(const SvxFontHeightItem& rFontSize) override; /// Sfx item RES_CHRATR_KERNING - virtual void CharKerning(const SvxKerningItem& rKerning) SAL_OVERRIDE; + virtual void CharKerning(const SvxKerningItem& rKerning) override; /// Sfx item RES_CHRATR_LANGUAGE - virtual void CharLanguage(const SvxLanguageItem& rLanguage) SAL_OVERRIDE; + virtual void CharLanguage(const SvxLanguageItem& rLanguage) override; /// Sfx item RES_CHRATR_POSTURE - virtual void CharPosture(const SvxPostureItem& rPosture) SAL_OVERRIDE; + virtual void CharPosture(const SvxPostureItem& rPosture) override; /// Sfx item RES_CHRATR_SHADOWED - virtual void CharShadow(const SvxShadowedItem& rShadow) SAL_OVERRIDE; + virtual void CharShadow(const SvxShadowedItem& rShadow) override; /// Sfx item RES_CHRATR_UNDERLINE - virtual void CharUnderline(const SvxUnderlineItem& rUnderline) SAL_OVERRIDE; + virtual void CharUnderline(const SvxUnderlineItem& rUnderline) override; /// Sfx item RES_CHRATR_WEIGHT - virtual void CharWeight(const SvxWeightItem& rWeight) SAL_OVERRIDE; + virtual void CharWeight(const SvxWeightItem& rWeight) override; /// Sfx item RES_CHRATR_AUTOKERN - virtual void CharAutoKern(const SvxAutoKernItem&) SAL_OVERRIDE; + virtual void CharAutoKern(const SvxAutoKernItem&) override; /// Sfx item RES_CHRATR_BLINK - virtual void CharAnimatedText(const SvxBlinkItem& rBlink) SAL_OVERRIDE; + virtual void CharAnimatedText(const SvxBlinkItem& rBlink) override; /// Sfx item RES_CHRATR_BACKGROUND - virtual void CharBackground(const SvxBrushItem& rBrush) SAL_OVERRIDE; + virtual void CharBackground(const SvxBrushItem& rBrush) override; /// Sfx item RES_CHRATR_CJK_FONT - virtual void CharFontCJK(const SvxFontItem& rFont) SAL_OVERRIDE; + virtual void CharFontCJK(const SvxFontItem& rFont) override; /// Sfx item RES_CHRATR_CJK_FONTSIZE - virtual void CharFontSizeCJK(const SvxFontHeightItem& rFontSize) SAL_OVERRIDE; + virtual void CharFontSizeCJK(const SvxFontHeightItem& rFontSize) override; /// Sfx item RES_CHRATR_CJK_LANGUAGE - virtual void CharLanguageCJK(const SvxLanguageItem& rLanguageItem) SAL_OVERRIDE; + virtual void CharLanguageCJK(const SvxLanguageItem& rLanguageItem) override; /// Sfx item RES_CHRATR_CJK_POSTURE - virtual void CharPostureCJK(const SvxPostureItem& rPosture) SAL_OVERRIDE; + virtual void CharPostureCJK(const SvxPostureItem& rPosture) override; /// Sfx item RES_CHRATR_CJK_WEIGHT - virtual void CharWeightCJK(const SvxWeightItem& rWeight) SAL_OVERRIDE; + virtual void CharWeightCJK(const SvxWeightItem& rWeight) override; /// Sfx item RES_CHRATR_CTL_FONT - virtual void CharFontCTL(const SvxFontItem& rFont) SAL_OVERRIDE; + virtual void CharFontCTL(const SvxFontItem& rFont) override; /// Sfx item RES_CHRATR_CTL_FONTSIZE - virtual void CharFontSizeCTL(const SvxFontHeightItem& rFontSize) SAL_OVERRIDE; + virtual void CharFontSizeCTL(const SvxFontHeightItem& rFontSize) override; /// Sfx item RES_CHRATR_CTL_LANGUAGE - virtual void CharLanguageCTL(const SvxLanguageItem& rLanguageItem) SAL_OVERRIDE; + virtual void CharLanguageCTL(const SvxLanguageItem& rLanguageItem) override; /// Sfx item RES_CHRATR_CTL_POSTURE - virtual void CharPostureCTL(const SvxPostureItem& rWeight) SAL_OVERRIDE; + virtual void CharPostureCTL(const SvxPostureItem& rWeight) override; /// Sfx item RES_CHRATR_CTL_WEIGHT - virtual void CharWeightCTL(const SvxWeightItem& rWeight) SAL_OVERRIDE; + virtual void CharWeightCTL(const SvxWeightItem& rWeight) override; /// Sfx item RES_CHRATR_BidiRTL - virtual void CharBidiRTL(const SfxPoolItem&) SAL_OVERRIDE; + virtual void CharBidiRTL(const SfxPoolItem&) override; /// Sfx item RES_CHRATR_IdctHint - virtual void CharIdctHint(const SfxPoolItem&) SAL_OVERRIDE; + virtual void CharIdctHint(const SfxPoolItem&) override; /// Sfx item RES_CHRATR_ROTATE - virtual void CharRotate(const SvxCharRotateItem& rRotate) SAL_OVERRIDE; + virtual void CharRotate(const SvxCharRotateItem& rRotate) override; /// Sfx item RES_CHRATR_EMPHASIS_MARK - virtual void CharEmphasisMark(const SvxEmphasisMarkItem& rEmphasisMark) SAL_OVERRIDE; + virtual void CharEmphasisMark(const SvxEmphasisMarkItem& rEmphasisMark) override; /// Sfx item RES_CHRATR_TWO_LINES - virtual void CharTwoLines(const SvxTwoLinesItem& rTwoLines) SAL_OVERRIDE; + virtual void CharTwoLines(const SvxTwoLinesItem& rTwoLines) override; /// Sfx item RES_CHRATR_SCALEW - virtual void CharScaleWidth(const SvxCharScaleWidthItem& rScaleWidth) SAL_OVERRIDE; + virtual void CharScaleWidth(const SvxCharScaleWidthItem& rScaleWidth) override; /// Sfx item RES_CHRATR_RELIEF - virtual void CharRelief(const SvxCharReliefItem& rRelief) SAL_OVERRIDE; + virtual void CharRelief(const SvxCharReliefItem& rRelief) override; /// Sfx item RES_CHRATR_HIDDEN - virtual void CharHidden(const SvxCharHiddenItem& rHidden) SAL_OVERRIDE; + virtual void CharHidden(const SvxCharHiddenItem& rHidden) override; /// Sfx item RES_CHRATR_BOX - virtual void CharBorder(const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow) SAL_OVERRIDE; + virtual void CharBorder(const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow) override; /// Sfx item RES_CHRATR_HIGHLIGHT - virtual void CharHighlight(const SvxBrushItem&) SAL_OVERRIDE; + virtual void CharHighlight(const SvxBrushItem&) override; /// Sfx item RES_TXTATR_INETFMT - virtual void TextINetFormat(const SwFormatINetFormat&) SAL_OVERRIDE; + virtual void TextINetFormat(const SwFormatINetFormat&) override; /// Sfx item RES_TXTATR_CHARFMT - virtual void TextCharFormat(const SwFormatCharFormat&) SAL_OVERRIDE; + virtual void TextCharFormat(const SwFormatCharFormat&) override; /// Sfx item RES_TXTATR_FTN - virtual void TextFootnote_Impl(const SwFormatFootnote&) SAL_OVERRIDE; + virtual void TextFootnote_Impl(const SwFormatFootnote&) override; /// Sfx item RES_PARATR_LINESPACING - virtual void ParaLineSpacing_Impl(short nSpace, short nMulti) SAL_OVERRIDE; + virtual void ParaLineSpacing_Impl(short nSpace, short nMulti) override; /// Sfx item RES_PARATR_ADJUST - virtual void ParaAdjust(const SvxAdjustItem& rAdjust) SAL_OVERRIDE; + virtual void ParaAdjust(const SvxAdjustItem& rAdjust) override; /// Sfx item RES_PARATR_SPLIT - virtual void ParaSplit(const SvxFormatSplitItem& rSplit) SAL_OVERRIDE; + virtual void ParaSplit(const SvxFormatSplitItem& rSplit) override; /// Sfx item RES_PARATR_WIDOWS - virtual void ParaWidows(const SvxWidowsItem& rWidows) SAL_OVERRIDE; + virtual void ParaWidows(const SvxWidowsItem& rWidows) override; /// Sfx item RES_PARATR_TABSTOP - virtual void ParaTabStop(const SvxTabStopItem& rTabStop) SAL_OVERRIDE; + virtual void ParaTabStop(const SvxTabStopItem& rTabStop) override; /// Sfx item RES_PARATR_HYPHENZONE - virtual void ParaHyphenZone(const SvxHyphenZoneItem&) SAL_OVERRIDE; + virtual void ParaHyphenZone(const SvxHyphenZoneItem&) override; /// Sfx item RES_PARATR_NUMRULE - virtual void ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId) SAL_OVERRIDE; + virtual void ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId) override; /// Sfx item RES_PARATR_SCRIPTSPACE - virtual void ParaScriptSpace(const SfxBoolItem&) SAL_OVERRIDE; + virtual void ParaScriptSpace(const SfxBoolItem&) override; /// Sfx item RES_PARATR_HANGINGPUNCTUATION - virtual void ParaHangingPunctuation(const SfxBoolItem&) SAL_OVERRIDE; + virtual void ParaHangingPunctuation(const SfxBoolItem&) override; /// Sfx item RES_PARATR_FORBIDDEN_RULES - virtual void ParaForbiddenRules(const SfxBoolItem&) SAL_OVERRIDE; + virtual void ParaForbiddenRules(const SfxBoolItem&) override; /// Sfx item RES_PARATR_VERTALIGN - virtual void ParaVerticalAlign(const SvxParaVertAlignItem& rAlign) SAL_OVERRIDE; + virtual void ParaVerticalAlign(const SvxParaVertAlignItem& rAlign) override; /// Sfx item RES_PARATR_SNAPTOGRID - virtual void ParaSnapToGrid(const SvxParaGridItem&) SAL_OVERRIDE; + virtual void ParaSnapToGrid(const SvxParaGridItem&) override; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize(const SwFormatFrmSize&) SAL_OVERRIDE; + virtual void FormatFrameSize(const SwFormatFrmSize&) override; /// Sfx item RES_PAPER_BIN - virtual void FormatPaperBin(const SvxPaperBinItem&) SAL_OVERRIDE; + virtual void FormatPaperBin(const SvxPaperBinItem&) override; /// Sfx item RES_LR_SPACE - virtual void FormatLRSpace(const SvxLRSpaceItem& rLRSpace) SAL_OVERRIDE; + virtual void FormatLRSpace(const SvxLRSpaceItem& rLRSpace) override; /// Sfx item RES_UL_SPACE - virtual void FormatULSpace(const SvxULSpaceItem& rULSpace) SAL_OVERRIDE; + virtual void FormatULSpace(const SvxULSpaceItem& rULSpace) override; /// Sfx item RES_SURROUND - virtual void FormatSurround(const SwFormatSurround&) SAL_OVERRIDE; + virtual void FormatSurround(const SwFormatSurround&) override; /// Sfx item RES_VERT_ORIENT - virtual void FormatVertOrientation(const SwFormatVertOrient&) SAL_OVERRIDE; + virtual void FormatVertOrientation(const SwFormatVertOrient&) override; /// Sfx item RES_HORI_ORIENT - virtual void FormatHorizOrientation(const SwFormatHoriOrient&) SAL_OVERRIDE; + virtual void FormatHorizOrientation(const SwFormatHoriOrient&) override; /// Sfx item RES_ANCHOR - virtual void FormatAnchor(const SwFormatAnchor&) SAL_OVERRIDE; + virtual void FormatAnchor(const SwFormatAnchor&) override; /// Sfx item RES_BACKGROUND - virtual void FormatBackground(const SvxBrushItem&) SAL_OVERRIDE; + virtual void FormatBackground(const SvxBrushItem&) override; /// Sfx item RES_FILL_STYLE - virtual void FormatFillStyle(const XFillStyleItem&) SAL_OVERRIDE; + virtual void FormatFillStyle(const XFillStyleItem&) override; /// Sfx item RES_FILL_GRADIENT - virtual void FormatFillGradient(const XFillGradientItem&) SAL_OVERRIDE; + virtual void FormatFillGradient(const XFillGradientItem&) override; /// Sfx item RES_BOX - virtual void FormatBox(const SvxBoxItem&) SAL_OVERRIDE; + virtual void FormatBox(const SvxBoxItem&) override; /// Sfx item RES_COL - virtual void FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol, bool bEven, SwTwips nPageSize) SAL_OVERRIDE; + virtual void FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol, bool bEven, SwTwips nPageSize) override; /// Sfx item RES_KEEP - virtual void FormatKeep(const SvxFormatKeepItem&) SAL_OVERRIDE; + virtual void FormatKeep(const SvxFormatKeepItem&) override; /// Sfx item RES_TEXTGRID - virtual void FormatTextGrid(const SwTextGridItem&) SAL_OVERRIDE; + virtual void FormatTextGrid(const SwTextGridItem&) override; /// Sfx item RES_LINENUMBER - virtual void FormatLineNumbering(const SwFormatLineNumber&) SAL_OVERRIDE; + virtual void FormatLineNumbering(const SwFormatLineNumber&) override; /// Sfx item RES_FRAMEDIR - virtual void FormatFrameDirection(const SvxFrameDirectionItem&) SAL_OVERRIDE; + virtual void FormatFrameDirection(const SvxFrameDirectionItem&) override; /// Sfx item RES_PARATR_GRABBAG - virtual void ParaGrabBag(const SfxGrabBagItem&) SAL_OVERRIDE; + virtual void ParaGrabBag(const SfxGrabBagItem&) override; /// Sfx item RES_CHRATR_GRABBAG - virtual void CharGrabBag(const SfxGrabBagItem&) SAL_OVERRIDE; + virtual void CharGrabBag(const SfxGrabBagItem&) override; /// Sfx item RES_PARATR_OUTLINELEVEL - virtual void ParaOutlineLevel(const SfxUInt16Item&) SAL_OVERRIDE; + virtual void ParaOutlineLevel(const SfxUInt16Item&) override; /// Write the expanded field - virtual void WriteExpand(const SwField* pField) SAL_OVERRIDE; + virtual void WriteExpand(const SwField* pField) override; - virtual void RefField(const SwField& rField, const OUString& rRef) SAL_OVERRIDE; - virtual void HiddenField(const SwField& rField) SAL_OVERRIDE; - virtual void SetField(const SwField& rField, ww::eField eType, const OUString& rCmd) SAL_OVERRIDE; - virtual void PostitField(const SwField* pField) SAL_OVERRIDE; - virtual bool DropdownField(const SwField* pField) SAL_OVERRIDE; - virtual bool PlaceholderField(const SwField* pField) SAL_OVERRIDE; + virtual void RefField(const SwField& rField, const OUString& rRef) override; + virtual void HiddenField(const SwField& rField) override; + virtual void SetField(const SwField& rField, ww::eField eType, const OUString& rCmd) override; + virtual void PostitField(const SwField* pField) override; + virtual bool DropdownField(const SwField* pField) override; + virtual bool PlaceholderField(const SwField* pField) override; /// Reference to the export, where to get the data from RtfExport& m_rExport; @@ -604,7 +604,7 @@ public: virtual ~RtfAttributeOutput(); /// Return the right export class. - virtual MSWordExportBase& GetExport() SAL_OVERRIDE; + virtual MSWordExportBase& GetExport() override; OStringBuffer m_aTabStop; @@ -633,7 +633,7 @@ public: /// Writes binary data as a hex dump. static OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream = 0, sal_uInt32 nLimit = 64); - void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE; + void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) override; /// Handles just the {\shptxt ...} part of a shape export. void writeTextFrame(const sw::Frame& rFrame, bool bTextBox = false); diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 8d79e044e91a..607521cd4e9d 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1237,7 +1237,7 @@ private: public: SwRTFWriter(const OUString& rFilterName, const OUString& rBaseURL); virtual ~SwRTFWriter(); - virtual sal_uLong WriteStream() SAL_OVERRIDE; + virtual sal_uLong WriteStream() override; }; SwRTFWriter::SwRTFWriter(const OUString& rFltName, const OUString& rBaseURL) diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index e3af02f88c87..f6325137391a 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -50,107 +50,107 @@ class RtfExport : public MSWordExportBase public: /// Access to the attribute output class. - virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE; + virtual AttributeOutputBase& AttrOutput() const override; /// Access to the sections/headers/footres. - virtual MSWordSections& Sections() const SAL_OVERRIDE; + virtual MSWordSections& Sections() const override; /// Access to the Rtf Sdr exporter. RtfSdrExport& SdrExporter() const; - virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE + virtual bool SupportsOneColumnBreak() const override { return false; } - virtual bool FieldsQuoted() const SAL_OVERRIDE + virtual bool FieldsQuoted() const override { return true; } - virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE + virtual bool AddSectionBreaksForTOX() const override { return false; } - virtual bool PreferPageBreakBefore() const SAL_OVERRIDE + virtual bool PreferPageBreakBefore() const override { return true; } /// Guess the script (asian/western). - virtual bool CollapseScriptsforWordOk(sal_uInt16 nScript, sal_uInt16 nWhich) SAL_OVERRIDE; + virtual bool CollapseScriptsforWordOk(sal_uInt16 nScript, sal_uInt16 nWhich) override; - virtual void AppendBookmarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) SAL_OVERRIDE; + virtual void AppendBookmarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) override; - virtual void AppendBookmark(const OUString& rName, bool bSkip = false) SAL_OVERRIDE; + virtual void AppendBookmark(const OUString& rName, bool bSkip = false) override; - virtual void AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) SAL_OVERRIDE; + virtual void AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) override; //For i120928,add an interface to export graphic of bullet - virtual void ExportGrfBullet(const SwTextNode& rNd) SAL_OVERRIDE; + virtual void ExportGrfBullet(const SwTextNode& rNd) override; - virtual void WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/) SAL_OVERRIDE { /* no-op for rtf, most probably should not even be in MSWordExportBase */ } - virtual void WriteChar(sal_Unicode) SAL_OVERRIDE; + virtual void WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/) override { /* no-op for rtf, most probably should not even be in MSWordExportBase */ } + virtual void WriteChar(sal_Unicode) override; /// Write the numbering table. - virtual void WriteNumbering() SAL_OVERRIDE; + virtual void WriteNumbering() override; /// Write the revision table. void WriteRevTab(); /// Output the actual headers and footers. virtual void WriteHeadersFooters(sal_uInt8 nHeadFootFlags, - const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode) SAL_OVERRIDE; + const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode) override; /// Write the field virtual void OutputField(const SwField* pField, ww::eField eFieldType, - const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL) SAL_OVERRIDE; + const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL) override; /// Write the data of the form field - virtual void WriteFormData(const ::sw::mark::IFieldmark& rFieldmark) SAL_OVERRIDE; - virtual void WriteHyperlinkData(const ::sw::mark::IFieldmark& rFieldmark) SAL_OVERRIDE; + virtual void WriteFormData(const ::sw::mark::IFieldmark& rFieldmark) override; + virtual void WriteHyperlinkData(const ::sw::mark::IFieldmark& rFieldmark) override; virtual void DoComboBox(const OUString& rName, const OUString& rHelp, const OUString& ToolTip, const OUString& rSelected, - css::uno::Sequence<OUString>& rListItems) SAL_OVERRIDE; + css::uno::Sequence<OUString>& rListItems) override; - virtual void DoFormText(const SwInputField* pField) SAL_OVERRIDE; + virtual void DoFormText(const SwInputField* pField) override; - virtual sal_uLong ReplaceCr(sal_uInt8 nChar) SAL_OVERRIDE; + virtual sal_uLong ReplaceCr(sal_uInt8 nChar) override; protected: /// Format-dependent part of the actual export. - virtual void ExportDocument_Impl() SAL_OVERRIDE; + virtual void ExportDocument_Impl() override; - virtual void SectionBreaksAndFrames(const SwTextNode& /*rNode*/) SAL_OVERRIDE {} + virtual void SectionBreaksAndFrames(const SwTextNode& /*rNode*/) override {} /// Get ready for a new section. virtual void PrepareNewPageDesc(const SfxItemSet* pSet, const SwNode& rNd, const SwFormatPageDesc* pNewPgDescFormat = 0, - const SwPageDesc* pNewPgDesc = 0) SAL_OVERRIDE; + const SwPageDesc* pNewPgDesc = 0) override; /// Return value indicates if an inherited outline numbering is suppressed. - virtual bool DisallowInheritingOutlineNumbering(const SwFormat& rFormat) SAL_OVERRIDE; + virtual bool DisallowInheritingOutlineNumbering(const SwFormat& rFormat) override; /// Output SwTextNode is depending on outline export mode - virtual void OutputTextNode(const SwTextNode&) SAL_OVERRIDE; + virtual void OutputTextNode(const SwTextNode&) override; /// Output SwEndNode - virtual void OutputEndNode(const SwEndNode&) SAL_OVERRIDE; + virtual void OutputEndNode(const SwEndNode&) override; /// Output SwGrfNode - virtual void OutputGrfNode(const SwGrfNode&) SAL_OVERRIDE; + virtual void OutputGrfNode(const SwGrfNode&) override; /// Output SwOLENode - virtual void OutputOLENode(const SwOLENode&) SAL_OVERRIDE; + virtual void OutputOLENode(const SwOLENode&) override; - virtual void OutputLinkedOLE(const OUString&) SAL_OVERRIDE; + virtual void OutputLinkedOLE(const OUString&) override; - virtual void AppendSection(const SwPageDesc* pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum) SAL_OVERRIDE; + virtual void AppendSection(const SwPageDesc* pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum) override; public: /// Pass the pDocument, pCurrentPam and pOriginalPam to the base class. diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx index e41e86ff91f5..ba59f3bb458f 100644 --- a/sw/source/filter/ww8/rtfexportfilter.hxx +++ b/sw/source/filter/ww8/rtfexportfilter.hxx @@ -30,7 +30,7 @@ class RtfWriter : public Writer { protected: - sal_uLong WriteStream() SAL_OVERRIDE { return 0; } + sal_uLong WriteStream() override { return 0; } }; /// The physical access to the RTF document (for writing). @@ -48,12 +48,12 @@ public: virtual ~RtfExportFilter(); // XFilter - virtual sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override; // XExporter virtual void SAL_CALL setSourceDocument(const css::uno::Reference<css::lang::XComponent>& xDoc) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; RtfWriter m_aWriter; }; diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx index 139bc9cd0b42..fdb5371c2c95 100644 --- a/sw/source/filter/ww8/rtfsdrexport.hxx +++ b/sw/source/filter/ww8/rtfsdrexport.hxx @@ -82,17 +82,17 @@ protected: using EscherEx::EndShape; void EndShape(sal_Int32 nShapeElement); - virtual void Commit(EscherPropertyContainer& rProps, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Commit(EscherPropertyContainer& rProps, const Rectangle& rRect) override; private: - virtual void OpenContainer(sal_uInt16 nEscherContainer, int nRecInstance = 0) SAL_OVERRIDE; - virtual void CloseContainer() SAL_OVERRIDE; + virtual void OpenContainer(sal_uInt16 nEscherContainer, int nRecInstance = 0) override; + virtual void CloseContainer() override; - virtual sal_uInt32 EnterGroup(const OUString& rShapeName, const Rectangle* pBoundRect = 0) SAL_OVERRIDE; - virtual void LeaveGroup() SAL_OVERRIDE; + virtual sal_uInt32 EnterGroup(const OUString& rShapeName, const Rectangle* pBoundRect = 0) override; + virtual void LeaveGroup() override; - virtual void AddShape(sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0) SAL_OVERRIDE; + virtual void AddShape(sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0) override; private: /// Add starting and ending point of a line to the m_pShapeAttrList. diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 005138bf00b1..3638e69d25c1 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -249,7 +249,7 @@ public: explicit WW8_WrPlcSepx( MSWordExportBase& rExport ); virtual ~WW8_WrPlcSepx(); - virtual bool HeaderFooterWritten() SAL_OVERRIDE; // override + virtual bool HeaderFooterWritten() override; // override void AppendSep( WW8_CP nStartCp, const SwPageDesc* pPd, @@ -386,8 +386,8 @@ public: MainTextPlcDrawObj() {} private: virtual void RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart, - sal_uInt32 nLen) const SAL_OVERRIDE; - virtual WW8_CP GetCpOffset(const WW8Fib &) const SAL_OVERRIDE; + sal_uInt32 nLen) const override; + virtual WW8_CP GetCpOffset(const WW8Fib &) const override; private: MainTextPlcDrawObj(const MainTextPlcDrawObj&) = delete; MainTextPlcDrawObj& operator=(const MainTextPlcDrawObj&) = delete; @@ -399,8 +399,8 @@ public: HdFtPlcDrawObj() {} private: virtual void RegisterWithFib(WW8Fib &rFib, sal_uInt32 nStart, - sal_uInt32 nLen) const SAL_OVERRIDE; - virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const SAL_OVERRIDE; + sal_uInt32 nLen) const override; + virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const override; private: HdFtPlcDrawObj(const HdFtPlcDrawObj&) = delete; HdFtPlcDrawObj& operator=(const HdFtPlcDrawObj&) = delete; @@ -411,7 +411,7 @@ typedef ::std::pair<OUString, sal_uLong> aBookmarkPair; class WW8_WrtRedlineAuthor : public sw::util::WrtRedlineAuthor { public: - virtual void Write(Writer &rWrt) SAL_OVERRIDE; + virtual void Write(Writer &rWrt) override; }; /** Structure that is used to save some of the WW8Export/DocxExport data. @@ -897,8 +897,8 @@ public: SwWW8Writer(const OUString& rFltName, const OUString& rBaseURL); virtual ~SwWW8Writer(); - virtual sal_uLong WriteStorage() SAL_OVERRIDE; - virtual sal_uLong WriteMedium( SfxMedium& ) SAL_OVERRIDE; + virtual sal_uLong WriteStorage() override; + virtual sal_uLong WriteMedium( SfxMedium& ) override; // TODO most probably we want to be able to get these in // MSExportFilterBase @@ -930,7 +930,7 @@ public: bool InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec ); using StgWriter::Write; - virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) SAL_OVERRIDE; + virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) override; //Seems not an expected to provide method to access the private member SfxMedium* GetMedia() { return mpMedium; } @@ -964,21 +964,21 @@ private: public: /// Access to the attribute output class. - virtual AttributeOutputBase& AttrOutput() const SAL_OVERRIDE; + virtual AttributeOutputBase& AttrOutput() const override; /// Access to the sections/headers/footres. - virtual MSWordSections& Sections() const SAL_OVERRIDE; + virtual MSWordSections& Sections() const override; - virtual bool PreferPageBreakBefore() const SAL_OVERRIDE { return true; } + virtual bool PreferPageBreakBefore() const override { return true; } - virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return false; } + virtual bool SupportsOneColumnBreak() const override { return false; } - virtual bool FieldsQuoted() const SAL_OVERRIDE { return false; } + virtual bool FieldsQuoted() const override { return false; } - virtual bool AddSectionBreaksForTOX() const SAL_OVERRIDE { return false; } + virtual bool AddSectionBreaksForTOX() const override { return false; } private: /// Format-dependent part of the actual export. - virtual void ExportDocument_Impl() SAL_OVERRIDE; + virtual void ExportDocument_Impl() override; void PrepareStorage(); void WriteFkpPlcUsw(); @@ -986,7 +986,7 @@ private: void StoreDoc1(); /// Output the numbering table. - virtual void WriteNumbering() SAL_OVERRIDE; + virtual void WriteNumbering() override; void OutOverrideListTab(); void OutListNamesTab(); @@ -999,7 +999,7 @@ private: public: /// Setup the pA's info. - virtual void SetupSectionPositions( WW8_PdAttrDesc* pA ) SAL_OVERRIDE; + virtual void SetupSectionPositions( WW8_PdAttrDesc* pA ) override; bool MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat); @@ -1025,7 +1025,7 @@ public: /// Write the field virtual void OutputField( const SwField* pField, ww::eField eFieldType, - const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) SAL_OVERRIDE; + const OUString& rFieldCmd, sal_uInt8 nMode = nsFieldFlags::WRITEFIELD_ALL ) override; void StartCommentOutput( const OUString& rName ); void EndCommentOutput( const OUString& rName ); @@ -1033,12 +1033,12 @@ public: bool TestOleNeedsGraphic(const SwAttrSet& rSet, tools::SvRef<SotStorage> xOleStg, tools::SvRef<SotStorage> xObjStg, OUString &rStorageName, SwOLENode *pOLENd); - virtual void AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; - virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE; + virtual void AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) override; + virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) override; - virtual void AppendAnnotationMarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE; + virtual void AppendAnnotationMarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) override; - virtual void ExportGrfBullet(const SwTextNode& rNd) SAL_OVERRIDE; + virtual void ExportGrfBullet(const SwTextNode& rNd) override; void OutGrfBullets(const sw::Frame &rFrame); void MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo); @@ -1046,10 +1046,10 @@ public: void WriteAsStringTable(const ::std::vector<OUString>&, sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen = 0); - virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) SAL_OVERRIDE; + virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override; - virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() ) SAL_OVERRIDE; - void WriteChar( sal_Unicode c ) SAL_OVERRIDE; + virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() ) override; + void WriteChar( sal_Unicode c ) override; void OutSwString(const OUString&, sal_Int32 nStt, sal_Int32 nLen); @@ -1060,14 +1060,14 @@ public: void OutSprmBytes( sal_uInt8* pBytes, sal_uInt16 nSiz ) { pO->insert( pO->end(), pBytes, pBytes+nSiz ); } - virtual void SectionBreaksAndFrames( const SwTextNode& rNode ) SAL_OVERRIDE; + virtual void SectionBreaksAndFrames( const SwTextNode& rNode ) override; /// Helper method for OutputSectionBreaks() and OutputFollowPageDesc(). // #i76300# virtual void PrepareNewPageDesc( const SfxItemSet* pSet, const SwNode& rNd, const SwFormatPageDesc* pNewPgDescFormat = 0, - const SwPageDesc* pNewPgDesc = 0 ) SAL_OVERRIDE; + const SwPageDesc* pNewPgDesc = 0 ) override; static void Out_BorderLine(ww::bytes& rO, const ::editeng::SvxBorderLine* pLine, sal_uInt16 nDist, sal_uInt16 nSprmNo, sal_uInt16 nSprmNoVer9, @@ -1082,7 +1082,7 @@ public: sal_uInt16 nDist, bool bShadow); // #i77805# - new return value indicates, if an inherited outline numbering is suppressed - virtual bool DisallowInheritingOutlineNumbering(const SwFormat &rFormat) SAL_OVERRIDE; + virtual bool DisallowInheritingOutlineNumbering(const SwFormat &rFormat) override; unsigned int GetHdFtIndex() const { return m_nHdFtIndex; } void SetHdFtIndex(unsigned int nHdFtIndex) { m_nHdFtIndex = nHdFtIndex; } @@ -1092,7 +1092,7 @@ public: static sal_uInt8 GetNumId( sal_uInt16 eNumType ); /// Guess the script (asian/western). - virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE; + virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) override; SwTwips CurrentPageWidth(SwTwips &rLeft, SwTwips &rRight) const; @@ -1114,15 +1114,15 @@ public: const OUString &rHelp, const OUString &ToolTip, const OUString &rSelected, - com::sun::star::uno::Sequence<OUString> &rListItems) SAL_OVERRIDE; + com::sun::star::uno::Sequence<OUString> &rListItems) override; - virtual void DoFormText(const SwInputField * pField) SAL_OVERRIDE; + virtual void DoFormText(const SwInputField * pField) override; void GetCurrentItems(ww::bytes &rItems) const; /// Write the data of the form field - virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE; - virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) SAL_OVERRIDE; + virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) override; + virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark ) override; /// Fields. WW8_WrPlcField* CurrentFieldPlc() const; @@ -1131,26 +1131,26 @@ public: SvStream& Strm() const { return m_pWriter->Strm(); } /// Remember some of the memebers so that we can recurse in WriteText(). - virtual void SaveData( sal_uLong nStt, sal_uLong nEnd ) SAL_OVERRIDE; + virtual void SaveData( sal_uLong nStt, sal_uLong nEnd ) override; /// Restore what was saved in SaveData(). - virtual void RestoreData() SAL_OVERRIDE; + virtual void RestoreData() override; /// Output the actual headers and footers. virtual void WriteHeadersFooters( sal_uInt8 nHeadFootFlags, const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, - sal_uInt8 nBreakCode) SAL_OVERRIDE; + sal_uInt8 nBreakCode) override; protected: /// Output SwGrfNode - virtual void OutputGrfNode( const SwGrfNode& ) SAL_OVERRIDE; + virtual void OutputGrfNode( const SwGrfNode& ) override; /// Output SwOLENode - virtual void OutputOLENode( const SwOLENode& ) SAL_OVERRIDE; + virtual void OutputOLENode( const SwOLENode& ) override; - virtual void OutputLinkedOLE( const OUString& ) SAL_OVERRIDE; + virtual void OutputLinkedOLE( const OUString& ) override; - virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) SAL_OVERRIDE; + virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) override; private: WW8Export(const WW8Export&) = delete; @@ -1232,7 +1232,7 @@ class WW8_WrPlcTextBoxes : public WW8_WrPlcSubDoc // double Plc for Textboxes private: sal_uInt8 nTyp; std::vector<sal_uInt32> aShapeIds; // VARARR of ShapeIds for the SwFrameFormats - virtual const std::vector<sal_uInt32>* GetShapeIdArr() const SAL_OVERRIDE; + virtual const std::vector<sal_uInt32>* GetShapeIdArr() const override; WW8_WrPlcTextBoxes(const WW8_WrPlcTextBoxes&) = delete; WW8_WrPlcTextBoxes& operator=(WW8_WrPlcTextBoxes&) = delete; @@ -1432,8 +1432,8 @@ public: void NextPos() { if ( nAktSwPos < SAL_MAX_INT32 ) nAktSwPos = SearchNext( nAktSwPos + 1 ); } void OutAttr( sal_Int32 nSwPos ); - virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const SAL_OVERRIDE; - virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const override; + virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const override; sal_Int32 WhereNext() const { return nAktSwPos; } rtl_TextEncoding GetNextCharSet() const; rtl_TextEncoding GetNodeCharSet() const { return eNdChrSet; } @@ -1488,8 +1488,8 @@ public: void NextPos() { if ( nAktSwPos < SAL_MAX_INT32 ) nAktSwPos = SearchNext( nAktSwPos + 1 ); } void OutAttr( sal_Int32 nSwPos, bool bRuby = false ); - virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const SAL_OVERRIDE; - virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const override; + virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const override; int OutAttrWithRange(sal_Int32 nPos); const SwRedlineData* GetParagraphLevelRedline( ); const SwRedlineData* GetRunLevelRedline( sal_Int32 nPos ); diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 25e3308cde75..294686e5bd71 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -27,158 +27,158 @@ class WW8AttributeOutput : public AttributeOutputBase { public: /// Export the state of RTL/CJK. - virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) SAL_OVERRIDE; + virtual void RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) override; /// Start of the paragraph. - virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/ ) SAL_OVERRIDE {} + virtual void StartParagraph( ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/ ) override {} /// End of the paragraph. - virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; + virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) override; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwNode& /*rNode*/) SAL_OVERRIDE {} + virtual void SectionBreaks(const SwNode& /*rNode*/) override {} /// Called before we start outputting the attributes. - virtual void StartParagraphProperties() SAL_OVERRIDE {} + virtual void StartParagraphProperties() override {} /// Called after we end outputting the attributes. - virtual void EndParagraphProperties(const SfxItemSet& /*rParagraphMarkerProperties*/, const SwRedlineData* /*pRedlineData*/, const SwRedlineData* /*pRedlineParagraphMarkerDeleted*/, const SwRedlineData* /*pRedlineParagraphMarkerInserted*/) SAL_OVERRIDE {} + virtual void EndParagraphProperties(const SfxItemSet& /*rParagraphMarkerProperties*/, const SwRedlineData* /*pRedlineData*/, const SwRedlineData* /*pRedlineParagraphMarkerDeleted*/, const SwRedlineData* /*pRedlineParagraphMarkerInserted*/) override {} /// Empty paragraph. - virtual void EmptyParagraph() SAL_OVERRIDE; + virtual void EmptyParagraph() override; /// Start of the text run. /// - virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) SAL_OVERRIDE; + virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) override; - virtual void OnTOXEnding() SAL_OVERRIDE; + virtual void OnTOXEnding() override; /// End of the text run. /// /// No-op for binary filters. - virtual void EndRun() SAL_OVERRIDE {} + virtual void EndRun() override {} /// Before we start outputting the attributes. - virtual void StartRunProperties() SAL_OVERRIDE; + virtual void StartRunProperties() override; /// After we end outputting the attributes. - virtual void EndRunProperties( const SwRedlineData* pRedlineData ) SAL_OVERRIDE; + virtual void EndRunProperties( const SwRedlineData* pRedlineData ) override; /// Output text. - virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) SAL_OVERRIDE; + virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) override; /// Output text (without markup). - virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) SAL_OVERRIDE; + virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) override; /// Output ruby start. - virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) SAL_OVERRIDE; + virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) override; /// Output ruby end. - virtual void EndRuby() SAL_OVERRIDE; + virtual void EndRuby() override; /// Output URL start. - virtual bool StartURL( const OUString &rUrl, const OUString &rTarget ) SAL_OVERRIDE; + virtual bool StartURL( const OUString &rUrl, const OUString &rTarget ) override; /// Output URL end. - virtual bool EndURL(bool) SAL_OVERRIDE; + virtual bool EndURL(bool) override; - virtual void FieldVanish( const OUString& rText, ww::eField eType ) SAL_OVERRIDE; + virtual void FieldVanish( const OUString& rText, ww::eField eType ) override; /// Output redlining. - virtual void Redline( const SwRedlineData* pRedline ) SAL_OVERRIDE; + virtual void Redline( const SwRedlineData* pRedline ) override; - virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop &rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; + virtual void FormatDrop( const SwTextNode& rNode, const SwFormatDrop &rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) override; /// Output FKP (Formatted disK Page) - necessary for binary formats only. /// FIXME having it in AttributeOutputBase is probably a hack, it /// should be in WW8AttributeOutput only... - virtual void OutputFKP(bool bForce = false) SAL_OVERRIDE; + virtual void OutputFKP(bool bForce = false) override; /// Output style. - virtual void ParagraphStyle( sal_uInt16 nStyle ) SAL_OVERRIDE; - - virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE; - virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) SAL_OVERRIDE; - virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE; - virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) SAL_OVERRIDE; + virtual void ParagraphStyle( sal_uInt16 nStyle ) override; + + virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableRowRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableCellRedline( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) override; + virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) override; + virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) override; + virtual void TableRowEnd( sal_uInt32 nDepth = 1 ) override; /// Start of the styles table. - virtual void StartStyles() SAL_OVERRIDE; + virtual void StartStyles() override; /// End of the styles table. - virtual void EndStyles( sal_uInt16 nNumberOfStyles ) SAL_OVERRIDE; + virtual void EndStyles( sal_uInt16 nNumberOfStyles ) override; /// Write default style. - virtual void DefaultStyle( sal_uInt16 nStyle ) SAL_OVERRIDE; + virtual void DefaultStyle( sal_uInt16 nStyle ) override; /// Start of a style in the styles table. virtual void StartStyle( const OUString& rName, StyleType eType, sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwIdi, sal_uInt16 nId, - bool bAutoUpdate ) SAL_OVERRIDE; + bool bAutoUpdate ) override; /// End of a style in the styles table. - virtual void EndStyle() SAL_OVERRIDE; + virtual void EndStyle() override; /// Start of (paragraph or run) properties of a style. - virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) SAL_OVERRIDE; + virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ) override; /// End of (paragraph or run) properties of a style. - virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE; + virtual void EndStyleProperties( bool bParProp ) override; /// Numbering rule and Id. - virtual void OutlineNumbering(sal_uInt8 nLvl) SAL_OVERRIDE; + virtual void OutlineNumbering(sal_uInt8 nLvl) override; /// Page break /// As a paragraph property - the paragraph should be on the next page. - virtual void PageBreakBefore( bool bBreak ) SAL_OVERRIDE; + virtual void PageBreakBefore( bool bBreak ) override; /// Write a section break /// msword::ColumnBreak or msword::PageBreak - virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) SAL_OVERRIDE; + virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ) override; /// Start of the section properties. - virtual void StartSection() SAL_OVERRIDE; + virtual void StartSection() override; /// End of the section properties. /// /// No-op for binary filters. - virtual void EndSection() SAL_OVERRIDE {} + virtual void EndSection() override {} /// Protection of forms. - virtual void SectionFormProtection( bool bProtected ) SAL_OVERRIDE; + virtual void SectionFormProtection( bool bProtected ) override; /// Numbering of the lines in the document. - virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) SAL_OVERRIDE; + virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) override; /// Has different headers/footers for the title page. - virtual void SectionTitlePage() SAL_OVERRIDE; + virtual void SectionTitlePage() override; /// Description of the page borders. - virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) SAL_OVERRIDE; + virtual void SectionPageBorders( const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat ) override; /// Columns populated from right/numbers on the right side? - virtual void SectionBiDi( bool bBiDi ) SAL_OVERRIDE; + virtual void SectionBiDi( bool bBiDi ) override; /// The style of the page numbers. /// - virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) SAL_OVERRIDE; + virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) override; /// The type of breaking. - virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE; + virtual void SectionType( sal_uInt8 nBreakCode ) override; /// Definition of a numbering instance. - virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE; + virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) override; /// All the numbering level information. virtual void NumberingLevel( sal_uInt8 nLevel, @@ -193,236 +193,236 @@ public: sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const OUString &rNumberingString, - const SvxBrushItem* pBrush = 0) SAL_OVERRIDE; //For i120928,transfer graphic of bullet + const SvxBrushItem* pBrush = 0) override; //For i120928,transfer graphic of bullet protected: /// Output frames - the implementation. - void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) SAL_OVERRIDE; + void OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) override; /// Sfx item Sfx item RES_CHRATR_CASEMAP - virtual void CharCaseMap( const SvxCaseMapItem& ) SAL_OVERRIDE; + virtual void CharCaseMap( const SvxCaseMapItem& ) override; /// Sfx item Sfx item RES_CHRATR_COLOR - virtual void CharColor( const SvxColorItem& ) SAL_OVERRIDE; + virtual void CharColor( const SvxColorItem& ) override; /// Sfx item Sfx item RES_CHRATR_CONTOUR - virtual void CharContour( const SvxContourItem& ) SAL_OVERRIDE; + virtual void CharContour( const SvxContourItem& ) override; /// Sfx item RES_CHRATR_CROSSEDOUT - virtual void CharCrossedOut( const SvxCrossedOutItem& rHt ) SAL_OVERRIDE; + virtual void CharCrossedOut( const SvxCrossedOutItem& rHt ) override; /// Sfx item RES_CHRATR_ESCAPEMENT - virtual void CharEscapement( const SvxEscapementItem& ) SAL_OVERRIDE; + virtual void CharEscapement( const SvxEscapementItem& ) override; /// Sfx item RES_CHRATR_FONT - virtual void CharFont( const SvxFontItem& ) SAL_OVERRIDE; + virtual void CharFont( const SvxFontItem& ) override; /// Sfx item RES_CHRATR_FONTSIZE - virtual void CharFontSize( const SvxFontHeightItem& ) SAL_OVERRIDE; + virtual void CharFontSize( const SvxFontHeightItem& ) override; /// Sfx item RES_CHRATR_KERNING - virtual void CharKerning( const SvxKerningItem& ) SAL_OVERRIDE; + virtual void CharKerning( const SvxKerningItem& ) override; /// Sfx item RES_CHRATR_LANGUAGE - virtual void CharLanguage( const SvxLanguageItem& ) SAL_OVERRIDE; + virtual void CharLanguage( const SvxLanguageItem& ) override; /// Sfx item RES_CHRATR_POSTURE - virtual void CharPosture( const SvxPostureItem& ) SAL_OVERRIDE; + virtual void CharPosture( const SvxPostureItem& ) override; /// Sfx item RES_CHRATR_SHADOWED - virtual void CharShadow( const SvxShadowedItem& ) SAL_OVERRIDE; + virtual void CharShadow( const SvxShadowedItem& ) override; /// Sfx item RES_CHRATR_UNDERLINE - virtual void CharUnderline( const SvxUnderlineItem& ) SAL_OVERRIDE; + virtual void CharUnderline( const SvxUnderlineItem& ) override; /// Sfx item RES_CHRATR_WEIGHT - virtual void CharWeight( const SvxWeightItem& ) SAL_OVERRIDE; + virtual void CharWeight( const SvxWeightItem& ) override; /// Sfx item RES_CHRATR_AUTOKERN - virtual void CharAutoKern( const SvxAutoKernItem& ) SAL_OVERRIDE; + virtual void CharAutoKern( const SvxAutoKernItem& ) override; /// Sfx item RES_CHRATR_BLINK - virtual void CharAnimatedText( const SvxBlinkItem& ) SAL_OVERRIDE; + virtual void CharAnimatedText( const SvxBlinkItem& ) override; /// Sfx item RES_CHRATR_BACKGROUND - virtual void CharBackground( const SvxBrushItem& ) SAL_OVERRIDE; + virtual void CharBackground( const SvxBrushItem& ) override; /// Sfx item RES_CHRATR_CJK_FONT - virtual void CharFontCJK( const SvxFontItem& ) SAL_OVERRIDE; + virtual void CharFontCJK( const SvxFontItem& ) override; /// Sfx item RES_CHRATR_CJK_FONTSIZE - virtual void CharFontSizeCJK( const SvxFontHeightItem& rHt ) SAL_OVERRIDE { CharFontSize( rHt ); } + virtual void CharFontSizeCJK( const SvxFontHeightItem& rHt ) override { CharFontSize( rHt ); } /// Sfx item RES_CHRATR_CJK_LANGUAGE - virtual void CharLanguageCJK( const SvxLanguageItem& rHt ) SAL_OVERRIDE { CharLanguage( rHt ); } + virtual void CharLanguageCJK( const SvxLanguageItem& rHt ) override { CharLanguage( rHt ); } /// Sfx item RES_CHRATR_CJK_POSTURE - virtual void CharPostureCJK( const SvxPostureItem& rHt ) SAL_OVERRIDE { CharPosture( rHt ); } + virtual void CharPostureCJK( const SvxPostureItem& rHt ) override { CharPosture( rHt ); } /// Sfx item RES_CHRATR_CJK_WEIGHT - virtual void CharWeightCJK( const SvxWeightItem& rHt ) SAL_OVERRIDE { CharWeight( rHt ); } + virtual void CharWeightCJK( const SvxWeightItem& rHt ) override { CharWeight( rHt ); } /// Sfx item RES_CHRATR_CTL_FONT - virtual void CharFontCTL( const SvxFontItem& ) SAL_OVERRIDE; + virtual void CharFontCTL( const SvxFontItem& ) override; /// Sfx item RES_CHRATR_CTL_FONTSIZE - virtual void CharFontSizeCTL( const SvxFontHeightItem& rHt ) SAL_OVERRIDE { CharFontSize( rHt ); } + virtual void CharFontSizeCTL( const SvxFontHeightItem& rHt ) override { CharFontSize( rHt ); } /// Sfx item RES_CHRATR_CTL_LANGUAGE - virtual void CharLanguageCTL( const SvxLanguageItem& rHt ) SAL_OVERRIDE { CharLanguage( rHt ); } + virtual void CharLanguageCTL( const SvxLanguageItem& rHt ) override { CharLanguage( rHt ); } /// Sfx item RES_CHRATR_CTL_POSTURE - virtual void CharPostureCTL( const SvxPostureItem& ) SAL_OVERRIDE; + virtual void CharPostureCTL( const SvxPostureItem& ) override; /// Sfx item RES_CHRATR_CTL_WEIGHT - virtual void CharWeightCTL( const SvxWeightItem& ) SAL_OVERRIDE; + virtual void CharWeightCTL( const SvxWeightItem& ) override; /// Sfx item RES_CHRATR_BidiRTL - virtual void CharBidiRTL( const SfxPoolItem& rHt ) SAL_OVERRIDE; + virtual void CharBidiRTL( const SfxPoolItem& rHt ) override; /// Sfx item RES_CHRATR_IdctHint - virtual void CharIdctHint( const SfxPoolItem& rHt ) SAL_OVERRIDE; + virtual void CharIdctHint( const SfxPoolItem& rHt ) override; /// Sfx item RES_CHRATR_ROTATE - virtual void CharRotate( const SvxCharRotateItem& ) SAL_OVERRIDE; + virtual void CharRotate( const SvxCharRotateItem& ) override; /// Sfx item RES_CHRATR_EMPHASIS_MARK - virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rHt ) SAL_OVERRIDE; + virtual void CharEmphasisMark( const SvxEmphasisMarkItem& rHt ) override; /// Sfx item RES_CHRATR_TWO_LINES - virtual void CharTwoLines( const SvxTwoLinesItem& ) SAL_OVERRIDE; + virtual void CharTwoLines( const SvxTwoLinesItem& ) override; /// Sfx item RES_CHRATR_SCALEW - virtual void CharScaleWidth( const SvxCharScaleWidthItem& ) SAL_OVERRIDE; + virtual void CharScaleWidth( const SvxCharScaleWidthItem& ) override; /// Sfx item RES_CHRATR_RELIEF - virtual void CharRelief( const SvxCharReliefItem& ) SAL_OVERRIDE; + virtual void CharRelief( const SvxCharReliefItem& ) override; /// Sfx item RES_CHRATR_HIDDEN - virtual void CharHidden( const SvxCharHiddenItem& ) SAL_OVERRIDE; + virtual void CharHidden( const SvxCharHiddenItem& ) override; /// Sfx item RES_CHRATR_BOX - virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) SAL_OVERRIDE; + virtual void CharBorder( const ::editeng::SvxBorderLine* pAllBorder, const sal_uInt16 nDist, const bool bShadow ) override; /// Sfx item RES_CHRATR_HIGHLIGHT - virtual void CharHighlight( const SvxBrushItem& ) SAL_OVERRIDE; + virtual void CharHighlight( const SvxBrushItem& ) override; /// Sfx item RES_TXTATR_INETFMT - virtual void TextINetFormat( const SwFormatINetFormat& ) SAL_OVERRIDE; + virtual void TextINetFormat( const SwFormatINetFormat& ) override; /// Sfx item RES_TXTATR_CHARFMT - virtual void TextCharFormat( const SwFormatCharFormat& ) SAL_OVERRIDE; + virtual void TextCharFormat( const SwFormatCharFormat& ) override; /// Sfx item RES_TXTATR_FTN - virtual void TextFootnote_Impl( const SwFormatFootnote& ) SAL_OVERRIDE; + virtual void TextFootnote_Impl( const SwFormatFootnote& ) override; /// Sfx item RES_PARATR_LINESPACING - virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) SAL_OVERRIDE; + virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) override; /// Sfx item RES_PARATR_ADJUST - virtual void ParaAdjust( const SvxAdjustItem& rHt ) SAL_OVERRIDE; + virtual void ParaAdjust( const SvxAdjustItem& rHt ) override; /// Sfx item RES_PARATR_SPLIT - virtual void ParaSplit( const SvxFormatSplitItem& ) SAL_OVERRIDE; + virtual void ParaSplit( const SvxFormatSplitItem& ) override; /// Sfx item RES_PARATR_WIDOWS - virtual void ParaWidows( const SvxWidowsItem& rHt ) SAL_OVERRIDE; + virtual void ParaWidows( const SvxWidowsItem& rHt ) override; /// Sfx item RES_PARATR_TABSTOP - virtual void ParaTabStop( const SvxTabStopItem& rHt ) SAL_OVERRIDE; + virtual void ParaTabStop( const SvxTabStopItem& rHt ) override; /// Sfx item RES_PARATR_HYPHENZONE - virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) SAL_OVERRIDE; + virtual void ParaHyphenZone( const SvxHyphenZoneItem& ) override; /// Sfx item RES_PARATR_NUMRULE - virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) SAL_OVERRIDE; + virtual void ParaNumRule_Impl( const SwTextNode *pTextNd, sal_Int32 nLvl, sal_Int32 nNumId ) override; /// Sfx item RES_PARATR_SCRIPTSPACE - virtual void ParaScriptSpace( const SfxBoolItem& ) SAL_OVERRIDE; + virtual void ParaScriptSpace( const SfxBoolItem& ) override; /// Sfx item RES_PARATR_HANGINGPUNCTUATION - virtual void ParaHangingPunctuation( const SfxBoolItem& ) SAL_OVERRIDE; + virtual void ParaHangingPunctuation( const SfxBoolItem& ) override; /// Sfx item RES_PARATR_FORBIDDEN_RULES - virtual void ParaForbiddenRules( const SfxBoolItem& ) SAL_OVERRIDE; + virtual void ParaForbiddenRules( const SfxBoolItem& ) override; /// Sfx item RES_PARATR_VERTALIGN - virtual void ParaVerticalAlign( const SvxParaVertAlignItem& ) SAL_OVERRIDE; + virtual void ParaVerticalAlign( const SvxParaVertAlignItem& ) override; /// Sfx item RES_PARATR_SNAPTOGRID - virtual void ParaSnapToGrid( const SvxParaGridItem& ) SAL_OVERRIDE; + virtual void ParaSnapToGrid( const SvxParaGridItem& ) override; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize( const SwFormatFrmSize& ) SAL_OVERRIDE; + virtual void FormatFrameSize( const SwFormatFrmSize& ) override; /// Sfx item RES_PAPER_BIN - virtual void FormatPaperBin( const SvxPaperBinItem& ) SAL_OVERRIDE; + virtual void FormatPaperBin( const SvxPaperBinItem& ) override; /// Sfx item RES_LR_SPACE - virtual void FormatLRSpace( const SvxLRSpaceItem& ) SAL_OVERRIDE; + virtual void FormatLRSpace( const SvxLRSpaceItem& ) override; /// Sfx item RES_UL_SPACE - virtual void FormatULSpace( const SvxULSpaceItem& rHt ) SAL_OVERRIDE; + virtual void FormatULSpace( const SvxULSpaceItem& rHt ) override; /// Sfx item RES_SURROUND - virtual void FormatSurround( const SwFormatSurround& ) SAL_OVERRIDE; + virtual void FormatSurround( const SwFormatSurround& ) override; /// Sfx item RES_VERT_ORIENT - virtual void FormatVertOrientation( const SwFormatVertOrient& ) SAL_OVERRIDE; + virtual void FormatVertOrientation( const SwFormatVertOrient& ) override; /// Sfx item RES_HORI_ORIENT - virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) SAL_OVERRIDE; + virtual void FormatHorizOrientation( const SwFormatHoriOrient& ) override; /// Sfx item RES_ANCHOR - virtual void FormatAnchor( const SwFormatAnchor& ) SAL_OVERRIDE; + virtual void FormatAnchor( const SwFormatAnchor& ) override; /// Sfx item RES_BACKGROUND - virtual void FormatBackground( const SvxBrushItem& ) SAL_OVERRIDE; + virtual void FormatBackground( const SvxBrushItem& ) override; /// Sfx item RES_FILL_STYLE - virtual void FormatFillStyle( const XFillStyleItem& ) SAL_OVERRIDE; + virtual void FormatFillStyle( const XFillStyleItem& ) override; /// Sfx item RES_FILL_GRADIENT - virtual void FormatFillGradient( const XFillGradientItem& ) SAL_OVERRIDE; + virtual void FormatFillGradient( const XFillGradientItem& ) override; /// Sfx item RES_BOX - virtual void FormatBox( const SvxBoxItem& ) SAL_OVERRIDE; + virtual void FormatBox( const SvxBoxItem& ) override; /// Sfx item RES_COL - virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) SAL_OVERRIDE; + virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol & rCol, bool bEven, SwTwips nPageSize ) override; /// Sfx item RES_KEEP - virtual void FormatKeep( const SvxFormatKeepItem& ) SAL_OVERRIDE; + virtual void FormatKeep( const SvxFormatKeepItem& ) override; /// Sfx item RES_TEXTGRID - virtual void FormatTextGrid( const SwTextGridItem& ) SAL_OVERRIDE; + virtual void FormatTextGrid( const SwTextGridItem& ) override; /// Sfx item RES_LINENUMBER - virtual void FormatLineNumbering( const SwFormatLineNumber& ) SAL_OVERRIDE; + virtual void FormatLineNumbering( const SwFormatLineNumber& ) override; /// Sfx item RES_FRAMEDIR - virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) SAL_OVERRIDE; + virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) override; /// Sfx item RES_PARATR_GRABBAG - virtual void ParaGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE; + virtual void ParaGrabBag( const SfxGrabBagItem& ) override; /// Sfx item RES_TXTATR_GRABBAG - virtual void CharGrabBag( const SfxGrabBagItem& ) SAL_OVERRIDE; + virtual void CharGrabBag( const SfxGrabBagItem& ) override; // Sfx item RES_PARATR_OUTLINELEVEL - virtual void ParaOutlineLevel( const SfxUInt16Item& ) SAL_OVERRIDE; + virtual void ParaOutlineLevel( const SfxUInt16Item& ) override; /// Write the expanded field - virtual void WriteExpand( const SwField* pField ) SAL_OVERRIDE; + virtual void WriteExpand( const SwField* pField ) override; - virtual void RefField ( const SwField& rField, const OUString& rRef ) SAL_OVERRIDE; - virtual void HiddenField( const SwField& rField ) SAL_OVERRIDE; - virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) SAL_OVERRIDE; - virtual void PostitField( const SwField* pField ) SAL_OVERRIDE; - virtual bool DropdownField( const SwField* pField ) SAL_OVERRIDE; - virtual bool PlaceholderField( const SwField* pField ) SAL_OVERRIDE; + virtual void RefField ( const SwField& rField, const OUString& rRef ) override; + virtual void HiddenField( const SwField& rField ) override; + virtual void SetField( const SwField& rField, ww::eField eType, const OUString& rCmd ) override; + virtual void PostitField( const SwField* pField ) override; + virtual bool DropdownField( const SwField* pField ) override; + virtual bool PlaceholderField( const SwField* pField ) override; - virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) SAL_OVERRIDE; + virtual bool AnalyzeURL( const OUString& rURL, const OUString& rTarget, OUString* pLinkURL, OUString* pMark ) override; /// Reference to the export, where to get the data from WW8Export &m_rWW8Export; @@ -469,7 +469,7 @@ public: virtual ~WW8AttributeOutput() {} /// Return the right export class. - virtual WW8Export& GetExport() SAL_OVERRIDE { return m_rWW8Export; } + virtual WW8Export& GetExport() override { return m_rWW8Export; } protected: /// Output the bold etc. attributes diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index ef9dd9bb8f3e..9dd445e1a609 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -454,9 +454,9 @@ struct SBBItem public: Sttb(); virtual ~Sttb(); - 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 OUString getStringAtIndex( sal_uInt32 ); }; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index d520c1204eab..64fb6cce03fe 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -131,13 +131,13 @@ struct WW8LFOInfo; class WW8Reader : public StgReader { - virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE; + virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override; sal_uLong OpenMainStream( tools::SvRef<SotStorageStream>& rRef, sal_uInt16& rBuffSize ); public: - virtual int GetReaderType() SAL_OVERRIDE; + virtual int GetReaderType() override; - virtual bool HasGlossaries() const SAL_OVERRIDE; - virtual bool ReadGlossaries( SwTextBlocks&, bool bSaveRelFiles ) const SAL_OVERRIDE; + virtual bool HasGlossaries() const override; + virtual bool ReadGlossaries( SwTextBlocks&, bool bSaveRelFiles ) const override; }; class SwWW8ImplReader; @@ -371,13 +371,13 @@ private: const SwTextNode &rTextNode); protected: virtual void SetAttrInDoc(const SwPosition& rTmpPos, - SwFltStackEntry& rEntry) SAL_OVERRIDE; + SwFltStackEntry& rEntry) override; - virtual sal_Int32 GetCurrAttrCP() const SAL_OVERRIDE; - virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD=true) const SAL_OVERRIDE; + virtual sal_Int32 GetCurrAttrCP() const override; + virtual bool IsParaEndInCPs(sal_Int32 nStart,sal_Int32 nEnd,bool bSdOD=true) const override; //Clear the para end position recorded in reader intermittently for the least impact on loading performance - virtual void ClearParaEndPosition() SAL_OVERRIDE; - virtual bool CheckSdOD(sal_Int32 nStart,sal_Int32 nEnd) SAL_OVERRIDE; + virtual void ClearParaEndPosition() override; + virtual bool CheckSdOD(sal_Int32 nStart,sal_Int32 nEnd) override; public: SwWW8FltControlStack(SwDoc* pDo, sal_uLong nFieldFl, SwWW8ImplReader& rReader_ ) @@ -387,7 +387,7 @@ public: void NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr); - virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, bool bTstEnde=true, long nHand=LONG_MAX, bool consumedByField=false) SAL_OVERRIDE; + virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, bool bTstEnde=true, long nHand=LONG_MAX, bool consumedByField=false) override; void SetToggleAttr(sal_uInt8 nId, bool bOn) { @@ -477,7 +477,7 @@ public: std::set<OUString, SwWW8::ltstr> aReferencedTOCBookmarks; protected: virtual void SetAttrInDoc( const SwPosition& rTmpPos, - SwFltStackEntry& rEntry ) SAL_OVERRIDE; + SwFltStackEntry& rEntry ) override; }; class SwWW8FltRefStack : public SwFltEndStack @@ -496,7 +496,7 @@ public: protected: SwFltStackEntry *RefToVar(const SwField* pField,SwFltStackEntry& rEntry); virtual void SetAttrInDoc(const SwPosition& rTmpPos, - SwFltStackEntry& rEntry) SAL_OVERRIDE; + SwFltStackEntry& rEntry) override; private: SwWW8FltRefStack(const SwWW8FltRefStack&) = delete; SwWW8FltRefStack& operator=(const SwWW8FltRefStack&) = delete; @@ -520,7 +520,7 @@ public: SwMacroInfo(); virtual ~SwMacroInfo(); - virtual SdrObjUserData* Clone( SdrObject* pObj ) const SAL_OVERRIDE; + virtual SdrObjUserData* Clone( SdrObject* pObj ) const override; void SetHlink( const OUString& rHlink ) { maHlink = rHlink; } const OUString& GetHlink() const { return maHlink; } @@ -707,7 +707,7 @@ public: com::sun::star::lang::XMultiServiceFactory> &rServiceFactory, com::sun::star::uno::Reference < com::sun::star::form::XFormComponent> &rFComp, - com::sun::star::awt::Size &rSz) SAL_OVERRIDE; + com::sun::star::awt::Size &rSz) override; }; class WW8FormulaListBox : public WW8FormulaControl @@ -723,7 +723,7 @@ public: com::sun::star::lang::XMultiServiceFactory> &rServiceFactory, com::sun::star::uno::Reference < com::sun::star::form::XFormComponent> &rFComp, - com::sun::star::awt::Size &rSz) SAL_OVERRIDE; + com::sun::star::awt::Size &rSz) override; }; class WW8FormulaEditBox : public WW8FormulaControl @@ -738,7 +738,7 @@ public: com::sun::star::lang::XMultiServiceFactory> & /* rServiceFactory */, com::sun::star::uno::Reference < com::sun::star::form::XFormComponent> & /* rFComp */, - com::sun::star::awt::Size & /* rSz */) SAL_OVERRIDE { return false; } + com::sun::star::awt::Size & /* rSz */) override { return false; } }; class SwMSConvertControls: public oox::ole::MSConvertOCXControls @@ -750,7 +750,7 @@ public: com::sun::star::form::XFormComponent >& rFComp, const ::com::sun::star::awt::Size& rSize, com::sun::star::uno::Reference < - com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) SAL_OVERRIDE; + com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) override; bool ExportControl(WW8Export &rWrt, const SdrUnoObj& rFormObj); bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, com::sun::star::uno::Reference< @@ -770,8 +770,8 @@ private: std::map<sal_uInt32,OString> aOldEscherBlipCache; virtual bool GetOLEStorageName( long nOLEId, OUString& rStorageName, - tools::SvRef<SotStorage>& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const SAL_OVERRIDE; - virtual bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const SAL_OVERRIDE; + tools::SvRef<SotStorage>& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const override; + virtual bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const override; // #i32596# - new parameter <_nCalledByGroup>, which // indicates, if the OLE object is imported inside a group object virtual SdrObject* ImportOLE( long nOLEId, @@ -779,7 +779,7 @@ private: const Rectangle& rBoundRect, const Rectangle& rVisArea, const int _nCalledByGroup, - sal_Int64 nAspect ) const SAL_OVERRIDE; + sal_Int64 nAspect ) const override; SwMSDffManager(const SwMSDffManager&) = delete; SwMSDffManager& operator=(const SwMSDffManager&) = delete; @@ -791,7 +791,7 @@ public: void DisableFallbackStream(); void EnableFallbackStream(); protected: - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) SAL_OVERRIDE; + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) override; }; class wwSection diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 4712bca7228e..c4ca1d6f3d5b 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -424,12 +424,12 @@ private: public: WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase ); - virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; - virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; - virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; - virtual WW8_FC Where() SAL_OVERRIDE; - virtual void GetSprms( WW8PLCFxDesc* p ) SAL_OVERRIDE; - virtual void advance() SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const override; + virtual void SetIdx( sal_uLong nI ) override; + virtual bool SeekPos(WW8_CP nCpPos) override; + virtual WW8_FC Where() override; + virtual void GetSprms( WW8PLCFxDesc* p ) override; + virtual void advance() override; WW8PLCFpcd_Iter* GetIter() const { return pPcdI; } }; @@ -449,12 +449,12 @@ public: WW8_CP nStartCp, bool bVer67P); virtual ~WW8PLCFx_PCD(); sal_uLong GetIMax() const; - virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; - virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; - virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; - virtual WW8_FC Where() SAL_OVERRIDE; - virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen ) SAL_OVERRIDE; - virtual void advance() SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const override; + virtual void SetIdx( sal_uLong nI ) override; + virtual bool SeekPos(WW8_CP nCpPos) override; + virtual WW8_FC Where() override; + virtual long GetNoSprms( WW8_CP& rStart, WW8_CP&, sal_Int32& rLen ) override; + virtual void advance() override; WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos ); WW8_FC AktPieceStartCp2Fc( WW8_CP nCp ); static void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos, @@ -585,13 +585,13 @@ public: WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt, const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL ); virtual ~WW8PLCFx_Fc_FKP(); - virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; - virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; - virtual bool SeekPos(WW8_FC nFcPos) SAL_OVERRIDE; - virtual WW8_FC Where() SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const override; + virtual void SetIdx( sal_uLong nIdx ) override; + virtual bool SeekPos(WW8_FC nFcPos) override; + virtual WW8_FC Where() override; sal_uInt8* GetSprmsAndPos( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen ); - virtual void advance() SAL_OVERRIDE; - virtual sal_uInt16 GetIstd() const SAL_OVERRIDE; + virtual void advance() override; + virtual sal_uInt16 GetIstd() const override; void GetPCDSprms( WW8PLCFxDesc& rDesc ); const sal_uInt8* HasSprm( sal_uInt16 nId ); bool HasSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rResult); @@ -620,14 +620,14 @@ public: sal_uLong GetPCDIMax() const; sal_uLong GetPCDIdx() const; void SetPCDIdx( sal_uLong nIdx ); - virtual sal_uLong GetIdx2() const SAL_OVERRIDE; - virtual void SetIdx2( sal_uLong nIdx ) SAL_OVERRIDE; - virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; - virtual WW8_CP Where() SAL_OVERRIDE; - virtual void GetSprms( WW8PLCFxDesc* p ) SAL_OVERRIDE; - virtual void advance() SAL_OVERRIDE; - virtual void Save( WW8PLCFxSave1& rSave ) const SAL_OVERRIDE; - virtual void Restore( const WW8PLCFxSave1& rSave ) SAL_OVERRIDE; + virtual sal_uLong GetIdx2() const override; + virtual void SetIdx2( sal_uLong nIdx ) override; + virtual bool SeekPos(WW8_CP nCpPos) override; + virtual WW8_CP Where() override; + virtual void GetSprms( WW8PLCFxDesc* p ) override; + virtual void advance() override; + virtual void Save( WW8PLCFxSave1& rSave ) const override; + virtual void Restore( const WW8PLCFxSave1& rSave ) override; }; /// Iterator for Piece Table Exceptions of Sepx @@ -648,12 +648,12 @@ public: WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTablexySt, const WW8Fib& rFib, WW8_CP nStartCp ); virtual ~WW8PLCFx_SEPX(); - virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; - virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; - virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; - virtual WW8_FC Where() SAL_OVERRIDE; - virtual void GetSprms( WW8PLCFxDesc* p ) SAL_OVERRIDE; - virtual void advance() SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const override; + virtual void SetIdx( sal_uLong nIdx ) override; + virtual bool SeekPos(WW8_CP nCpPos) override; + virtual WW8_FC Where() override; + virtual void GetSprms( WW8PLCFxDesc* p ) override; + virtual void advance() override; const sal_uInt8* HasSprm( sal_uInt16 nId ) const; const sal_uInt8* HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const; const sal_uInt8* HasSprm( sal_uInt16 nId, const sal_uInt8* pOtherSprms, @@ -676,10 +676,10 @@ public: WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcText, long nLenText, long nStruc = 0); virtual ~WW8PLCFx_SubDoc(); - virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; - virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; - virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; - virtual WW8_FC Where() SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const override; + virtual void SetIdx( sal_uLong nIdx ) override; + virtual bool SeekPos(WW8_CP nCpPos) override; + virtual WW8_FC Where() override; // returns reference descriptors const void* GetData( long nIdx = -1 ) const @@ -687,8 +687,8 @@ public: return pRef ? pRef->GetData( -1L == nIdx ? pRef->GetIdx() : nIdx ) : 0; } - virtual void GetSprms(WW8PLCFxDesc* p) SAL_OVERRIDE; - virtual void advance() SAL_OVERRIDE; + virtual void GetSprms(WW8PLCFxDesc* p) override; + virtual void advance() override; long Count() const { return ( pRef ) ? pRef->GetIMax() : 0; } }; @@ -704,12 +704,12 @@ private: public: WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType); virtual ~WW8PLCFx_FLD(); - virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; - virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; - virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; - virtual WW8_FC Where() SAL_OVERRIDE; - virtual void GetSprms(WW8PLCFxDesc* p) SAL_OVERRIDE; - virtual void advance() SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const override; + virtual void SetIdx( sal_uLong nIdx ) override; + virtual bool SeekPos(WW8_CP nCpPos) override; + virtual WW8_FC Where() override; + virtual void GetSprms(WW8PLCFxDesc* p) override; + virtual void advance() override; bool StartPosIsFieldStart(); bool EndPosIsFieldEnd(WW8_CP&); bool GetPara(long nIdx, WW8FieldDesc& rF); @@ -735,14 +735,14 @@ public: WW8PLCFx_Book(SvStream* pTableSt,const WW8Fib& rFib); virtual ~WW8PLCFx_Book(); long GetIMax() const { return nIMax; } - virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; - virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; - virtual sal_uLong GetIdx2() const SAL_OVERRIDE; - virtual void SetIdx2( sal_uLong nIdx ) SAL_OVERRIDE; - virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; - virtual WW8_FC Where() SAL_OVERRIDE; - virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) SAL_OVERRIDE; - virtual void advance() SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const override; + virtual void SetIdx( sal_uLong nI ) override; + virtual sal_uLong GetIdx2() const override; + virtual void SetIdx2( sal_uLong nIdx ) override; + virtual bool SeekPos(WW8_CP nCpPos) override; + virtual WW8_FC Where() override; + virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) override; + virtual void advance() override; const OUString* GetName() const; WW8_CP GetStartPos() const { return ( nIsEnd ) ? WW8_CP_MAX : pBook[0]->Where(); } @@ -772,14 +772,14 @@ private: public: WW8PLCFx_AtnBook(SvStream* pTableSt,const WW8Fib& rFib); virtual ~WW8PLCFx_AtnBook(); - virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; - virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; - virtual sal_uLong GetIdx2() const SAL_OVERRIDE; - virtual void SetIdx2( sal_uLong nIdx ) SAL_OVERRIDE; - virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; - virtual WW8_FC Where() SAL_OVERRIDE; - virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) SAL_OVERRIDE; - virtual void advance() SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const override; + virtual void SetIdx( sal_uLong nI ) override; + virtual sal_uLong GetIdx2() const override; + virtual void SetIdx2( sal_uLong nIdx ) override; + virtual bool SeekPos(WW8_CP nCpPos) override; + virtual WW8_FC Where() override; + virtual long GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) override; + virtual void advance() override; /// Handle is the unique ID of an annotation mark. long getHandle() const; diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 1e35c6c864bb..7f833e4256ad 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -40,8 +40,8 @@ class MSOWordCommandConvertor : public MSOCommandConvertor public: MSOWordCommandConvertor(); - 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; }; MSOWordCommandConvertor::MSOWordCommandConvertor() diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index 7c4b7d7d96c0..0f84cf35bb6c 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -17,10 +17,10 @@ class Xst : public TBBase public: Xst(){} - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; OUString getString() { return sString; } #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* fp ) SAL_OVERRIDE; + virtual void Print( FILE* fp ) override; #endif }; @@ -35,9 +35,9 @@ class SwTBC : public TBBase public: SwTBC(); virtual ~SwTBC(); - 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 ImportToolBarControl( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool ); OUString GetCustomText(); @@ -61,9 +61,9 @@ class SwCTB : public TBBase public: SwCTB(); virtual ~SwCTB(); - 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 bool IsMenuToolbar(); bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& ); @@ -85,9 +85,9 @@ class TBDelta : public TBBase public: TBDelta(); virtual ~TBDelta(){} - 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 ControlIsInserted(); bool ControlDropsToolBar(); @@ -110,7 +110,7 @@ public: explicit Tcg255SubStruct( bool bReadId ); virtual ~Tcg255SubStruct(){} sal_uInt8 id() const { return ch; } - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; }; class SwCTBWrapper; @@ -130,11 +130,11 @@ class Customization : public TBBase public: explicit Customization( SwCTBWrapper* rapper ); virtual ~Customization(); - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenu( SwCTBWrapper&, CustomToolBarImportHelper& ); #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif sal_Int32 GetTBIDForTB(){ return tbidForTBD; } SwCTB* GetCustomizationData() { return customizationDataCTB.get(); }; @@ -166,13 +166,13 @@ public: virtual ~SwCTBWrapper(); void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); } SwTBC* GetTBCAtOffset( sal_uInt32 nStreamOffset ); - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; bool ImportCustomToolBar( SfxObjectShell& rDocSh ); Customization* GetCustomizaton( sal_Int16 index ); SwCTB* GetCustomizationData( const OUString& name ); #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif }; @@ -192,9 +192,9 @@ public: MCD(); MCD(const MCD&); MCD& operator = ( const MCD&); - 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 }; @@ -207,9 +207,9 @@ class PlfMcd : public Tcg255SubStruct public: explicit PlfMcd( bool bReadId = true ); - 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 }; @@ -223,9 +223,9 @@ class Acd : public TBBase public: Acd(); virtual ~Acd(){} - 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 }; @@ -239,9 +239,9 @@ class PlfAcd: public Tcg255SubStruct public: explicit PlfAcd( bool bReadId = true ); virtual ~PlfAcd(); - 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 }; @@ -260,9 +260,9 @@ class Kme : public TBBase public: Kme(); virtual ~Kme(); - 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 }; @@ -276,9 +276,9 @@ class PlfKme : public Tcg255SubStruct public: explicit PlfKme( bool bReadId = true ); virtual ~PlfKme(); - 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 }; @@ -302,9 +302,9 @@ class TcgSttbfCore : public TBBase public: TcgSttbfCore(); virtual ~TcgSttbfCore(); - 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 }; @@ -317,9 +317,9 @@ class TcgSttbf : public Tcg255SubStruct public: explicit TcgSttbf( bool bReadId = true ); virtual ~TcgSttbf(){} - 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 }; @@ -334,9 +334,9 @@ class Xstz : public TBBase public: Xstz(); virtual ~Xstz(){} - 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 }; @@ -350,9 +350,9 @@ class MacroName : public TBBase public: MacroName(); virtual ~MacroName(){} - 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 }; @@ -367,9 +367,9 @@ class MacroNames : public Tcg255SubStruct public: explicit MacroNames( bool bReadId = true ); virtual ~MacroNames(); - 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 }; @@ -383,9 +383,9 @@ class Tcg255 : public TBBase public: Tcg255(); virtual ~Tcg255(); - 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 ); }; @@ -400,10 +400,10 @@ class Tcg: public TBBase public: Tcg(); virtual ~Tcg(){} - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; bool ImportCustomToolBar( SfxObjectShell& rDocSh ); #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif }; diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index c24f8d3471e5..eedd9d83ff76 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -43,15 +43,15 @@ class SwXMLWriter : public StgWriter using StgWriter::Write; protected: - virtual sal_uLong WriteStorage() SAL_OVERRIDE; - virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ) SAL_OVERRIDE; + virtual sal_uLong WriteStorage() override; + virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ) override; public: SwXMLWriter( const OUString& rBaseURL ); virtual ~SwXMLWriter(); - virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) SAL_OVERRIDE; + virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) override; private: diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx index ddf1140fff67..3edbb4fe07e6 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -69,9 +69,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; const SvxBrushItem& GetItem() const { return *pItem; } }; diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 5deea5bd7d07..165aa1e55f87 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -87,16 +87,16 @@ class SwXMLExport : public SvXMLExport SwXMLTableInfo_Impl& rTableInfo, sal_uInt32 nHeaderRows = 0 ); - virtual void _ExportMeta() SAL_OVERRIDE; - 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 GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) SAL_OVERRIDE; - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) SAL_OVERRIDE; - virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) SAL_OVERRIDE; + virtual void _ExportMeta() 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 GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override; + virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override; + virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) override; // string constants for table cell export const OUString sNumberFormat; @@ -108,11 +108,11 @@ private: void DeleteTableLines(); protected: - virtual XMLTextParagraphExport* CreateTextParagraphExport() SAL_OVERRIDE; - virtual SvXMLAutoStylePoolP* CreateAutoStylePool() SAL_OVERRIDE; - virtual XMLPageExport* CreatePageExport() SAL_OVERRIDE; - virtual XMLShapeExport* CreateShapeExport() SAL_OVERRIDE; - virtual XMLFontAutoStylePool* CreateFontAutoStylePool() SAL_OVERRIDE; + virtual XMLTextParagraphExport* CreateTextParagraphExport() override; + virtual SvXMLAutoStylePoolP* CreateAutoStylePool() override; + virtual XMLPageExport* CreatePageExport() override; + virtual XMLShapeExport* CreateShapeExport() override; + virtual XMLFontAutoStylePool* CreateFontAutoStylePool() override; public: SwXMLExport( @@ -121,7 +121,7 @@ public: virtual ~SwXMLExport(); - 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; inline const SvXMLUnitConverter& GetTwipUnitConverter() const; @@ -136,7 +136,7 @@ public: // XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - 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; const SwDoc* getDoc() const; SwDoc* getDoc(); diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 51f0869b020f..e4ecd3e4ef41 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -263,7 +263,7 @@ class SwXMLTextStyleContext_Impl : public XMLTextStyleContext protected: - virtual uno::Reference < style::XStyle > Create() SAL_OVERRIDE; + virtual uno::Reference < style::XStyle > Create() override; public: @@ -279,9 +279,9 @@ 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; - virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; + virtual void Finish( bool bOverwrite ) override; }; TYPEINIT1( SwXMLTextStyleContext_Impl, XMLTextStyleContext ); @@ -437,7 +437,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ) SAL_OVERRIDE; + const OUString& rValue ) override; SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } @@ -453,12 +453,12 @@ public: sal_uInt16 nFamily); virtual ~SwXMLItemSetStyleContext_Impl(); - virtual void CreateAndInsert( bool bOverwrite ) SAL_OVERRIDE; + virtual void CreateAndInsert( bool bOverwrite ) override; 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; // The item set may be empty! SfxItemSet *GetItemSet() { return pItemSet; } @@ -715,17 +715,17 @@ protected: virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override; virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override; // HACK virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper( - sal_uInt16 nFamily ) const SAL_OVERRIDE; + sal_uInt16 nFamily ) const override; virtual uno::Reference < 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; // HACK public: @@ -739,9 +739,9 @@ public: bool bAuto ); virtual ~SwXMLStylesContext_Impl(); - virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; TYPEINIT1( SwXMLStylesContext_Impl, SvXMLStylesContext ); @@ -904,7 +904,7 @@ void SwXMLStylesContext_Impl::EndElement() class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext { protected: - virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override; SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } const SwXMLImport& GetSwImport() const @@ -919,7 +919,7 @@ public: const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~SwXMLMasterStylesContext_Impl(); - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; TYPEINIT1( SwXMLMasterStylesContext_Impl, XMLTextMasterStylesContext ); diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index e03657095d1b..b5df169bdfef 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -262,7 +262,7 @@ protected: const SvXMLExportPropertyMapper& rPropExp , const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap - ) const SAL_OVERRIDE; + ) const override; public: explicit SwXMLAutoStylePoolP( SvXMLExport& rExport ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index b7e771a61b0b..99d4c7a86937 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -130,7 +130,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const Reference< xml::sax::XAttributeList > & xAttrList ) override; }; SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport, @@ -175,7 +175,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const Reference< xml::sax::XAttributeList > & xAttrList ) override; }; SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport, @@ -266,7 +266,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const Reference< xml::sax::XAttributeList > & xAttrList ) override; }; SwXMLOfficeDocContext_Impl::SwXMLOfficeDocContext_Impl( @@ -327,7 +327,7 @@ public: TYPEINFO_OVERRIDE(); - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; SwXMLDocStylesContext_Impl::SwXMLDocStylesContext_Impl( diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index a95134420d72..1309e1f3fc46 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -100,11 +100,11 @@ 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; + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; - virtual XMLTextImportHelper* CreateTextImport() SAL_OVERRIDE; + virtual XMLTextImportHelper* CreateTextImport() override; - virtual XMLShapeImportHelper* CreateShapeImport() SAL_OVERRIDE; + virtual XMLShapeImportHelper* CreateShapeImport() override; public: SwXMLImport( @@ -117,16 +117,16 @@ public: virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL endDocument() - 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; // XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - 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; // 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; void InsertStyles( bool bAuto ); void FinishStyles(); @@ -176,21 +176,21 @@ public: OUString *pParent=0 ) const; virtual void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE; - 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; + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) 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; virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) SAL_OVERRIDE; + const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) override; // initialize XForms - virtual void initXForms() SAL_OVERRIDE; + virtual void initXForms() override; // get the document properties, but only if they actually need importing ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties> GetDocumentProperties() const; - virtual void NotifyEmbeddedFontRead() SAL_OVERRIDE; + virtual void NotifyEmbeddedFontRead() override; const SwDoc* getDoc() const; SwDoc* getDoc(); diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index c5f7651c347d..8984fe6184e6 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -50,7 +50,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; // This method is called from this instance implementation of // CreateChildContext if the element matches an entry in the diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 536dc949e43e..2b28b352f7df 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -75,7 +75,7 @@ public: const SfxPoolItem& rItem, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const SfxItemSet *pSet = NULL ) const SAL_OVERRIDE; + const SfxItemSet *pSet = NULL ) const override; virtual void handleElementItem( SvXMLExport& rExport, @@ -83,7 +83,7 @@ public: const SfxPoolItem& rItem, const SvXMLUnitConverter& rUnitConverter, const SfxItemSet& rSet, - SvXmlExportFlags nFlags ) const SAL_OVERRIDE; + SvXmlExportFlags nFlags ) const override; inline void SetAbsWidth( sal_uInt32 nAbs ); }; diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index ec7f0351f054..ddecdccc0c35 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -70,19 +70,19 @@ public: SfxItemSet& rSet, const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap ) SAL_OVERRIDE; + const SvXMLNamespaceMap& rNamespaceMap ) override; virtual bool handleNoItem(SvXMLItemMapEntry const& rEntry, SfxItemSet & rSet, OUString const& rValue, SvXMLUnitConverter const& rUnitConverter, - SvXMLNamespaceMap const& rNamespaceMap) SAL_OVERRIDE; + SvXMLNamespaceMap const& rNamespaceMap) override; virtual void finished(SfxItemSet & rSet, - SvXMLUnitConverter const& rUnitConverter) const SAL_OVERRIDE; + SvXMLUnitConverter const& rUnitConverter) const override; - virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) SAL_OVERRIDE; + virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) override; private: void Reset(); @@ -261,7 +261,7 @@ public: const ::uno::Reference< xml::sax::XAttributeList > & xAttrList, SfxItemSet& rItemSet, const SvXMLItemMapEntry& rEntry, - const SvXMLUnitConverter& rUnitConv ) SAL_OVERRIDE; + const SvXMLUnitConverter& rUnitConv ) override; }; SwXMLItemSetContext_Impl::SwXMLItemSetContext_Impl( diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 93d12a5811d7..189aa79645cc 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -430,8 +430,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const Reference< xml::sax::XAttributeList > & xAttrList ) override; + virtual void EndElement() override; SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; @@ -836,7 +836,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const Reference< xml::sax::XAttributeList > & xAttrList ) override; SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; @@ -893,9 +893,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const Reference< xml::sax::XAttributeList > & xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; @@ -1014,7 +1014,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const Reference< xml::sax::XAttributeList > & xAttrList ) override; SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; @@ -1074,7 +1074,7 @@ public: virtual ~SwXMLDDETableContext_Impl(); virtual void StartElement( - const Reference<xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE; + const Reference<xml::sax::XAttributeList> & xAttrList) override; OUString& GetConnectionName() { return sConnectionName; } OUString& GetDDEApplication() { return sDDEApplication; } diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 7c743bc74527..f9c781f3d885 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -146,7 +146,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; SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } @@ -183,7 +183,7 @@ public: const SwStartNode *InsertTableSection(const SwStartNode *pPrevSttNd = 0, OUString const* pStringValueStyleName = 0); - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; void SetHasSubTables( bool bNew ) { bHasSubTables = bNew; } }; diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index f5e1e35561a9..debc85c5fd6e 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -36,11 +36,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const Reference< xml::sax::XAttributeList > & xAttrList ) override; // The body element's text:global attribute can be ignored, because // we must have the correct object shell already. - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport, diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 0131f1d414b1..d64d7b14f72a 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -48,21 +48,21 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport protected: virtual void exportStyleContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE; + ::com::sun::star::style::XStyle > & rStyle ) override; virtual void _collectTextEmbeddedAutoStyles( const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; + ::com::sun::star::beans::XPropertySet > & rPropSet ) override; virtual void _exportTextEmbedded( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) SAL_OVERRIDE; + ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) override; virtual void exportTable( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > & rTextContent, - bool bAutoStyles, bool bProgress ) SAL_OVERRIDE; + bool bAutoStyles, bool bProgress ) override; public: SwXMLTextParagraphExport( diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 23e4051eab23..f753c44f33d8 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -33,7 +33,7 @@ protected: SvXMLImport& rImport, 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: SwXMLTextImportHelper( @@ -53,14 +53,14 @@ public: const OUString& rHRef, const OUString& rStyleName, const OUString& rTableName, - sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; + sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertOOoLink( SvXMLImport& rImport, const OUString& rHRef, const OUString& rStyleName, const OUString& rTableName, - sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; + sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertApplet( @@ -68,14 +68,14 @@ public: const OUString &rCode, bool bMayScript, const OUString& rHRef, - sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; + sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createAndInsertPlugin( const OUString &rMimeType, const OUString& rHRef, - sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; + sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> @@ -83,13 +83,13 @@ public: const OUString &rName, const OUString &rHRef, const OUString &rStyleName, - sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; + sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual void endAppletOrPlugin( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet, - ::std::map < const OUString, OUString > &rParamMap) SAL_OVERRIDE; + ::std::map < const OUString, OUString > &rParamMap) override; - virtual bool IsInHeaderFooter() const SAL_OVERRIDE; + virtual bool IsInHeaderFooter() const override; // redlining helper methods // (here is the real implementation) @@ -99,21 +99,21 @@ public: const OUString& rAuthor, /// name of the author const OUString& rComment, /// redline comment const ::com::sun::star::util::DateTime& rDateTime, /// date+time - bool bMergeLastPara) SAL_OVERRIDE; /// merge last paragraph + bool bMergeLastPara) override; /// merge last paragraph virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> RedlineCreateText( ::com::sun::star::uno::Reference< /// needed to get the document ::com::sun::star::text::XTextCursor> & rOldCursor, - const OUString& rId) SAL_OVERRIDE; /// ID used to RedlineAdd() call + const OUString& rId) override; /// ID used to RedlineAdd() call virtual void RedlineSetCursor( const OUString& rId, /// ID used to RedlineAdd() call bool bStart, /// start or end Cursor - bool bIsOutsideOfParagraph) SAL_OVERRIDE; - virtual void RedlineAdjustStartNodeCursor( bool bStart) SAL_OVERRIDE; - virtual void SetShowChanges( bool bShowChanges ) SAL_OVERRIDE; - virtual void SetRecordChanges( bool bRecordChanges ) SAL_OVERRIDE; + bool bIsOutsideOfParagraph) override; + virtual void RedlineAdjustStartNodeCursor( bool bStart) override; + virtual void SetShowChanges( bool bShowChanges ) override; + virtual void SetRecordChanges( bool bRecordChanges ) override; virtual void SetChangesProtectionKey( - const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) SAL_OVERRIDE; + const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) override; }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 5fdcc7913349..6ee99f411b8a 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -92,7 +92,7 @@ class SwDropCapsPict : public Control Size maTextSize; Reference< css::i18n::XBreakIterator > xBreak; - virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &rRect) override; void CheckScript(); Size CalcTextSize(); inline void InitPrinter(); @@ -118,14 +118,14 @@ public: void SetDropCapsPage(SwDropCapsPage* pPage) { mpPage = pPage; } virtual ~SwDropCapsPict(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void UpdatePaintSettings(); // also invalidates control! - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() override; + virtual Size GetOptimalSize() const override; - void SetText( const OUString& rT ) SAL_OVERRIDE; + void SetText( const OUString& rT ) override; void SetLines( sal_uInt8 nL ); void SetDistance( sal_uInt16 nD ); void SetValues( const OUString& rText, sal_uInt8 nLines, sal_uInt16 nDistance ); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 18fa4f8d7e25..a0edd7784b21 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -72,7 +72,7 @@ class SwTestAccountSettingsDialog : public SfxModalDialog public: explicit SwTestAccountSettingsDialog(SwMailConfigPage* pParent); virtual ~SwTestAccountSettingsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class SwAuthenticationSettingsDialog : public SfxModalDialog @@ -112,7 +112,7 @@ class SwAuthenticationSettingsDialog : public SfxModalDialog public: SwAuthenticationSettingsDialog(SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem); virtual ~SwAuthenticationSettingsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; SwMailConfigPage::SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ) : diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index d2affa0ceaff..2e5f5ba90c99 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -139,7 +139,7 @@ public: : SvSimpleTable(rParent, nBits) { } - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; void setColSizes(); }; diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index e1bca3a82ed0..5e74b4ebd5d1 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -87,7 +87,7 @@ class SwAddressListDialog : public SfxModalDialog public: SwAddressListDialog(SwMailMergeAddressBlockPage* pParent); virtual ~SwAddressListDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> GetSource(); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index dd7e599afe13..486fecc93b38 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -65,23 +65,23 @@ class SwAddressControl_Impl : public Control void MakeVisible(const Rectangle& aRect); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual Size GetOptimalSize() const override; using Window::SetData; public: SwAddressControl_Impl(vcl::Window* pParent , WinBits nBits ); virtual ~SwAddressControl_Impl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetData(SwCSVData& rDBData); void SetCurrentDataSet(sal_uInt32 nSet); sal_uInt32 GetCurrentDataSet() const { return m_nCurrentDataSet;} void SetCursorTo(sal_uInt32 nElement); - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; }; SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits ) : diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index d8500aa5c47a..8e291c57261e 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -76,7 +76,7 @@ public: SwCreateAddressListDialog( vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig); virtual ~SwCreateAddressListDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const OUString& GetURL() const { return m_sURL; } void Find( const OUString& rSearch, sal_Int32 nColumn); @@ -100,7 +100,7 @@ class SwFindEntryDialog : public ModelessDialog public: SwFindEntryDialog(SwCreateAddressListDialog* pParent); virtual ~SwFindEntryDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; ListBox& GetFieldsListBox() { diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index 1fae616ee4f1..c242ea43429a 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -49,7 +49,7 @@ class SwCustomizeAddressListDialog : public SfxModalDialog public: SwCustomizeAddressListDialog(vcl::Window* pParent, const SwCSVData& rOldData); virtual ~SwCustomizeAddressListDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SwCSVData* GetNewData() { return m_pNewData;} }; @@ -65,7 +65,7 @@ protected: SwAddRenameEntryDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader); virtual ~SwAddRenameEntryDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: void SetFieldName(const OUString& rName) {m_pFieldNameED->SetText(rName);} diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx index bae176de7b74..edaa78497d6c 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx @@ -39,7 +39,7 @@ public: SwDBTablePreviewDialog(vcl::Window* pParent, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rValues ); virtual ~SwDBTablePreviewDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 6cc682b2d393..e521f223a6d6 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -813,14 +813,14 @@ class SwAssignFieldsControl : public Control DECL_LINK_TYPED(MatchHdl_Impl, ListBox&, void); DECL_LINK_TYPED(GotFocusHdl_Impl, Control&, void); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; void MakeVisible( sal_Int32 nIndex ); public: SwAssignFieldsControl(vcl::Window* pParent, WinBits nBits); virtual ~SwAssignFieldsControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Init(SwMailMergeConfigItem& rConfigItem); void SetModifyHdl(const Link<LinkParamNone*,void>& rModifyHdl) @@ -828,8 +828,8 @@ public: m_aModifyHdl = rModifyHdl; m_aModifyHdl.Call(nullptr); } - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() override; + virtual Size GetOptimalSize() const override; }; VCL_BUILDER_FACTORY_ARGS(SwAssignFieldsControl, WB_BORDER) diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index bbcab6e56ab2..88e653055281 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -73,14 +73,14 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage void EnableAddressBlock(bool bAll, bool bSelective); - virtual void ActivatePage() SAL_OVERRIDE; - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; - virtual bool canAdvance() const SAL_OVERRIDE; + virtual void ActivatePage() override; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; + virtual bool canAdvance() const override; public: SwMailMergeAddressBlockPage(SwMailMergeWizard* _pParent); virtual ~SwMailMergeAddressBlockPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SwMailMergeWizard* GetWizard() { return m_pWizard; } }; @@ -108,7 +108,7 @@ class SwSelectAddressBlockDialog : public SfxModalDialog public: SwSelectAddressBlockDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfig); virtual ~SwSelectAddressBlockDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetAddressBlocks(const css::uno::Sequence< OUString>& rBlocks, sal_uInt16 nSelected); @@ -126,11 +126,11 @@ class DDListBox : public SvTreeListBox public: DDListBox(vcl::Window* pParent, const WinBits nStyle); virtual ~DDListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; }; #define MOVE_ITEM_LEFT 1 @@ -148,21 +148,21 @@ class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener using VclMultiLineEdit::SetText; protected: - bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + bool PreNotify( NotifyEvent& rNEvt ) override; public: AddressMultiLineEdit(vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER); virtual ~AddressMultiLineEdit(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; void SetSelectionChangedHdl( const Link<AddressMultiLineEdit&,void>& rLink ) {m_aSelectionLink = rLink;} - void SetText( const OUString& rStr ) SAL_OVERRIDE; + void SetText( const OUString& rStr ) override; OUString GetAddress(); void InsertNewEntry( const OUString& rStr ); @@ -234,7 +234,7 @@ private: public: SwCustomizeAddressBlockDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfig, DialogType); virtual ~SwCustomizeAddressBlockDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetAddress(const OUString& rAddress); OUString GetAddress(); @@ -266,7 +266,7 @@ public: const OUString& rPreview, bool bIsAddressBlock); virtual ~SwAssignFieldsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 410494176489..e3380550bc5f 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -47,12 +47,12 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage DECL_LINK_TYPED(DocSelectHdl, Button*, void); DECL_LINK_TYPED(FileSelectHdl, Button*, void); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; public: SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent); virtual ~SwMailMergeDocSelectPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index c54091c6730f..75472678333b 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -85,13 +85,13 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, DECL_LINK_TYPED(GreetingSelectListBoxHdl_Impl, ListBox&, void); DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); - virtual void UpdatePreview() SAL_OVERRIDE; - virtual void ActivatePage() SAL_OVERRIDE; - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual void UpdatePreview() override; + virtual void ActivatePage() override; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; public: SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent); virtual ~SwMailMergeGreetingsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; @@ -107,7 +107,7 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler public: SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* pWizard); virtual ~SwMailBodyDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetBody(const OUString& rBody ) {m_pBodyMLE->SetText(rBody);} OUString GetBody() const {return m_pBodyMLE->GetText();} diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 3becaf6d1b73..821f9666734e 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -80,12 +80,12 @@ class SwMailMergeLayoutPage : public svt::OWizardPage bool bExample); static void InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem, bool bExample); - virtual void ActivatePage() SAL_OVERRIDE; - virtual bool commitPage(::svt::WizardTypes::CommitPageReason _eReason) SAL_OVERRIDE; + virtual void ActivatePage() override; + virtual bool commitPage(::svt::WizardTypes::CommitPageReason _eReason) override; public: SwMailMergeLayoutPage( SwMailMergeWizard* _pParent); virtual ~SwMailMergeLayoutPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static SwFrameFormat* InsertAddressAndGreeting(SwView* pView, SwMailMergeConfigItem& rConfigItem, diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx index 6f3800cf6cad..510f33ded7c1 100644 --- a/sw/source/ui/dbui/mmmergepage.hxx +++ b/sw/source/ui/dbui/mmmergepage.hxx @@ -48,7 +48,7 @@ class SwMailMergeMergePage : public svt::OWizardPage public: SwMailMergeMergePage( SwMailMergeWizard* _pParent); virtual ~SwMailMergeMergePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 66de1ff635b6..92ebab67c332 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -205,7 +205,7 @@ public: get(m_pBCCED, "bcc"); } virtual ~SwCopyToDialog() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { m_pCCED.clear(); m_pBCCED.clear(); diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 8f4901b596a8..de3dfff36b4a 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -121,12 +121,12 @@ class SwMailMergeOutputPage : public svt::OWizardPage int documentEndPageNumber( int document ) const; protected: - virtual bool canAdvance() const SAL_OVERRIDE; - virtual void ActivatePage() SAL_OVERRIDE; + virtual bool canAdvance() const override; + virtual void ActivatePage() override; public: SwMailMergeOutputPage( SwMailMergeWizard* _pParent); virtual ~SwMailMergeOutputPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; @@ -188,12 +188,12 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog SAL_DLLPRIVATE void SendMails(); SAL_DLLPRIVATE void UpdateTransferStatus(); - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; public: SwSendMailDialog( vcl::Window* pParent, SwMailMergeConfigItem& ); virtual ~SwSendMailDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void AddDocument( SwMailDescriptor& rDesc ); void SetDocumentCount( sal_Int32 nAllDocuments ); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index dd458860e03c..36e20a8002ba 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -142,13 +142,13 @@ public: explicit SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg); virtual ~SwMailDispatcherListener_Impl(); - virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE; - virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE; - virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher) SAL_OVERRIDE; + virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) override; + virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) override; + virtual void idle(::rtl::Reference<MailDispatcher> xMailDispatcher) override; virtual void mailDelivered(::rtl::Reference<MailDispatcher> xMailDispatcher, - uno::Reference< mail::XMailMessage> xMailMessage) SAL_OVERRIDE; + uno::Reference< mail::XMailMessage> xMailMessage) override; virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher, - uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) SAL_OVERRIDE; + uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) override; static void DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage ); }; @@ -225,7 +225,7 @@ class SwSendWarningBox_Impl : public MessageDialog public: SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails); virtual ~SwSendWarningBox_Impl() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { m_pDetailED.clear(); MessageDialog::dispose(); diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index bc2d29f2ea59..dc755fe15696 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -40,7 +40,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage public: SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent); virtual ~SwMailMergeOutputTypePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx index 7b0fb2cbe882..f1b39f4d51d2 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hxx +++ b/sw/source/ui/dbui/mmpreparemergepage.hxx @@ -45,13 +45,13 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage DECL_LINK(MoveHdl_Impl, void*); DECL_LINK_TYPED(MoveClickHdl_Impl, Button*, void); - virtual void ActivatePage() SAL_OVERRIDE; - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual void ActivatePage() override; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; public: SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent); virtual ~SwMailMergePrepareMergePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index eb1c3d16c7d7..706bf0549637 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -47,7 +47,7 @@ class SwAddressTable : public SvSimpleTable public: SwAddressTable(SvSimpleTableContainer& rParent, WinBits nBits = 0); void InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits); - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; void setColSizes(); }; diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx index 98ea8141e004..c71aaa44667c 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hxx +++ b/sw/source/ui/dbui/selectdbtabledialog.hxx @@ -50,7 +50,7 @@ public: SwSelectDBTableDialog(vcl::Window* pParent, const css::uno::Reference<css::sdbc::XConnection>& xConnection); virtual ~SwSelectDBTableDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetSelectedTable(bool& bIsTable); void SetSelectedTable(const OUString& rTable, bool bIsTable); diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 8eb5fac680d6..d71bafffe6ba 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -53,7 +53,7 @@ public: \ explicit Class( DialogClass* p) \ : pDlg(p) \ {} \ - virtual short Execute() SAL_OVERRIDE ; + virtual short Execute() override ; #define IMPL_ABSTDLG_BASE(Class) \ short Class::Execute() \ @@ -65,30 +65,30 @@ class SwWordCountFloatDlg; class AbstractSwWordCountFloatDlg_Impl : public AbstractSwWordCountFloatDlg { DECL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl,SwWordCountFloatDlg) - virtual void UpdateCounts() SAL_OVERRIDE; - virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat) SAL_OVERRIDE; - virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual void UpdateCounts() override; + virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat) override; + virtual vcl::Window * GetWindow() override; //this method is added for return a Window type pointer }; class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg { DECL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl,SwInsertAbstractDlg) - virtual sal_uInt8 GetLevel() const SAL_OVERRIDE ; - virtual sal_uInt8 GetPara() const SAL_OVERRIDE ; + virtual sal_uInt8 GetLevel() const override ; + virtual sal_uInt8 GetPara() const override ; }; class SwAbstractSfxDialog_Impl :public SfxAbstractDialog { DECL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl,SfxModalDialog) - virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const override; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; }; class AbstractSwAsciiFilterDlg_Impl : public AbstractSwAsciiFilterDlg { DECL_ABSTDLG_BASE( AbstractSwAsciiFilterDlg_Impl,SwAsciiFilterDlg ) - virtual void FillOptions( SwAsciiOptions& rOptions ) SAL_OVERRIDE; + virtual void FillOptions( SwAsciiOptions& rOptions ) override; }; @@ -100,28 +100,28 @@ class VclAbstractDialog_Impl : public VclAbstractDialog class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg { DECL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl,SwBreakDlg) - virtual OUString GetTemplateName() SAL_OVERRIDE; - virtual sal_uInt16 GetKind() SAL_OVERRIDE; - virtual ::boost::optional<sal_uInt16> GetPageNumber() SAL_OVERRIDE; + virtual OUString GetTemplateName() override; + virtual sal_uInt16 GetKind() override; + virtual ::boost::optional<sal_uInt16> GetPageNumber() override; }; class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for { DECL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl, SwSplitTableDlg) - virtual sal_uInt16 GetSplitMode() SAL_OVERRIDE; + virtual sal_uInt16 GetSplitMode() override; }; class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( AbstractTabDialog_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; }; class AbstractApplyTabDialog_Impl : public AbstractTabDialog_Impl, virtual public SfxAbstractApplyTabDialog @@ -134,14 +134,14 @@ public: DECL_LINK_TYPED(ApplyHdl, Button*, void); private: Link<> m_aHandler; - virtual void SetApplyHdl( const Link<>& rLink ) SAL_OVERRIDE; + virtual void SetApplyHdl( const Link<>& rLink ) override; }; class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg { DECL_ABSTDLG_BASE( AbstractSwConvertTableDlg_Impl,SwConvertTableDlg) virtual void GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTableFlags, - SwTableAutoFormat const*& prTAFormat) SAL_OVERRIDE; + SwTableAutoFormat const*& prTAFormat) override; }; class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPilot @@ -150,85 +150,85 @@ class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPil virtual void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet) override; }; class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog { DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, sw::DropDownFieldDialog) - virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const SAL_OVERRIDE; //this method inherit from SystemWindow - virtual void SetWindowState( const OString& rStr ) SAL_OVERRIDE;//this method inherit from SystemWindow + virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const override; //this method inherit from SystemWindow + virtual void SetWindowState( const OString& rStr ) override;//this method inherit from SystemWindow }; class AbstractSwLabDlg_Impl : public AbstractSwLabDlg { DECL_ABSTDLG_BASE(AbstractSwLabDlg_Impl,SwLabDlg) - 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 const OUString& GetBusinessCardStr() const SAL_OVERRIDE; - virtual Printer *GetPrt() SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; + virtual const OUString& GetBusinessCardStr() const override; + virtual Printer *GetPrt() override; }; class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg { DECL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl,SwSelGlossaryDlg) - virtual void InsertGlos(const OUString &rRegion, const OUString &rGlosName) SAL_OVERRIDE; // inline - virtual sal_Int32 GetSelectedIdx() const SAL_OVERRIDE; // inline - virtual void SelectEntryPos(sal_Int32 nIdx) SAL_OVERRIDE; // inline + virtual void InsertGlos(const OUString &rRegion, const OUString &rGlosName) override; // inline + virtual sal_Int32 GetSelectedIdx() const override; // inline + virtual void SelectEntryPos(sal_Int32 nIdx) override; // inline }; class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg { DECL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl,SwAutoFormatDlg ) - virtual void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const SAL_OVERRIDE; + virtual void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const override; }; class AbstractSwFieldDlg_Impl : public AbstractSwFieldDlg { DECL_ABSTDLG_BASE(AbstractSwFieldDlg_Impl,SwFieldDlg ) - 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 Start( bool bShow = true ) SAL_OVERRIDE; //this method from SfxTabDialog - virtual void ShowReferencePage() SAL_OVERRIDE; - virtual void Initialize(SfxChildWinInfo *pInfo) SAL_OVERRIDE; - virtual void ReInitDlg() SAL_OVERRIDE; - virtual void ActivateDatabasePage() SAL_OVERRIDE; - virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; + virtual void Start( bool bShow = true ) override; //this method from SfxTabDialog + virtual void ShowReferencePage() override; + virtual void Initialize(SfxChildWinInfo *pInfo) override; + virtual void ReInitDlg() override; + virtual void ActivateDatabasePage() override; + virtual vcl::Window * GetWindow() override; //this method is added for return a Window type pointer }; class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg { DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg ) - virtual void SetForbiddenChars( const OUString& rSet ) SAL_OVERRIDE; + virtual void SetForbiddenChars( const OUString& rSet ) override; virtual void SetAlternativeAccess( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) override; }; class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg { DECL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl,SwModalRedlineAcceptDlg ) - virtual void AcceptAll( bool bAccept ) SAL_OVERRIDE; + virtual void AcceptAll( bool bAccept ) override; }; class SwGlossaryDlg; class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg { DECL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl,SwGlossaryDlg) - virtual OUString GetCurrGrpName() const SAL_OVERRIDE; - virtual OUString GetCurrShortName() const SAL_OVERRIDE; + virtual OUString GetCurrGrpName() const override; + virtual OUString GetCurrShortName() const override; }; class SwFieldInputDlg; @@ -236,21 +236,21 @@ class AbstractFieldInputDlg_Impl : public AbstractFieldInputDlg { DECL_ABSTDLG_BASE(AbstractFieldInputDlg_Impl,SwFieldInputDlg) //from class SalFrame - virtual void SetWindowState( const OString & rStr ) SAL_OVERRIDE ; - virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const SAL_OVERRIDE ; - virtual void EndDialog(long) SAL_OVERRIDE; + virtual void SetWindowState( const OString & rStr ) override ; + virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const override ; + virtual void EndDialog(long) override; }; class SwInsFootNoteDlg; class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg { DECL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl,SwInsFootNoteDlg) - virtual OUString GetFontName() SAL_OVERRIDE; - virtual bool IsEndNote() SAL_OVERRIDE; - virtual OUString GetStr() SAL_OVERRIDE; + virtual OUString GetFontName() override; + virtual bool IsEndNote() override; + virtual OUString GetStr() override; //from class Window - virtual void SetHelpId( const OString& sHelpId ) SAL_OVERRIDE; - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void SetHelpId( const OString& sHelpId ) override; + virtual void SetText( const OUString& rStr ) override; }; class SwInsTableDlg; @@ -259,86 +259,86 @@ class AbstractInsTableDlg_Impl : public AbstractInsTableDlg DECL_ABSTDLG_BASE(AbstractInsTableDlg_Impl,SwInsTableDlg) virtual void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol, SwInsertTableOptions& rInsTableFlags, OUString& rTableAutoFormatName, - SwTableAutoFormat *& prTAFormat ) SAL_OVERRIDE; + SwTableAutoFormat *& prTAFormat ) override; }; class SwJavaEditDialog; class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog { DECL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl,SwJavaEditDialog) - virtual OUString GetScriptText() const SAL_OVERRIDE; - virtual OUString GetScriptType() const SAL_OVERRIDE; - virtual bool IsUrl() const SAL_OVERRIDE; - virtual bool IsNew() const SAL_OVERRIDE; - virtual bool IsUpdate() const SAL_OVERRIDE; + virtual OUString GetScriptText() const override; + virtual OUString GetScriptType() const override; + virtual bool IsUrl() const override; + virtual bool IsNew() const override; + virtual bool IsUpdate() const override; }; class SwMailMergeDlg; class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg { DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg) - virtual DBManagerOptions GetMergeType() SAL_OVERRIDE ; - virtual const OUString& GetSaveFilter() const SAL_OVERRIDE; - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const SAL_OVERRIDE ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const SAL_OVERRIDE; - virtual bool IsSaveSingleDoc() const SAL_OVERRIDE; - virtual bool IsGenerateFromDataBase() const SAL_OVERRIDE; - virtual OUString GetColumnName() const SAL_OVERRIDE; - virtual OUString GetPath() const SAL_OVERRIDE; + virtual DBManagerOptions GetMergeType() override ; + virtual const OUString& GetSaveFilter() const override; + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const override ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const override; + virtual bool IsSaveSingleDoc() const override; + virtual bool IsGenerateFromDataBase() const override; + virtual OUString GetColumnName() const override; + virtual OUString GetPath() const override; }; class SwMailMergeCreateFromDlg; class AbstractMailMergeCreateFromDlg_Impl : public AbstractMailMergeCreateFromDlg { DECL_ABSTDLG_BASE(AbstractMailMergeCreateFromDlg_Impl,SwMailMergeCreateFromDlg) - virtual bool IsThisDocument() const SAL_OVERRIDE ; + virtual bool IsThisDocument() const override ; }; class SwMailMergeFieldConnectionsDlg; class AbstractMailMergeFieldConnectionsDlg_Impl : public AbstractMailMergeFieldConnectionsDlg { DECL_ABSTDLG_BASE(AbstractMailMergeFieldConnectionsDlg_Impl,SwMailMergeFieldConnectionsDlg) - virtual bool IsUseExistingConnections() const SAL_OVERRIDE ; + virtual bool IsUseExistingConnections() const override ; }; class SwMultiTOXTabDialog; class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog { DECL_ABSTDLG_BASE(AbstractMultiTOXTabDialog_Impl,SwMultiTOXTabDialog) - virtual CurTOXType GetCurrentTOXType() const SAL_OVERRIDE ; - virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes) SAL_OVERRIDE; + virtual CurTOXType GetCurrentTOXType() const override ; + virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes) override; //from SfxTabDialog - virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const override; }; class SwEditRegionDlg; class AbstractEditRegionDlg_Impl : public AbstractEditRegionDlg { DECL_ABSTDLG_BASE(AbstractEditRegionDlg_Impl,SwEditRegionDlg) - virtual void SelectSection(const OUString& rSectionName) SAL_OVERRIDE; + virtual void SelectSection(const OUString& rSectionName) override; }; class SwInsertSectionTabDialog; class AbstractInsertSectionTabDialog_Impl : public AbstractInsertSectionTabDialog { DECL_ABSTDLG_BASE(AbstractInsertSectionTabDialog_Impl,SwInsertSectionTabDialog) - virtual void SetSectionData(SwSectionData const& rSect) SAL_OVERRIDE; + virtual void SetSectionData(SwSectionData const& rSect) override; }; class SwIndexMarkFloatDlg; class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl,SwIndexMarkFloatDlg) - virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE; - virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual void ReInitDlg(SwWrtShell& rWrtShell) override; + virtual vcl::Window * GetWindow() override; //this method is added for return a Window type pointer }; class SwAuthMarkFloatDlg; class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl,SwAuthMarkFloatDlg) - virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE; - virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual void ReInitDlg(SwWrtShell& rWrtShell) override; + virtual vcl::Window * GetWindow() override; //this method is added for return a Window type pointer }; class SwMailMergeWizard; @@ -353,12 +353,12 @@ public: : pDlg(p) {} virtual ~AbstractMailMergeWizard_Impl(); - virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; - virtual long GetResult() SAL_OVERRIDE; + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) override; + virtual long GetResult() override; - virtual OUString GetReloadDocument() const SAL_OVERRIDE; - virtual bool ShowPage( sal_uInt16 nLevel ) SAL_OVERRIDE; - virtual sal_uInt16 GetRestartPage() const SAL_OVERRIDE; + virtual OUString GetReloadDocument() const override; + virtual bool ShowPage( sal_uInt16 nLevel ) override; + virtual sal_uInt16 GetRestartPage() const override; }; //AbstractDialogFactory_Impl implementations @@ -372,132 +372,132 @@ public: const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId - ) SAL_OVERRIDE; + ) override; virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings, - SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) SAL_OVERRIDE; - virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(vcl::Window* pParent) SAL_OVERRIDE; + SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) override; + virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(vcl::Window* pParent) override; virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( vcl::Window* pParent, SwDocShell& rDocSh, - SvStream* pStream ) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) SAL_OVERRIDE; - virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) SAL_OVERRIDE; + SvStream* pStream ) override; + virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) override; + virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) override; + virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) override; virtual SfxAbstractTabDialog * CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, - sal_uInt8 nDialogMode, const OUString* pFormatStr = 0) SAL_OVERRIDE; - virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) SAL_OVERRIDE; + sal_uInt8 nDialogMode, const OUString* pFormatStr = 0) override; + virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) override; + virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) override; virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp, - const SwDBData& rData) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; + const SwDBData& rData) override; + virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) override; virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (vcl::Window *pParent, SwWrtShell &rSh, - SwField* pField, bool bNextButton = false) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) SAL_OVERRIDE; + SwField* pField, bool bNextButton = false) override; + virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) override; virtual AbstractSwLabDlg* CreateSwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, - SwDBManager* pDBManager, bool bLabel) SAL_OVERRIDE; + SwDBManager* pDBManager, bool bLabel) override; - virtual SwLabDlgMethod GetSwLabDlgStaticMethod () SAL_OVERRIDE; + virtual SwLabDlgMethod GetSwLabDlgStaticMethod () override; virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString *pCollName = 0, bool bDraw = false, - const OString& sDefPage = OString() ) SAL_OVERRIDE; + const OString& sDefPage = OString() ) override; - virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) SAL_OVERRIDE; - virtual AbstractSplitTableDialog * CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE; + virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) override; + virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) override; + virtual AbstractSplitTableDialog * CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) override; virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, bool bSetAutoFormat = true, - const SwTableAutoFormat* pSelFormat = 0 ) SAL_OVERRIDE; - virtual SfxAbstractDialog * CreateSwBorderDlg (vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) SAL_OVERRIDE; + const SwTableAutoFormat* pSelFormat = 0 ) override; + virtual SfxAbstractDialog * CreateSwBorderDlg (vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) override; - virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) SAL_OVERRIDE; + virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) override; + virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) override; virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool, - const SfxItemSet* pItemSet, SwWrtShell* pSh) SAL_OVERRIDE; - virtual AbstractSwFieldDlg * CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) SAL_OVERRIDE; - virtual SfxAbstractDialog* CreateSwFieldEditDlg ( SwView& rVw, int nResId ) SAL_OVERRIDE; + const SfxItemSet* pItemSet, SwWrtShell* pSh) override; + virtual AbstractSwFieldDlg * CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) override; + virtual SfxAbstractDialog* CreateSwFieldEditDlg ( SwView& rVw, int nResId ) override; virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) SAL_OVERRIDE; - virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) SAL_OVERRIDE; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) override; + virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) override; - virtual VclAbstractDialog* CreateTableMergeDialog(vcl::Window* pParent, bool& rWithPrev) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateTableMergeDialog(vcl::Window* pParent, bool& rWithPrev) override; virtual SfxAbstractTabDialog* CreateFrmTabDialog( const OUString &rDialogType, SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm = true, bool bFormat = false, const OString& sDefPage = OString(), - const OUString* pFormatStr = 0) SAL_OVERRIDE; + const OUString* pFormatStr = 0) override; virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), SwWrtShell* pActShell = 0, - bool bNew = false) SAL_OVERRIDE; + bool bNew = false) override; virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, - SwWrtShell *pWrtShell) SAL_OVERRIDE; + SwWrtShell *pWrtShell) override; virtual AbstractFieldInputDlg* CreateFieldInputDlg(vcl::Window *pParent, - SwWrtShell &rSh, SwField* pField, bool bNextButton = false) SAL_OVERRIDE; + SwWrtShell &rSh, SwField* pField, bool bNextButton = false) override; virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( - vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateTitlePageDlg ( vcl::Window * pParent ) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) SAL_OVERRIDE; - virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) SAL_OVERRIDE; + vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false) override; + virtual VclAbstractDialog * CreateTitlePageDlg ( vcl::Window * pParent ) override; + virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) override; + virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) override; virtual AbstractJavaEditDialog* CreateJavaEditDialog(vcl::Window* pParent, - SwWrtShell* pWrtSh) SAL_OVERRIDE; + SwWrtShell* pWrtSh) override; virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId, vcl::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTableName, sal_Int32 nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) SAL_OVERRIDE; - virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(vcl::Window* pParent) SAL_OVERRIDE; - virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) override; + virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(vcl::Window* pParent) override; + virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) override; + virtual VclAbstractDialog* CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) override; virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId, vcl::Window* pParent, const SfxItemSet* pSwItemSet, - SwWrtShell &) SAL_OVERRIDE; + SwWrtShell &) override; virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, - bool bGlobal = false) SAL_OVERRIDE; - virtual AbstractEditRegionDlg* CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) SAL_OVERRIDE; + bool bGlobal = false) override; + virtual AbstractEditRegionDlg* CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) override; virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( - vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) SAL_OVERRIDE; + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) override; virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo, - bool bNew=true) SAL_OVERRIDE; + bool bNew=true) override; virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo, - bool bNew=true) SAL_OVERRIDE; + bool bNew=true) override; virtual VclAbstractDialog * CreateIndexMarkModalDlg( - vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) SAL_OVERRIDE; + vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) override; - virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) SAL_OVERRIDE; + virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) override; - virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc() SAL_OVERRIDE; - virtual GlossarySetActGroup SetGlossaryActGroupFunc() SAL_OVERRIDE; + virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc() override; + virtual GlossarySetActGroup SetGlossaryActGroupFunc() override; // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE; + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) override; }; diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 6d47bc314af1..5cb2ccdedb87 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -60,15 +60,15 @@ class SwEnvFormatPage : public SfxTabPage public: SwEnvFormatPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwEnvFormatPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override; void FillItem(SwEnvItem& rItem); - 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/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 5f386f7159f4..cd964ba758a0 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -59,15 +59,15 @@ class SwEnvPrtPage : public SfxTabPage public: SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwEnvPrtPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override; void FillItem(SwEnvItem& rItem); - 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; inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; } }; diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 74a50574f6b3..8ef6ed52b86a 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -54,9 +54,9 @@ class SwLabPreview : public vcl::Window SwLabItem aItem; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; public: @@ -100,15 +100,15 @@ class SwLabFormatPage : public SfxTabPage public: SwLabFormatPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwLabFormatPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override; void FillItem(SwLabItem& rItem); - 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; SwLabDlg* GetParentSwLabDlg() {return static_cast<SwLabDlg*>(GetParentDialog());} }; @@ -129,7 +129,7 @@ class SwSaveLabelDlg : public ModalDialog public: SwSaveLabelDlg(SwLabFormatPage* pParent, SwLabRec& rRec); virtual ~SwSaveLabelDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetLabel(const OUString& rMake, const OUString& rType) { diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 818273dc9f72..97a09666b857 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -54,15 +54,15 @@ class SwLabPrtPage : public SfxTabPage public: SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwLabPrtPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override; void FillItem(SwLabItem& rItem); - 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; inline Printer* GetPrt() { return pPrinter; } }; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index ab90a22431ac..8bfa3ef5ee3c 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -92,8 +92,8 @@ public: explicit SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg); virtual ~SwXSelChgLstnr_Impl(); - virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; }; SwXSelChgLstnr_Impl::SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg) : diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 7634d68ceea6..e2e8c11a82c3 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -64,15 +64,15 @@ public: SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwLabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override; void FillItem(SwLabItem& rItem); - 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; SwLabDlg* GetParentSwLabDlg() {return static_cast<SwLabDlg*>(GetParentDialog());} @@ -112,7 +112,7 @@ class SwVisitingCardPage : public SfxTabPage const OUString* pValues ); virtual ~SwVisitingCardPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using TabPage::ActivatePage; using TabPage::DeactivatePage; @@ -122,10 +122,10 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; - virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override; + virtual bool FillItemSet(SfxItemSet* rSet) override; + virtual void Reset(const SfxItemSet* rSet) override; }; class SwPrivateDataPage : public SfxTabPage @@ -157,14 +157,14 @@ class SwPrivateDataPage : public SfxTabPage public: SwPrivateDataPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwPrivateDataPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; - virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override; + virtual bool FillItemSet(SfxItemSet* rSet) override; + virtual void Reset(const SfxItemSet* rSet) override; }; class SwBusinessDataPage : public SfxTabPage @@ -194,14 +194,14 @@ class SwBusinessDataPage : public SfxTabPage public: SwBusinessDataPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwBusinessDataPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; - virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override; + virtual bool FillItemSet(SfxItemSet* rSet) override; + virtual void Reset(const SfxItemSet* rSet) override; }; #endif diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx index 42e5e568bed1..412b1e7a875f 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.hxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx @@ -24,7 +24,7 @@ class SwFieldRefTreeListBox : public SvTreeListBox { protected: - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; public: SwFieldRefTreeListBox(vcl::Window* pParent, WinBits nStyle); diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index d6813766a735..5a5a8fc2b1e4 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -66,20 +66,20 @@ class SwFieldDBPage : public SwFieldPage using SwFieldPage::SetWrtShell; protected: - virtual sal_uInt16 GetGroup() SAL_OVERRIDE; + virtual sal_uInt16 GetGroup() override; public: SwFieldDBPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFieldDBPage(); - 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; - virtual void FillUserData() SAL_OVERRIDE; + virtual void FillUserData() override; void ActivateMailMergeAddress(); void SetWrtShell(SwWrtShell& rSh); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index dd89d2d6eaf7..c1fab4302503 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -56,20 +56,20 @@ class SwFieldDokInfPage : public SwFieldPage sal_Int32 FillSelectionLB(sal_uInt16 nSubTypeId); protected: - virtual sal_uInt16 GetGroup() SAL_OVERRIDE; + virtual sal_uInt16 GetGroup() override; public: SwFieldDokInfPage(vcl::Window* pWindow, const SfxItemSet& rSet); virtual ~SwFieldDokInfPage(); - 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; - virtual void FillUserData() SAL_OVERRIDE; + virtual void FillUserData() override; }; #endif diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index bef27f832d80..d103b8f118f1 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -58,20 +58,20 @@ class SwFieldDokPage : public SwFieldPage sal_Int32 FillFormatLB(sal_uInt16 nTypeId); protected: - virtual sal_uInt16 GetGroup() SAL_OVERRIDE; + virtual sal_uInt16 GetGroup() override; public: SwFieldDokPage(vcl::Window* pWindow, const SfxItemSet& rSet); virtual ~SwFieldDokPage(); - 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; - virtual void FillUserData() SAL_OVERRIDE; + virtual void FillUserData() override; }; #endif diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index bd5abd35e63a..96ce837c8f98 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -83,20 +83,20 @@ class SwFieldFuncPage : public SwFieldPage static OUString TurnMacroString(const OUString &rMacro); protected: - virtual sal_uInt16 GetGroup() SAL_OVERRIDE; + virtual sal_uInt16 GetGroup() override; public: SwFieldFuncPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFieldFuncPage(); - 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; - virtual void FillUserData() SAL_OVERRIDE; + virtual void FillUserData() override; }; #endif diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index 1cdb472b2d5b..5bf7ed29211e 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -85,7 +85,7 @@ public: virtual ~SwFieldPage(); - virtual void ActivatePage() SAL_OVERRIDE; + virtual void ActivatePage() override; inline SwFieldMgr& GetFieldMgr() { return m_aMgr; } void SetWrtShell( SwWrtShell* m_pWrtShell ); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 3e63c48b8f25..d59d872758c7 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -73,20 +73,20 @@ class SwFieldRefPage : public SwFieldPage void SaveSelectedTextNode(); protected: - virtual sal_uInt16 GetGroup() SAL_OVERRIDE; + virtual sal_uInt16 GetGroup() override; public: SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFieldRefPage(); - 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; - virtual void FillUserData() SAL_OVERRIDE; + virtual void FillUserData() override; }; #endif diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index d4b9ea176a84..435fef91c259 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -37,7 +37,7 @@ class SelectionListBox : public ListBox { bool bCallAddSelection; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: SelectionListBox(vcl::Window* pParent, WinBits nStyle); @@ -88,20 +88,20 @@ class SwFieldVarPage : public SwFieldPage sal_Int32 FillFormatLB(sal_uInt16 nTypeId); protected: - virtual sal_uInt16 GetGroup() SAL_OVERRIDE; + virtual sal_uInt16 GetGroup() override; public: SwFieldVarPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFieldVarPage(); - 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; - virtual void FillUserData() SAL_OVERRIDE; + virtual void FillUserData() override; }; #endif diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 9e3fee8cf273..f20bbbb70b39 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -67,8 +67,8 @@ public: SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV, const OUString& rSeqFieldType ); virtual ~SwSequenceOptionDialog(); - virtual void dispose() SAL_OVERRIDE; - virtual void Apply() SAL_OVERRIDE; + virtual void dispose() override; + virtual void Apply() override; bool IsApplyBorderAndShadow() { return m_pApplyBorderAndShadowCB->IsChecked(); } void SetApplyBorderAndShadow( bool bSet ) { m_pApplyBorderAndShadowCB->Check(bSet); } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 0416f1e8e49c..eeaa6ef8f822 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -168,26 +168,26 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base void SetModified() {bModified = true;} protected: - virtual bool SeekRow( long nRow ) SAL_OVERRIDE; - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const SAL_OVERRIDE; - virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) SAL_OVERRIDE; - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) SAL_OVERRIDE; - virtual bool SaveModified() SAL_OVERRIDE; + virtual bool SeekRow( long nRow ) override; + virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const override; + virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) override; + virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) override; + virtual bool SaveModified() override; std::vector<long> GetOptimalColWidths() const; public: SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pBuilder); virtual ~SwEntryBrowseBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ReadEntries(SvStream& rInStr); void WriteEntries(SvStream& rOutStr); - bool IsModified()const SAL_OVERRIDE; + bool IsModified()const override; - virtual OUString GetCellText( long nRow, sal_uInt16 nColumn ) const SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual OUString GetCellText( long nRow, sal_uInt16 nColumn ) const override; + virtual void Resize() override; + virtual Size GetOptimalSize() const override; }; class SwAutoMarkDlg_Impl : public ModalDialog @@ -205,7 +205,7 @@ public: SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL, bool bCreate); virtual ~SwAutoMarkDlg_Impl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; @@ -539,9 +539,9 @@ class SwIndexTreeLB : public SvSimpleTable { public: SwIndexTreeLB(SvSimpleTableContainer& rParent, WinBits nBits = 0); - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Resize() override; + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) override; void setColSizes(); }; @@ -645,7 +645,7 @@ class SwAddStylesDlg_Impl : public SfxModalDialog public: SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]); virtual ~SwAddStylesDlg_Impl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent, @@ -1541,10 +1541,10 @@ public: { } virtual ~SwTOXEdit() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE { m_pParent.clear(); Edit::dispose(); } + virtual void dispose() override { m_pParent.clear(); Edit::dispose(); } - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; bool IsNextControl() const {return bNextControl;} void SetPrevNextLink( const Link<SwTOXEdit&,void>& rLink ) {aPrevNextControlLink = rLink;} @@ -1628,10 +1628,10 @@ public: { } virtual ~SwTOXButton() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE { m_pParent.clear(); PushButton::dispose(); } + virtual void dispose() override { m_pParent.clear(); PushButton::dispose(); } - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; bool IsNextControl() const {return bNextControl;} void SetPrevNextLink(const Link<SwTOXButton&,void>& rLink) {aPrevNextControlLink = rLink;} diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index af83e4a621ab..c537d83a7ab0 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -565,7 +565,7 @@ class SwNewUserIdxDlg : public ModalDialog m_pNameED->GrabFocus(); } virtual ~SwNewUserIdxDlg() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { m_pOKPB.clear(); m_pNameED.clear(); @@ -1003,7 +1003,7 @@ public: bool bNewEntry, bool bCreate); virtual ~SwCreateAuthEntryDlg_Impl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetEntryText(ToxAuthorityField eField) const; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 41ddb5a73564..95cecccec87b 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -132,7 +132,7 @@ public: const OUString& rOldName, const OUString& rOldShort ); virtual ~SwNewGlosNameDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetNewName() const { return m_pNewName->GetText(); } OUString GetNewShort() const { return m_pNewShort->GetText(); } diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 272b6b9861aa..da9aef788044 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -70,11 +70,11 @@ public: SwEndNoteOptionPage( vcl::Window *pParent, bool bEndNote, const SfxItemSet &rSet ); virtual ~SwEndNoteOptionPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); - virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) override; + virtual void Reset( const SfxItemSet* ) override; void SetShell( SwWrtShell &rShell ); }; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 3b2c69655067..b44a714553e8 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -70,7 +70,7 @@ class SwNumNamesDlg : public ModalDialog public: explicit SwNumNamesDlg(vcl::Window *pParent); virtual ~SwNumNamesDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetUserNames(const OUString *pList[]); OUString GetName() const { return m_pFormEdit->GetText(); } sal_Int32 GetCurEntryPos() const { return m_pFormBox->GetSelectEntryPos(); } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index b01135358ccd..a0b297db58f1 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -49,15 +49,15 @@ class AutoFormatPreview : public vcl::Window public: AutoFormatPreview(vcl::Window* pParent, WinBits nStyle); virtual ~AutoFormatPreview(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void NotifyChange( const SwTableAutoFormat& rNewData ); void DetectRTL(SwWrtShell* pWrtShell); - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; private: SwTableAutoFormat aCurData; @@ -103,7 +103,7 @@ public: SwStringInputDlg(vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault ); virtual ~SwStringInputDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetInputString() const; diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx index 0d1f2bb2d4e8..2e2182b15b37 100644 --- a/sw/source/ui/uno/swdetect.hxx +++ b/sw/source/ui/uno/swdetect.hxx @@ -58,12 +58,12 @@ public: virtual ~SwFilterDetect(); /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XExtendedFilterDetect - virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index 3c4180d587b0..7b1e825e3d9d 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -36,16 +36,16 @@ public: virtual ~SwVbaAddin(); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInstalled( sal_Bool _installed ) 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& _name ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInstalled( sal_Bool _installed ) 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_SW_SOURCE_UI_VBA_VBAADDIN_HXX diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx index 0d6ecb20e414..f6a8908ee009 100644 --- a/sw/source/ui/vba/vbaaddins.hxx +++ b/sw/source/ui/vba/vbaaddins.hxx @@ -32,13 +32,13 @@ public: virtual ~SwVbaAddins() {} // 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; // SwVbaAddins_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAADDINS_HXX diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 6b67c816b7f1..afbdea1a714f 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -40,27 +40,27 @@ public: virtual ~SwVbaApplication(); // XApplication - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() 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 Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() 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 Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) 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; 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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAAPPLICATION_HXX diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index c753c995a20e..abffe439738a 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -38,11 +38,11 @@ public: virtual ~SwVbaAutoTextEntry(); // XAutoTextEntry - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) 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; }; typedef CollTestImplHelper< ooo::vba::word::XAutoTextEntries > SwVbaAutoTextEntries_BASE; @@ -57,13 +57,13 @@ public: virtual ~SwVbaAutoTextEntries() {} // 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; // SwVbaAutoTextEntries_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAAUTOTEXTENTRY_HXX diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index a1065d5ade99..2df51ac65a11 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -43,15 +43,15 @@ public: virtual ~SwVbaBookmark(); // Methods - virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& ) 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 Select() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Range() 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& ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL Range() 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_SW_SOURCE_UI_VBA_VBABOOKMARK_HXX diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index a8c16150e4b9..9af6c7c17f73 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -36,7 +36,7 @@ class BookmarksEnumeration : public EnumerationHelperImpl public: BookmarksEnumeration( 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 ), mxModel( 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< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); OUString aName = xNamed->getName(); @@ -59,20 +59,20 @@ public: mxNameAccess.set( mxIndexAccess, uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxIndexAccess->getElementType(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxIndexAccess->hasElements(); } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return mxIndexAccess->getElementType(); } + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return mxIndexAccess->hasElements(); } // 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 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 { return mxNameAccess->getElementNames(); } - 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 { if( mxNameAccess->hasByName( aName ) ) { @@ -95,11 +95,11 @@ public: return sal_False; } // 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 mxIndexAccess->getCount(); } - 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 { return mxIndexAccess->getByIndex( Index ); } diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx index 3aad9114591d..7f217834480d 100644 --- a/sw/source/ui/vba/vbabookmarks.hxx +++ b/sw/source/ui/vba/vbabookmarks.hxx @@ -46,22 +46,22 @@ public: static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) 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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaBookmarks_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; // XBookmarks - virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBABOOKMARKS_HXX diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 29f75238621f..e1c8ed18bddd 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -134,12 +134,12 @@ private: } protected: - virtual OUString getServiceImplName() SAL_OVERRIDE + virtual OUString getServiceImplName() override { return OUString("SwVbaBorder"); } - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE + virtual css::uno::Sequence<OUString> getServiceNames() override { static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) @@ -152,7 +152,7 @@ protected: public: SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, VbaPalette& rPalette) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} - uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) override { sal_Int32 nLineStyle = word::WdLineStyle::wdLineStyleNone; table::BorderLine aBorderLine; @@ -173,7 +173,7 @@ public: } return uno::makeAny( nLineStyle ); } - 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 word line styles @@ -253,11 +253,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 SAL_N_ELEMENTS( supportedIndexTable ); } - 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 ); @@ -268,11 +268,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<word::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; } @@ -290,12 +290,12 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) 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/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx index 020aec2549f5..b54a6c9e05de 100644 --- a/sw/source/ui/vba/vbaborders.hxx +++ b/sw/source/ui/vba/vbaborders.hxx @@ -30,24 +30,24 @@ class VbaPalette; class SwVbaBorders : public SwVbaBorders_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; css::uno::Reference< css::beans::XPropertySet > m_xProps; public: SwVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, VbaPalette& rPalette ); virtual ~SwVbaBorders() {} // 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; // SwVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override; - virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException, std::exception) override; - 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_SW_SOURCE_UI_VBA_VBABORDERS_HXX diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx index a71b2dc54bbc..62f667866448 100644 --- a/sw/source/ui/vba/vbacell.hxx +++ b/sw/source/ui/vba/vbacell.hxx @@ -37,20 +37,20 @@ public: virtual ~SwVbaCell(); // Attributes - virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) override; // Methods - virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) 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_SW_SOURCE_UI_VBA_VBACELL_HXX diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 9aedd85fb486..31d2adbb8435 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -35,12 +35,12 @@ public: explicit CellsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( 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 < mxIndexAccess->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 < mxIndexAccess->getCount() ) { @@ -68,11 +68,11 @@ public: } virtual ~CellCollectionHelper() {} - 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 ( mnRight - mnLeft + 1 ) * ( mnBottom - mnTop + 1 ); } - 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 css::lang::IndexOutOfBoundsException(); @@ -88,16 +88,16 @@ public: throw css::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<word::XCell>::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; } // 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 CellsEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx index d1c5912f397a..b78a7b4e9f22 100644 --- a/sw/source/ui/vba/vbacells.hxx +++ b/sw/source/ui/vba/vbacells.hxx @@ -38,25 +38,25 @@ public: virtual ~SwVbaCells() {} // Attributes - virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) override; // Methods - virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaCells_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBACELLS_HXX diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx index 75c5ec2388c5..d3c9f2e4122a 100644 --- a/sw/source/ui/vba/vbacolumn.hxx +++ b/sw/source/ui/vba/vbacolumn.hxx @@ -39,15 +39,15 @@ public: virtual ~SwVbaColumn(); // Methods - virtual sal_Int32 SAL_CALL getWidth() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getWidth() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) override; static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw (css::uno::RuntimeException); // 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_SW_SOURCE_UI_VBA_VBACOLUMN_HXX diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index edf01b0668b4..ca2369ef88f5 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -41,12 +41,12 @@ public: { mxIndexAccess.set( mxTextTable->getColumns(), uno::UNO_QUERY ); } - 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 < mxIndexAccess->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 < mxIndexAccess->getCount() ) { diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx index 65f73d5786dc..1b236ed4e918 100644 --- a/sw/source/ui/vba/vbacolumns.hxx +++ b/sw/source/ui/vba/vbacolumns.hxx @@ -44,21 +44,21 @@ public: SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw ( css::uno::RuntimeException ); virtual ~SwVbaColumns() {} - virtual sal_Int32 SAL_CALL getWidth( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getWidth( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) override; //XCollection - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::lang::IndexOutOfBoundsException, 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& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ) 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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaColumns_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBACOLUMNS_HXX diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx index 3cb546fefc5a..e14156224352 100644 --- a/sw/source/ui/vba/vbadialog.hxx +++ b/sw/source/ui/vba/vbadialog.hxx @@ -33,10 +33,10 @@ public: virtual ~SwVbaDialog() {} // 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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADIALOG_HXX diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx index 981101e856e0..1649bd0b9b90 100644 --- a/sw/source/ui/vba/vbadialogs.hxx +++ b/sw/source/ui/vba/vbadialogs.hxx @@ -35,11 +35,11 @@ public: virtual ~SwVbaDialogs() {} // 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_SW_SOURCE_UI_VBA_VBADIALOGS_HXX diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx index a00c5f3320ba..1a1fd589a3dc 100644 --- a/sw/source/ui/vba/vbadocument.hxx +++ b/sw/source/ui/vba/vbadocument.hxx @@ -42,54 +42,54 @@ public: virtual ~SwVbaDocument(); // XDocument - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) - throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) 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 Sections( 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 css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL TablesOfContents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL FormFields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getProtectionType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setProtectionType( ::sal_Int32 _protectiontype ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setUpdateStylesOnOpen( sal_Bool _updatestylesonopen ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoHyphenation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoHyphenation( sal_Bool _autohyphenation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getHyphenationZone() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) 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 Sections( 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 css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL TablesOfContents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL FormFields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getProtectionType() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setProtectionType( ::sal_Int32 _protectiontype ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setUpdateStylesOnOpen( sal_Bool _updatestylesonopen ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoHyphenation() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoHyphenation( sal_Bool _autohyphenation ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getHyphenationZone() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (css::uno::RuntimeException, std::exception) override; using VbaDocumentBase::Protect; - virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL PrintPreview( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ClosePrintPreview( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL PrintPreview( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ClosePrintPreview( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex ) 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; // 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_SW_SOURCE_UI_VBA_VBADOCUMENT_HXX diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 3089499527ec..4629ceb9a615 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -87,7 +87,7 @@ public: explicit BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) { } - virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE + virtual uno::Any getPropertyValue( const OUString& rPropName ) override { if ( rPropName == "EditingDuration" ) { @@ -148,7 +148,7 @@ public: return getUserDefinedProperties()->getPropertyValue(rPropName); } } - virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) SAL_OVERRIDE + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) override { if ("EditingDuration" == rPropName) { @@ -268,12 +268,12 @@ public: explicit CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel ) { } - virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE + virtual uno::Any getPropertyValue( const OUString& rPropName ) override { return getUserDefinedProperties()->getPropertyValue(rPropName); } virtual void setPropertyValue( - const OUString& rPropName, const uno::Any& rValue) SAL_OVERRIDE + const OUString& rPropName, const uno::Any& rValue) override { return getUserDefinedProperties()->setPropertyValue(rPropName, rValue); } @@ -289,7 +289,7 @@ public: mxModelProps.set( m_xModel, uno::UNO_QUERY_THROW ); mpDocShell = word::getDocShell( xModel ); } - virtual uno::Any getPropertyValue( const OUString& rPropName ) SAL_OVERRIDE + virtual uno::Any getPropertyValue( const OUString& rPropName ) override { try { @@ -334,7 +334,7 @@ public: return aReturn; } - virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) SAL_OVERRIDE + virtual void setPropertyValue( const OUString& rPropName, const uno::Any& aValue ) override { uno::Sequence< beans::NamedValue > stats( m_xDocProps->getDocumentStatistics()); @@ -448,22 +448,22 @@ protected: public: SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ); // XDocumentProperty - virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; //XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Value"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) override { return OUString("Value"); } // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; + virtual uno::Sequence<OUString> getServiceNames() override; }; class SwVbaCustomDocumentProperty : public SwVbaBuiltInDocumentProperty @@ -472,14 +472,14 @@ public: SwVbaCustomDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ); - virtual sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override; }; @@ -645,11 +645,11 @@ class DocPropEnumeration : public ::cppu::WeakImplHelper< com::sun::star::contai public: explicit DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.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 != mDocProps.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(); @@ -681,11 +681,11 @@ protected: } } // 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 mDocProps.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) override { // correct the correct by the base class for 1 based indices DocProps::iterator it = mDocProps.find( ++Index ); @@ -693,7 +693,7 @@ protected: throw lang::IndexOutOfBoundsException(); return uno::makeAny( it->second ); } - 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(); @@ -701,7 +701,7 @@ protected: return uno::Any( it->second ); } - 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 > aNames( getCount() ); OUString* pName = aNames.getArray(); @@ -711,7 +711,7 @@ protected: return aNames; } - 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 { DocPropsByName::iterator it = mNamedDocProps.find( aName ); if ( it == mNamedDocProps.end() ) @@ -719,15 +719,15 @@ protected: return sal_True; } // 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<XDocumentProperty>::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 !mDocProps.empty(); } - 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 DocPropEnumeration( mDocProps ); } @@ -800,12 +800,12 @@ public: uno::UNO_SET_THROW); }; // 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 mxUserDefinedProp->getPropertySetInfo()->getProperties().getLength(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) SAL_OVERRIDE + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) override { uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); if ( Index >= aProps.getLength() ) @@ -815,7 +815,7 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - 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(); @@ -824,7 +824,7 @@ public: return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) ); } - 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< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties(); uno::Sequence< OUString > aNames( aProps.getLength() ); @@ -836,24 +836,24 @@ public: return aNames; } - 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_TRACE("hasByName(%s) returns %d", OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) ); return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ); } // 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<XDocumentProperty>::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; } - 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 { // create a map of properties ( the key doesn't matter ) OSL_TRACE("Creating an enumeration"); diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index 7619eb3e813d..a16beddbfc87 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -33,16 +33,16 @@ public: SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) 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::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; // 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; }; class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties @@ -50,9 +50,9 @@ class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties public: SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XDocumentProperties - virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; // XHelperInterface - virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual OUString getServiceImplName() override; }; #endif /* SW_VBA_DOCUMENTPROPERTY_HXX */ diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 7f2973dc0196..82d16828b88a 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -66,7 +66,7 @@ class DocumentEnumImpl : public EnumerationHelperImpl public: DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), 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 { uno::Reference< text::XTextDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return getDocument( m_xContext, xDoc, m_aApplication ); diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index 80ddaf0f9d49..a74fd03b2ccd 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -35,18 +35,18 @@ public: virtual ~SwVbaDocuments() {} // 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; // SwVbaDocuments_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; // Methods - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx index dfe01124b875..7b946a68ac43 100644 --- a/sw/source/ui/vba/vbaeventshelper.hxx +++ b/sw/source/ui/vba/vbaeventshelper.hxx @@ -31,10 +31,10 @@ public: virtual ~SwVbaEventsHelper(); 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) 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) 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) 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) override; }; #endif diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 4e3e07805482..5d3e4f8c69a2 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -237,11 +237,11 @@ public: FieldEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< container::XEnumeration >& xEnumeration ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxEnumeration( 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 mxEnumeration->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 { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -263,10 +263,10 @@ public: mxEnumerationAccess.set( xSupp->getTextFields(), uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxEnumerationAccess->getElementType(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxEnumerationAccess->hasElements(); } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return mxEnumerationAccess->getElementType(); } + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return mxEnumerationAccess->hasElements(); } // 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 { uno::Reference< container::XEnumeration > xEnumeration = mxEnumerationAccess->createEnumeration(); sal_Int32 nCount = 0; @@ -277,7 +277,7 @@ public: } return nCount; } - 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(); @@ -295,7 +295,7 @@ public: throw lang::IndexOutOfBoundsException(); } // 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 { uno::Reference< container::XEnumeration > xEnumeration = mxEnumerationAccess->createEnumeration(); return uno::Reference< container::XEnumeration >( new FieldEnumeration( mxParent, mxContext, mxModel, xEnumeration ) ); diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 991e97f88cbc..5e9abd0fa8d5 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -34,10 +34,10 @@ class SwVbaField : public SwVbaField_BASE public: SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException); - virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL Update() 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; }; typedef CollTestImplHelper< ov::word::XFields > SwVbaFields_BASE; @@ -54,17 +54,17 @@ private: public: SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); // XFields - virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL Update() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL Update() throw (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::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; // 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/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index ff7a8ef7d8ac..54ec7a46af2d 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -57,36 +57,36 @@ public: virtual ~SwVbaFind(); // 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::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setForward( sal_Bool _forward ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getWrap() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFormat( sal_Bool _format ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMatchCase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMatchCase( sal_Bool _matchcase ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMatchWholeWord() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMatchWholeWord( sal_Bool _matchwholeword ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMatchWildcards() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMatchWildcards( sal_Bool _matchwildcards ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMatchSoundsLike() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMatchSoundsLike( sal_Bool _matchsoundslike ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMatchAllWordForms() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMatchAllWordForms( sal_Bool _matchallwordforms ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getStyle() throw (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 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::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setForward( sal_Bool _forward ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getWrap() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getFormat() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormat( sal_Bool _format ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getMatchCase() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMatchCase( sal_Bool _matchcase ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getMatchWholeWord() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMatchWholeWord( sal_Bool _matchwholeword ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getMatchWildcards() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMatchWildcards( sal_Bool _matchwildcards ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getMatchSoundsLike() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMatchSoundsLike( sal_Bool _matchsoundslike ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getMatchAllWordForms() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMatchAllWordForms( sal_Bool _matchallwordforms ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception) override; // Methods - virtual sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ClearFormatting( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ClearFormatting( ) 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_SW_SOURCE_UI_VBA_VBAFIND_HXX diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx index 0b2fc34916ad..21d4e79b332c 100644 --- a/sw/source/ui/vba/vbafont.hxx +++ b/sw/source/ui/vba/vbafont.hxx @@ -33,20 +33,20 @@ public: virtual ~SwVbaFont(){} // Attributes - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getColorIndex() 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 getSubscript() 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 setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getColorIndex() 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 getSubscript() throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getSuperscript() throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getBold() 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 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 getBold() 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 getStrikethrough() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getShadow() 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/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx index 1936d3d0a7b9..2e7a2603fc78 100644 --- a/sw/source/ui/vba/vbaframe.hxx +++ b/sw/source/ui/vba/vbaframe.hxx @@ -36,11 +36,11 @@ public: virtual ~SwVbaFrame(); // Methods - virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL Select() 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_SW_SOURCE_UI_VBA_VBAFRAME_HXX diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index 494e78782b53..9d26468b21a8 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -39,12 +39,12 @@ public: FramesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : mxParent( xParent ), mxContext( xContext), mxIndexAccess( xIndexAccess ), mxModel( xModel ), nCurrentPos(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 ( nCurrentPos < mxIndexAccess->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 ( !hasMoreElements() ) throw container::NoSuchElementException(); diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx index fb3f3b06c78a..950e0b437d93 100644 --- a/sw/source/ui/vba/vbaframes.hxx +++ b/sw/source/ui/vba/vbaframes.hxx @@ -37,13 +37,13 @@ public: virtual ~SwVbaFrames() {} // 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; // SwVbaFrames_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; }; diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 376a1a9a90ef..95abcf3d570a 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -46,24 +46,24 @@ public: virtual ~SwVbaGlobals(); // XGlobals - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() 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 Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() 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 Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) 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 // INCLUDED_SW_SOURCE_UI_VBA_VBAGLOBALS_HXX diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx index 6a51f4b38b03..29e28a97dda1 100644 --- a/sw/source/ui/vba/vbaheaderfooter.hxx +++ b/sw/source/ui/vba/vbaheaderfooter.hxx @@ -38,15 +38,15 @@ public: virtual ~SwVbaHeaderFooter(){} // Attributes - virtual sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getLinkToPrevious() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLinkToPrevious( sal_Bool _linktoprevious ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() 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 sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getLinkToPrevious() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLinkToPrevious( sal_Bool _linktoprevious ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() 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; // 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_SW_SOURCE_UI_VBA_VBAHEADERFOOTER_HXX diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index 97d860b96b6f..b53e91630e28 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -39,22 +39,22 @@ public: virtual ~HeadersFootersIndexAccess(){} // 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 { // first page, evenpages and primary page return 3; } - 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 < 1 || Index > 3 ) throw lang::IndexOutOfBoundsException(); return uno::makeAny( uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( mxParent, mxContext, mxModel, mxPageStyleProps, mbHeader, Index ) ) ); } - 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<word::XHeaderFooter>::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; } @@ -66,12 +66,12 @@ class HeadersFootersEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit HeadersFootersEnumWrapper( SwVbaHeadersFooters* _pHeadersFooters ) : pHeadersFooters( _pHeadersFooters ), 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 < pHeadersFooters->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 < pHeadersFooters->getCount() ) return pHeadersFooters->Item( uno::makeAny( ++nIndex ), uno::Any() ); diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx index 3f4de951b94e..32d839b9264d 100644 --- a/sw/source/ui/vba/vbaheadersfooters.hxx +++ b/sw/source/ui/vba/vbaheadersfooters.hxx @@ -36,16 +36,16 @@ public: SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader ); virtual ~SwVbaHeadersFooters() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& ) throw (css::lang::IndexOutOfBoundsException, 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& Index1, const css::uno::Any& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) 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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaHeadersFooters_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAHEADERSFOOTERS_HXX diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index a3d73502bdc5..5d07d5ff87ee 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -37,12 +37,12 @@ public: virtual ~SwVbaListFormat(); // Methods - virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ConvertNumbersToText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ConvertNumbersToText( ) 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_SW_SOURCE_UI_VBA_VBALISTFORMAT_HXX diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index c0aa120b8aaa..dac186307a90 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -29,12 +29,12 @@ class ListGalleriesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit ListGalleriesEnumWrapper( SwVbaListGalleries* pGalleries ) : pListGalleries( pGalleries ), nIndex( 1 ) {} - 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 <= pListGalleries->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 <= pListGalleries->getCount() ) return pListGalleries->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx index 175176336217..5880b9f0db3e 100644 --- a/sw/source/ui/vba/vbalistgalleries.hxx +++ b/sw/source/ui/vba/vbalistgalleries.hxx @@ -35,16 +35,16 @@ public: SwVbaListGalleries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc ) throw (css::uno::RuntimeException); virtual ~SwVbaListGalleries() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) 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& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) 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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaListGalleries_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTGALLERIES_HXX diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index a7707fcb5d79..8a04fe1fdd06 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -36,11 +36,11 @@ public: virtual ~SwVbaListGallery(); // Methods - virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ListTemplates( 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_SW_SOURCE_UI_VBA_VBALISTGALLERY_HXX diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index 35c6fdb5e347..aa3f2bccaf32 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -37,33 +37,33 @@ public: virtual ~SwVbaListLevel(); // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setNumberStyle( ::sal_Int32 _numberstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getResetOnHigher() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setResetOnHigher( ::sal_Int32 _resetonhigher ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getStartAt() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStartAt( ::sal_Int32 _startat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getTabPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTabPosition( float _tabposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getTextPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTextPosition( float _textposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getTrailingCharacter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNumberStyle( ::sal_Int32 _numberstyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getResetOnHigher() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setResetOnHigher( ::sal_Int32 _resetonhigher ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getStartAt() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStartAt( ::sal_Int32 _startat ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getTabPosition() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTabPosition( float _tabposition ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getTextPosition() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTextPosition( float _textposition ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getTrailingCharacter() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) 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_SW_SOURCE_UI_VBA_VBALISTLEVEL_HXX diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index dd565e429c11..5eecac7abadd 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -29,12 +29,12 @@ class ListLevelsEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit ListLevelsEnumWrapper( SwVbaListLevels* pLevels ) : pListLevels( pLevels ), nIndex( 1 ) {} - 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 <= pListLevels->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 <= pListLevels->getCount() ) return pListLevels->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index 7b50c2a61298..2aef24812fc9 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -35,16 +35,16 @@ public: SwVbaListLevels( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef pHelper ) throw ( css::uno::RuntimeException ); virtual ~SwVbaListLevels() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) 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& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) 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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaListLevels_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTLEVELS_HXX diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index 309546739fe9..de1744068283 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -38,11 +38,11 @@ public: void applyListTemplate( css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException ); // Methods - virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ListLevels( 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_SW_SOURCE_UI_VBA_VBALISTTEMPLATE_HXX diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index c9449c2c3bb4..6cf196afd338 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -28,12 +28,12 @@ class ListTemplatesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit ListTemplatesEnumWrapper( SwVbaListTemplates* pTemplates ) : pListTemplates( pTemplates ), nIndex( 1 ) {} - 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 <= pListTemplates->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 <= pListTemplates->getCount() ) return pListTemplates->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx index f2a4e78d1b6f..fcea9c4a158f 100644 --- a/sw/source/ui/vba/vbalisttemplates.hxx +++ b/sw/source/ui/vba/vbalisttemplates.hxx @@ -36,16 +36,16 @@ public: SwVbaListTemplates( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw (css::uno::RuntimeException); virtual ~SwVbaListTemplates() {} - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) 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& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) 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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaListTemplates_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBALISTTEMPLATES_HXX diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx index 68a32a5e090e..c3124b5eea4a 100644 --- a/sw/source/ui/vba/vbaoptions.hxx +++ b/sw/source/ui/vba/vbaoptions.hxx @@ -36,44 +36,44 @@ public: virtual ~SwVbaOptions(); // Attributes - virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getReplaceSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setReplaceSelection( sal_Bool _replaceselection ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMapPaperSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMapPaperSize( sal_Bool _mappapersize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( sal_Bool _autoformatasyoutypeapplyheadings ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( sal_Bool _autoformatasyoutypedefinestyles ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoFormatApplyHeadings() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoFormatApplyHeadings( sal_Bool _autoformatapplyheadings ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoFormatApplyLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoFormatApplyLists( sal_Bool _autoformatapplylists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutoFormatApplyBulletedLists( sal_Bool _autoformatapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getReplaceSelection() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReplaceSelection( sal_Bool _replaceselection ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getMapPaperSize() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMapPaperSize( sal_Bool _mappapersize ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( sal_Bool _autoformatasyoutypeapplyheadings ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( sal_Bool _autoformatasyoutypedefinestyles ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoFormatApplyHeadings() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoFormatApplyHeadings( sal_Bool _autoformatapplyheadings ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoFormatApplyLists() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoFormatApplyLists( sal_Bool _autoformatapplylists ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoFormatApplyBulletedLists( sal_Bool _autoformatapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) override; // Methods virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) - throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; //PropListener - virtual void setValueEvent( const css::uno::Any& value ) SAL_OVERRIDE; - virtual css::uno::Any getValueEvent() SAL_OVERRIDE; + virtual void setValueEvent( const css::uno::Any& value ) override; + virtual css::uno::Any getValueEvent() 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_SW_SOURCE_UI_VBA_VBAOPTIONS_HXX diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx index d1cffb20429c..13889ff663dd 100644 --- a/sw/source/ui/vba/vbapagesetup.hxx +++ b/sw/source/ui/vba/vbapagesetup.hxx @@ -41,20 +41,20 @@ public: virtual ~SwVbaPageSetup(){} // Attributes - virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setGutter( double _gutter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getHeaderDistance() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHeaderDistance( double _headerdistance ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getFooterDistance() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFooterDistance( double _footerdistance ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getSectionStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setGutter( double _gutter ) throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getHeaderDistance() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHeaderDistance( double _headerdistance ) throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getFooterDistance() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFooterDistance( double _footerdistance ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getSectionStart() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) 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/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index da3a62de9081..7f8659050108 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -57,12 +57,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 SAL_N_ELEMENTS(ColorTable); } - 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(); @@ -70,11 +70,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/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx index 6ec4a180eb98..1c14443b69f2 100644 --- a/sw/source/ui/vba/vbapane.hxx +++ b/sw/source/ui/vba/vbapane.hxx @@ -35,12 +35,12 @@ public: virtual ~SwVbaPane(); // Methods - virtual css::uno::Any SAL_CALL View( ) 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 View( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Close( ) 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_SW_SOURCE_UI_VBA_VBAPANE_HXX diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index c79b09da247e..21603675ced2 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -36,21 +36,21 @@ public: virtual ~PanesIndexAccess(){} // 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 1; } - 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 != 1 ) throw lang::IndexOutOfBoundsException(); return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) ); } - 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<word::XPane>::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; } @@ -62,12 +62,12 @@ class PanesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit PanesEnumWrapper( 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/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx index 00030ac9decc..79c05f509b4a 100644 --- a/sw/source/ui/vba/vbapanes.hxx +++ b/sw/source/ui/vba/vbapanes.hxx @@ -37,13 +37,13 @@ public: virtual ~SwVbaPanes() {} // 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; // SwVbaPanes_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAPANES_HXX diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index eeef8b630e3a..3ebca1b28d50 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -90,10 +90,10 @@ public: { } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<text::XTextRange>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<text::XTextRange>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return sal_True; } // 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 { sal_Int32 nCount = 0; uno::Reference< container::XEnumeration > xParEnum = getEnumeration(); @@ -107,7 +107,7 @@ public: } return nCount; } - 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 < getCount() ) { @@ -127,7 +127,7 @@ public: throw lang::IndexOutOfBoundsException(); } // 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 getEnumeration(); } diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index 713c4213cb13..224c8e4dd081 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -39,13 +39,13 @@ public: virtual ~SwVbaParagraph(); // XParagraph - virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getStyle() throw ( 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< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getStyle() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setStyle( const css::uno::Any& style ) 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; }; typedef CollTestImplHelper< ooo::vba::word::XParagraphs > SwVbaParagraphs_BASE; @@ -59,13 +59,13 @@ public: virtual ~SwVbaParagraphs() {} // 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; // SwVbaParagraphs_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAPARAGRAPH_HXX diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index 229b3336ff18..75a56658808a 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -46,42 +46,42 @@ public: virtual ~SwVbaParagraphFormat(); // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getFirstLineIndent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getKeepTogether() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getKeepWithNext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getHyphenation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getLineSpacing() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLineSpacing( float _linespacing ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getLineSpacingRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getNoLineNumber() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getOutlineLevel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getPageBreakBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getSpaceBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSpaceBefore( float _spacebefore ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getSpaceAfter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSpaceAfter( float _spaceafter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getLeftIndent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLeftIndent( float _leftindent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getRightIndent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setRightIndent( float _rightindent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getTabStops() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getWidowControl() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getFirstLineIndent() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getKeepTogether() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getKeepWithNext() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getHyphenation() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getLineSpacing() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLineSpacing( float _linespacing ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getLineSpacingRule() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getNoLineNumber() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getOutlineLevel() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPageBreakBefore() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getSpaceBefore() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSpaceBefore( float _spacebefore ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getSpaceAfter() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSpaceAfter( float _spaceafter ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getLeftIndent() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLeftIndent( float _leftindent ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getRightIndent() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRightIndent( float _rightindent ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getTabStops() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWidowControl() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) 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_SW_SOURCE_UI_VBA_VBAPARAGRAPHFORMAT_HXX diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx index 8174ced2928e..83cb2c641751 100644 --- a/sw/source/ui/vba/vbarange.hxx +++ b/sw/source/ui/vba/vbarange.hxx @@ -48,44 +48,44 @@ public: virtual ~SwVbaRange(); css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; } - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException, std::exception) override; css::uno::Reference< css::text::XText > getXText() const { return mxText; } void setXTextCursor( const css::uno::Reference< css::text::XTextCursor >& xTextCursor ) { mxTextCursor = xTextCursor; } // Attribute - 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 css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) 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& rText ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XListFormat > SAL_CALL getListFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XListFormat > SAL_CALL getListFormat() throw (css::uno::RuntimeException, std::exception) override; // Methods virtual void SAL_CALL InsertBreak(const css::uno::Any& _breakType) throw (css::script::BasicErrorException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getLanguageID() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getLanguageID() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) 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_SW_SOURCE_UI_VBA_VBARANGE_HXX diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx index 07bacb192413..f4b278c1fe2d 100644 --- a/sw/source/ui/vba/vbareplacement.hxx +++ b/sw/source/ui/vba/vbareplacement.hxx @@ -35,15 +35,15 @@ public: virtual ~SwVbaReplacement(); // 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 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; //Methods - virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClearFormatting() 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_SW_SOURCE_UI_VBA_VBAREPLACEMENT_HXX diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx index 02d23bbb3a9c..56fb3d5ad34b 100644 --- a/sw/source/ui/vba/vbarevision.hxx +++ b/sw/source/ui/vba/vbarevision.hxx @@ -38,12 +38,12 @@ public: virtual ~SwVbaRevision(); // Methods - virtual void SAL_CALL Accept( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Reject( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Accept( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Reject( ) 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_SW_SOURCE_UI_VBA_VBAREVISION_HXX diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index 9a4213809c48..4d5c5344ac27 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -33,11 +33,11 @@ class RedlinesEnumeration : public ::cppu::WeakImplHelper< container::XEnumerati RevisionMap::iterator mIt; public: explicit RedlinesEnumeration( const RevisionMap& sMap ) : mRevisionMap( sMap ), mIt( mRevisionMap.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 != mRevisionMap.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(); @@ -54,11 +54,11 @@ public: RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw (uno::RuntimeException); // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<beans::XPropertySet>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( !mRevisionMap.empty() ); } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<beans::XPropertySet>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return ( !mRevisionMap.empty() ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mRevisionMap.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 mRevisionMap.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(); @@ -67,7 +67,7 @@ RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const u } // 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 RedlinesEnumeration( mRevisionMap ); } @@ -95,7 +95,7 @@ class RevisionsEnumeration : public EnumerationHelperImpl public: RevisionsEnumeration( 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< beans::XPropertySet > xRevision( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XRevision > ( new SwVbaRevision( m_xParent, m_xContext, m_xModel, xRevision ) ) ); diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index 78bf3c8bbd0e..51f4b4a9a0d7 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -38,17 +38,17 @@ public: virtual ~SwVbaRevisions() {} // Methods - virtual void SAL_CALL AcceptAll( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL RejectAll( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL AcceptAll( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL RejectAll( ) throw (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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaRevisions_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx index d268db275865..23a2b43cb8a4 100644 --- a/sw/source/ui/vba/vbarow.hxx +++ b/sw/source/ui/vba/vbarow.hxx @@ -39,20 +39,20 @@ public: virtual ~SwVbaRow(); // Attributes - virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) override; // Methods - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) override; static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw (css::uno::RuntimeException); // 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_SW_SOURCE_UI_VBA_VBAROW_HXX diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index 12847907e1a6..b0d338384650 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -43,12 +43,12 @@ public: { mxIndexAccess.set( mxTextTable->getRows(), uno::UNO_QUERY ); } - 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 < mxIndexAccess->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 < mxIndexAccess->getCount() ) { diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx index 80cb70fa3ae7..e59760e70688 100644 --- a/sw/source/ui/vba/vbarows.hxx +++ b/sw/source/ui/vba/vbarows.hxx @@ -48,29 +48,29 @@ public: virtual ~SwVbaRows() {} // Attributes - virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getAllowBreakAcrossPages() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAllowBreakAcrossPages( const css::uno::Any& _allowbreakacrosspages ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getSpaceBetweenColumns() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSpaceBetweenColumns( float _spacebetweencolumns ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getAllowBreakAcrossPages() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllowBreakAcrossPages( const css::uno::Any& _allowbreakacrosspages ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getSpaceBetweenColumns() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSpaceBetweenColumns( float _spacebetweencolumns ) 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 SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) 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 Delete( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) override; //XCollection - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::lang::IndexOutOfBoundsException, 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& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) 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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaRows_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAROWS_HXX diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx index 0d66fecea2cf..34fe69998fb2 100644 --- a/sw/source/ui/vba/vbasection.hxx +++ b/sw/source/ui/vba/vbasection.hxx @@ -35,17 +35,17 @@ public: virtual ~SwVbaSection(); // Attributes - virtual sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setProtectedForForms( sal_Bool _protectedforforms ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setProtectedForForms( sal_Bool _protectedforforms ) throw (css::uno::RuntimeException, std::exception) override; // Methods - virtual css::uno::Any SAL_CALL Headers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Footers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Headers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Footers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL PageSetup( ) 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_SW_SOURCE_UI_VBA_VBASECTION_HXX diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index 843029cd804d..d9bc9e4b3b6c 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -37,12 +37,12 @@ class SectionEnumeration : public ::cppu::WeakImplHelper< container::XEnumeratio public: explicit SectionEnumeration( const XSectionVec& rVec ) : mxSections( rVec ), mIt( mxSections.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 != mxSections.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() ) return uno::makeAny( *mIt++ ); @@ -91,11 +91,11 @@ public: virtual ~SectionCollectionHelper(){} // 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 mxSections.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 css::lang::IndexOutOfBoundsException(); @@ -103,16 +103,16 @@ public: uno::Reference< beans::XPropertySet > xPageProps( mxSections[ Index ], uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent, mxContext, mxModel, xPageProps ) ) ); } - 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<word::XSection>::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; } // 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 SectionEnumeration( mxSections ); } @@ -124,7 +124,7 @@ class SectionsEnumWrapper : public EnumerationHelperImpl public: SectionsEnumWrapper( 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 ), mxModel( 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< beans::XPropertySet > xPageProps( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XSection > ( new SwVbaSection( m_xParent, m_xContext, mxModel, xPageProps ) ) ); diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx index 5864933d498e..a952c96493d6 100644 --- a/sw/source/ui/vba/vbasections.hxx +++ b/sw/source/ui/vba/vbasections.hxx @@ -39,15 +39,15 @@ public: virtual ~SwVbaSections() {} // 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; - virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) override; // SwVbaSections_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBASECTIONS_HXX diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index abfb9e77d791..0c41aa3c1c90 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -55,61 +55,61 @@ public: virtual ~SwVbaSelection(); // Attribute - 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 css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL TypeBackspace() 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& rText ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL TypeBackspace() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name ) - throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL ShapeRange( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL SelectRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL SelectColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Cells( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Copy( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL CopyAsPicture( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Paste( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL WholeStory( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL ShapeRange( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SelectRow() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SelectColumn() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Cells( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Copy( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL CopyAsPicture( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Paste( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL WholeStory( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL SplitTable() throw (css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) 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_SW_SOURCE_UI_VBA_VBASELECTION_HXX diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index a4865956447b..6fd5615f7fdc 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -44,29 +44,29 @@ public: static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) 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< ooo::vba::word::XFont > SAL_CALL getFont() 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& _namelocal ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setAutomaticallyUpdate( sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getBaseStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBaseStyle( const css::uno::Any& _basestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getNextParagraphStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setNextParagraphStyle( const css::uno::Any& _nextparagraphstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getListLevelNumber() 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& Name ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() 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& _namelocal ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutomaticallyUpdate( sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getBaseStyle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBaseStyle( const css::uno::Any& _basestyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getNextParagraphStyle() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNextParagraphStyle( const css::uno::Any& _nextparagraphstyle ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getListLevelNumber() throw (css::uno::RuntimeException, std::exception) override; //XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Name"); } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Name"); } // 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 //SW_VBA_AXIS_HXX diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 21194a26d667..5d58b2225a6a 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -174,20 +174,20 @@ public: mxParaStyles.set( xStyleFamilies->getByName("ParagraphStyles"), uno::UNO_QUERY_THROW ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<style::XStyle>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return getCount() > 0; } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<style::XStyle>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return getCount() > 0; } // 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 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 { return mxParaStyles->getElementNames(); } - 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 { // search in the MSOStyleName table first for( const MSOStyleNameTable* pTable = aMSOStyleNameTable; pTable->pMSOStyleName != NULL; pTable++ ) @@ -227,12 +227,12 @@ 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 { uno::Reference< container::XIndexAccess > xIndexAccess( mxParaStyles, uno::UNO_QUERY_THROW ); return xIndexAccess->getCount(); } - 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(); @@ -241,7 +241,7 @@ public: return xIndexAccess->getByIndex( Index ); } // 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 { throw uno::RuntimeException("Not implemented" ); } @@ -253,12 +253,12 @@ class StylesEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit StylesEnumWrapper( SwVbaStyles* _pStyles ) : pStyles( _pStyles ), nIndex( 1 ) {} - 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 <= pStyles->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 <= pStyles->getCount() ) return pStyles->Item( uno::makeAny( nIndex++ ), uno::Any() ); diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx index 78b85ab3de26..07897774a887 100644 --- a/sw/source/ui/vba/vbastyles.hxx +++ b/sw/source/ui/vba/vbastyles.hxx @@ -33,14 +33,14 @@ public: 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; + css::uno::RuntimeException) 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/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx index bab6ad5f5835..23f83b1cbd5e 100644 --- a/sw/source/ui/vba/vbasystem.hxx +++ b/sw/source/ui/vba/vbasystem.hxx @@ -37,8 +37,8 @@ public: void Initialize( const OUString& rFileName, const OString& rGroupName, const OString& rKey ); //PropListener - virtual void setValueEvent( const css::uno::Any& value ) SAL_OVERRIDE; - virtual css::uno::Any getValueEvent() SAL_OVERRIDE; + virtual void setValueEvent( const css::uno::Any& value ) override; + virtual css::uno::Any getValueEvent() override; }; class SwVbaSystem : public SwVbaSystem_BASE @@ -51,13 +51,13 @@ public: virtual ~SwVbaSystem(); // XSystem - 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 css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( css::uno::RuntimeException, std::exception ) SAL_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 css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) 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_SW_SOURCE_UI_VBA_VBASYSTEM_HXX diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index 90e778af942a..a9571015565e 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -33,17 +33,17 @@ class SwVbaTable : public SwVbaTable_BASE css::uno::Reference< css::text::XTextTable > mxTextTable; public: SwVbaTable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextTable >& xTextTable) throw ( css::uno::RuntimeException); - virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Select( ) 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 OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) 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/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx index d15deb2544ca..0c1e7af19ee9 100644 --- a/sw/source/ui/vba/vbatableofcontents.hxx +++ b/sw/source/ui/vba/vbatableofcontents.hxx @@ -38,22 +38,22 @@ public: virtual ~SwVbaTableOfContents(); // Attributes - virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getTabLeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTabLeader( ::sal_Int32 _tableader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getUseFields() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setUseFields( sal_Bool _useFields ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setUseOutlineLevels( sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getTabLeader() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTabLeader( ::sal_Int32 _tableader ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getUseFields() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setUseFields( sal_Bool _useFields ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setUseOutlineLevels( sal_Bool _useOutlineLevels ) 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 Update( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Update( ) 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_SW_SOURCE_UI_VBA_VBATABLEOFCONTENTS_HXX diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 8bb0bc7bbdb6..162b169300d4 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -82,11 +82,11 @@ public: cachePos = mxTables.begin(); } // 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 mxTables.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(); @@ -94,17 +94,17 @@ public: return uno::makeAny( xTable ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<text::XTextTable>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return getCount() > 0 ; } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<text::XTextTable>::get(); } + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return getCount() > 0 ; } // 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(); uno::Reference< text::XTextTable > xTable( *cachePos, uno::UNO_QUERY_THROW ); return uno::makeAny( xTable ); } - 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( mxTables.size() ); OUString* pString = sNames.getArray(); @@ -117,7 +117,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 = mxTables.begin(); XTextTableVec::iterator it_end = mxTables.end(); @@ -142,11 +142,11 @@ public: TableEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxParent( xParent ), mxContext( xContext ), mxDocument( xDocument ), mxIndexAccess( xIndexAccess ), mnCurIndex(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 ( mnCurIndex < mxIndexAccess->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 ( !hasMoreElements() ) throw container::NoSuchElementException(); diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index 6c78571ebe70..45aba199a4ef 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -31,16 +31,16 @@ class SwVbaTables : public SwVbaTables_BASE public: SwVbaTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); // XTables - virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) 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::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; // 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/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index cfb68febf6ab..37877a3f3460 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -36,12 +36,12 @@ public: explicit TablesOfContentsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( 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 < mxIndexAccess->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 < mxIndexAccess->getCount() ) { @@ -78,11 +78,11 @@ public: virtual ~TableOfContentsCollectionHelper() {} - 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 maToc.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(); @@ -90,16 +90,16 @@ public: uno::Reference< text::XDocumentIndex > xToc( maToc[Index], uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< word::XTableOfContents >( new SwVbaTableOfContents( mxParent, mxContext, mxTextDocument, xToc ) ) ); } - 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<word::XTableOfContents>::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; } // 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 TablesOfContentsEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx index 94eba25a16fb..cc0de8ae240e 100644 --- a/sw/source/ui/vba/vbatablesofcontents.hxx +++ b/sw/source/ui/vba/vbatablesofcontents.hxx @@ -38,16 +38,16 @@ public: virtual ~SwVbaTablesOfContents() {} // Methods - virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) throw (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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaTablesOfContents_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATABLESOFCONTENTS_HXX diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index 48d87dadbe51..857b55e498c1 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -36,8 +36,8 @@ public: virtual ~SwVbaTabStop(); // 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_SW_SOURCE_UI_VBA_VBATABSTOP_HXX diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index 3c1f1737c837..8315b16087ee 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -47,12 +47,12 @@ public: explicit TabStopsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( 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 < mxIndexAccess->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 < mxIndexAccess->getCount() ) { @@ -79,11 +79,11 @@ public: virtual ~TabStopCollectionHelper() {} - 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 maTabStops.getLength(); } - 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 css::lang::IndexOutOfBoundsException(); @@ -91,16 +91,16 @@ public: const style::TabStop* pTabs = maTabStops.getConstArray(); return uno::makeAny( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext, mxParaProps, pTabs[ Index ] ) ) ); } - 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<word::XTabStop>::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; } // 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 TabStopsEnumWrapper( this ); } diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx index e1f6692a9893..9ae33daf20ec 100644 --- a/sw/source/ui/vba/vbatabstops.hxx +++ b/sw/source/ui/vba/vbatabstops.hxx @@ -41,17 +41,17 @@ public: virtual css::uno::Reference< ::ooo::vba::word::XTabStop > SAL_CALL Add( float Position, const css::uno::Any& Alignment, const css::uno::Any& Leader ) throw (css::script::BasicErrorException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ClearAll( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual void SAL_CALL ClearAll( ) throw (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::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override; // SwVbaTabStops_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; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBATABSTOPS_HXX diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index 6d8ca14b88bf..f5637675406b 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -35,12 +35,12 @@ public: virtual ~SwVbaTemplate(); // XTemplate - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL AutoTextEntries( 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_SW_SOURCE_UI_VBA_VBATEMPLATE_HXX diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx index 4a7cb454eb67..7c4fadeaa153 100644 --- a/sw/source/ui/vba/vbavariable.hxx +++ b/sw/source/ui/vba/vbavariable.hxx @@ -37,15 +37,15 @@ public: virtual ~SwVbaVariable(); // XVariable - virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getIndex() 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& ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getIndex() 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_SW_SOURCE_UI_VBA_VBAVARIABLE_HXX diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx index 443bbad436c4..d17c505933d9 100644 --- a/sw/source/ui/vba/vbavariables.hxx +++ b/sw/source/ui/vba/vbavariables.hxx @@ -38,16 +38,16 @@ public: virtual ~SwVbaVariables() {} // 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; // SwVbaVariables_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; // XVariables - virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAVARIABLES_HXX diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx index 30f29b961585..3e19ca026754 100644 --- a/sw/source/ui/vba/vbaview.hxx +++ b/sw/source/ui/vba/vbaview.hxx @@ -43,18 +43,18 @@ public: virtual ~SwVbaView(); // XView - virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setTableGridLines( sal_Bool _tablegridlines ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTableGridLines( sal_Bool _tablegridlines ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setType( ::sal_Int32 _type ) 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_SW_SOURCE_UI_VBA_VBAVIEW_HXX diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx index 4263cfbdd6b4..5b9f02b9690d 100644 --- a/sw/source/ui/vba/vbawindow.hxx +++ b/sw/source/ui/vba/vbawindow.hxx @@ -38,18 +38,18 @@ public: throw (css::uno::RuntimeException); // Attributes - 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::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 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::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; // Methods - 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& RouteDocument ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException, std::exception) SAL_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& RouteDocument ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL ActivePane() 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_SW_SOURCE_UI_VBA_VBAWINDOW_HXX diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx index 2d925f1d20b5..749dad582521 100644 --- a/sw/source/ui/vba/vbawrapformat.hxx +++ b/sw/source/ui/vba/vbawrapformat.hxx @@ -41,21 +41,21 @@ private: public: SwVbaWrapFormat( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); - virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getSide() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSide( ::sal_Int32 _side ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getDistanceTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDistanceTop( float _distancetop ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getDistanceBottom() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDistanceBottom( float _distancebottom ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getDistanceLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDistanceLeft( float _distanceleft ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual OUString getServiceImplName() SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getSide() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSide( ::sal_Int32 _side ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getDistanceTop() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDistanceTop( float _distancetop ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getDistanceBottom() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDistanceBottom( float _distancebottom ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getDistanceLeft() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDistanceLeft( float _distanceleft ) throw (css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException, std::exception) override; + + virtual OUString getServiceImplName() override; + virtual css::uno::Sequence<OUString> getServiceNames() override; }; #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAWRAPFORMAT_HXX diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx index 1995bf3c0d66..78b859bc9203 100644 --- a/sw/source/uibase/config/StoredChapterNumbering.cxx +++ b/sw/source/uibase/config/StoredChapterNumbering.cxx @@ -72,7 +72,7 @@ public: // XNamed virtual OUString SAL_CALL getName() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (uno::RuntimeException, std::exception) override { SolarMutexGuard g; SwNumRulesWithName const* pRules(m_rNumRules.GetRules(m_nIndex)); @@ -84,7 +84,7 @@ public: } virtual void SAL_CALL setName(OUString const& rName) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (uno::RuntimeException, std::exception) override { SolarMutexGuard g; SwNumRulesWithName *const pRules(GetOrCreateRules()); @@ -93,27 +93,27 @@ public: // XElementAccess virtual uno::Type SAL_CALL getElementType() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + 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 + throw (uno::RuntimeException, std::exception) override { return sal_True; } // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (uno::RuntimeException, std::exception) override { return MAXLEVEL; } virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::RuntimeException, std::exception) override { if (nIndex < 0 || MAXLEVEL <= nIndex) throw lang::IndexOutOfBoundsException(); @@ -144,7 +144,7 @@ public: sal_Int32 nIndex, uno::Any const& rElement) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { if (nIndex < 0 || MAXLEVEL <= nIndex) throw lang::IndexOutOfBoundsException(); @@ -189,9 +189,9 @@ public: GetXMLToken(XML_N_SVG), XML_NAMESPACE_SVG); } - virtual void _ExportAutoStyles() SAL_OVERRIDE {} - virtual void _ExportMasterStyles() SAL_OVERRIDE {} - virtual void _ExportContent() SAL_OVERRIDE {} + virtual void _ExportAutoStyles() override {} + virtual void _ExportMasterStyles() override {} + virtual void _ExportContent() override {} void ExportRule(SvxXMLNumRuleExport & rExport, uno::Reference<container::XIndexReplace> const& xRule) @@ -338,7 +338,7 @@ public: { } - virtual void EndElement() SAL_OVERRIDE + virtual void EndElement() override { assert(m_Contexts.size() < SwChapterNumRules::nMaxRules); for (auto iter = m_Contexts.begin(); iter != m_Contexts.end(); ++iter) @@ -355,7 +355,7 @@ public: virtual SvXMLImportContext * CreateChildContext( sal_uInt16 const nPrefix, OUString const& rLocalName, - uno::Reference<xml::sax::XAttributeList> const& xAttrList) SAL_OVERRIDE + uno::Reference<xml::sax::XAttributeList> const& xAttrList) override { if (XML_NAMESPACE_TEXT == nPrefix && IsXMLToken(rLocalName, XML_OUTLINE_STYLE)) { @@ -397,7 +397,7 @@ public: virtual SvXMLImportContext * CreateContext( sal_uInt16 const nPrefix, OUString const& rLocalName, - uno::Reference<xml::sax::XAttributeList> const& xAttrList) SAL_OVERRIDE + uno::Reference<xml::sax::XAttributeList> const& xAttrList) override { if (XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken(rLocalName, XML_STYLES)) { diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index b166e2530ecf..92f929e5d2b1 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -194,7 +194,7 @@ class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper private: SwDBManager * m_pDBManager; - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override; public: explicit SwConnectionDisposedListener_Impl(SwDBManager& rMgr); @@ -213,10 +213,10 @@ class SwDataSourceRemovedListener : public cppu::WeakImplHelper<sdb::XDatabaseRe public: explicit SwDataSourceRemovedListener(SwDBManager& rDBManager); virtual ~SwDataSourceRemovedListener(); - virtual void SAL_CALL registeredDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL revokedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL changedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(const lang::EventObject& rObject) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registeredDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL revokedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const lang::EventObject& rObject) throw (uno::RuntimeException, std::exception) override; void Dispose(); }; diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index cd48b83fb21c..65b098c86090 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -83,10 +83,10 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper < XContainerListener > } virtual ~SwDBTreeList_Impl(); - virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; bool HasContext(); SwWrtShell* GetWrtShell() { return m_pWrtShell;} diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 9b90b1c4c4d8..c1141ed612e3 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -154,13 +154,13 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem static const Sequence< OUString>& GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwMailMergeConfigItem_Impl(); virtual ~SwMailMergeConfigItem_Impl(); - 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; const Sequence< OUString> GetAddressBlocks(bool bConvertToConfig = false) const; void SetAddressBlocks( diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 255523c5b44f..eda6c25fe60b 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -172,8 +172,8 @@ public: SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh ); virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; - virtual void Closed() SAL_OVERRIDE; + const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; + virtual void Closed() override; bool WriteData( SvStream& rStrm ); diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index c16fc7db8b28..1e0157434940 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -53,7 +53,7 @@ private: protected: virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition( - const drawinglayer::geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + const drawinglayer::geometry::ViewInformation2D& rViewInformation) const override; public: AnchorPrimitive( const basegfx::B2DPolygon& rTriangle, @@ -85,7 +85,7 @@ public: bool getShadow() const { return mbShadow; } bool getLineSolid() const { return mbLineSolid; } - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const override; DeclPrimitive2DIDBlock() }; diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx index fdcdbd3ff8ae..5c9d611d88ef 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx @@ -100,7 +100,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition void implResetGeometry(); // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; private: // object's geometry diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx index a7c1df80a11f..c9466d75708e 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx @@ -33,15 +33,15 @@ class AnnotationMenuButton : public MenuButton public: AnnotationMenuButton( sw::sidebarwindows::SwSidebarWin& rSidebarWin ); virtual ~AnnotationMenuButton(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // override MenuButton methods - virtual void Select() SAL_OVERRIDE; + virtual void Select() override; // override vcl::Window methods - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void KeyInput( const KeyEvent& rKeyEvt ) override; private: sw::sidebarwindows::SwSidebarWin& mrSidebarWin; diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx index 7cdb8721cae5..521e0a78d033 100644 --- a/sw/source/uibase/docvw/OverlayRanges.hxx +++ b/sw/source/uibase/docvw/OverlayRanges.hxx @@ -40,7 +40,7 @@ namespace sw bool mbShowSolidBorder; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; public: static OverlayRanges* CreateOverlayRange( diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 9d6d1d2419d8..7ea5db098421 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -64,9 +64,9 @@ namespace SwDashedLine( pParent, pColorFn ), m_pWin( pWin ) {}; virtual ~SwBreakDashedLine() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE { m_pWin.clear(); SwDashedLine::dispose(); } + virtual void dispose() override { m_pWin.clear(); SwDashedLine::dispose(); } - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; }; void SwBreakDashedLine::MouseMove( const MouseEvent& rMEvt ) diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 6cb20d81c44c..bfe146a685f5 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1197,7 +1197,7 @@ public: class IsPostitField : public FilterFunctor { public: - bool operator()(const SwFormatField* pField) const SAL_OVERRIDE + bool operator()(const SwFormatField* pField) const override { return pField->GetField()->GetTyp()->Which() == RES_POSTITFLD; } @@ -1211,7 +1211,7 @@ public: : m_sAuthor(rAuthor) { } - bool operator()(const SwFormatField* pField) const SAL_OVERRIDE + bool operator()(const SwFormatField* pField) const override { if (pField->GetField()->GetTyp()->Which() != RES_POSTITFLD) return false; @@ -1234,7 +1234,7 @@ class FieldDocWatchingStack : public SfxListener SwDocShell& m_rDocShell; FilterFunctor& m_rFilter; - virtual void Notify(SfxBroadcaster&, const SfxHint& rHint) SAL_OVERRIDE + virtual void Notify(SfxBroadcaster&, const SfxHint& rHint) override { const SwFormatFieldHint* pHint = dynamic_cast<const SwFormatFieldHint*>(&rHint); if (pHint) diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx index fe60589ad40d..8ac92cb2d2a7 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx @@ -45,7 +45,7 @@ private: protected: virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition( - const drawinglayer::geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + const drawinglayer::geometry::ViewInformation2D& rViewInformation) const override; public: ShadowPrimitive( @@ -63,7 +63,7 @@ public: const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } ShadowState getShadowState() const { return maShadowState; } - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const override; DeclPrimitive2DIDBlock() }; diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx index 08d5314f9551..c42e1a67c2e6 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx @@ -37,7 +37,7 @@ class ShadowOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition { protected: // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override; private: basegfx::B2DPoint maSecondPosition; diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx index 99992b432e89..b5878feb73ba 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.hxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx @@ -39,16 +39,16 @@ class SidebarTextControl : public Control SwPostItMgr& mrPostItMgr; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKeyEvt ) 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 Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void RequestHelp(const HelpEvent &rEvt) SAL_OVERRIDE; - virtual OUString GetSurroundingText() const SAL_OVERRIDE; - virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void KeyInput( const KeyEvent& rKeyEvt ) 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 LoseFocus() override; + virtual void RequestHelp(const HelpEvent &rEvt) override; + virtual OUString GetSurroundingText() const override; + virtual Selection GetSurroundingTextSelection() const override; DECL_LINK_TYPED( Select, Menu*, bool ); @@ -58,17 +58,17 @@ class SidebarTextControl : public Control SwView& rDocView, SwPostItMgr& rPostItMgr ); virtual ~SidebarTextControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; OutlinerView* GetTextView() const; DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void ); - 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 Draw(OutputDevice* pDev, const Point&, const Size&, DrawFlags) SAL_OVERRIDE; + virtual void Draw(OutputDevice* pDev, const Point&, const Size&, DrawFlags) override; }; } } // end of namespace sw::sidebarwindows diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index c3fe249a3b61..87d29901c130 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -46,15 +46,15 @@ class SidebarTextEditSource : public SvxEditSource, explicit SidebarTextEditSource(SidebarTextControl& rSidebarTextControl); virtual ~SidebarTextEditSource(); - virtual SvxEditSource* Clone() const SAL_OVERRIDE; + virtual SvxEditSource* Clone() const override; - virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; - virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; - virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() override; + virtual SvxViewForwarder* GetViewForwarder() override; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) override; - virtual void UpdateData() SAL_OVERRIDE; + virtual void UpdateData() override; - virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE; + virtual SfxBroadcaster& GetBroadcaster() const override; DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); private: @@ -132,24 +132,24 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent 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 i ) - 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 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; 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; protected: - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; private: SidebarTextControl& mrSidebarTextControl; diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx index f123aae842d3..2c80887eaff6 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx @@ -33,7 +33,7 @@ class SidebarTextControlAccessible : public VCLXWindow virtual ~SidebarTextControlAccessible(); virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext > - CreateAccessibleContext() SAL_OVERRIDE; + CreateAccessibleContext() override; private: SidebarTextControl& mrSidebarTextControl; diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx index 6462c1b6d75a..842489ede79f 100644 --- a/sw/source/uibase/docvw/SidebarWinAcc.cxx +++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx @@ -54,7 +54,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent } virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getAccessibleParent() throw (css::uno::RuntimeException, std::exception) override { osl::MutexGuard aGuard(maMutex); @@ -69,7 +69,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent return xAccParent; } - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx b/sw/source/uibase/docvw/SidebarWinAcc.hxx index a07fac7811e8..321a9a14f63a 100644 --- a/sw/source/uibase/docvw/SidebarWinAcc.hxx +++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx @@ -39,7 +39,7 @@ class SidebarWinAccessible : public VCLXWindow virtual ~SidebarWinAccessible(); virtual com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext > - CreateAccessibleContext() SAL_OVERRIDE; + CreateAccessibleContext() override; void ChangeSidebarItem( const SwSidebarItem& rSidebarItem ); diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index a5db5cb80a82..19048587803d 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -219,7 +219,7 @@ private: virtual ~ChangesListener() {} virtual void SAL_CALL disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { osl::MutexGuard g(editor_.mutex_); editor_.notifier_.clear(); @@ -227,7 +227,7 @@ private: virtual void SAL_CALL propertiesChange( css::uno::Sequence< css::beans::PropertyChangeEvent > const &) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { SolarMutexGuard g; editor_.SetFont(); diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx index 42367941edf9..07d9a0e1bb8b 100644 --- a/sw/source/uibase/inc/DashedLine.hxx +++ b/sw/source/uibase/inc/DashedLine.hxx @@ -22,7 +22,7 @@ public: SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ); virtual ~SwDashedLine( ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; }; #endif diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx index a0f9ea850467..90138b4ded87 100644 --- a/sw/source/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx @@ -44,12 +44,12 @@ class DropDownFieldDialog : public SvxStandardDialog SwDropDownField* pDropField; DECL_LINK_TYPED(ButtonHdl, Button*, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: DropDownFieldDialog( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); virtual ~DropDownFieldDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; } //namespace sw diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx index d0fc11e435ac..789345253c14 100644 --- a/sw/source/uibase/inc/FrameControl.hxx +++ b/sw/source/uibase/inc/FrameControl.hxx @@ -55,13 +55,13 @@ class SwFrameMenuButtonBase : public MenuButton, public ISwFrameControl protected: virtual ~SwFrameMenuButtonBase() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: SwFrameMenuButtonBase( SwEditWin* pEditWin, const SwFrm* pFrm ); - virtual const SwFrm* GetFrame() SAL_OVERRIDE { return m_pFrm; } - virtual SwEditWin* GetEditWin() SAL_OVERRIDE { return m_pEditWin; } + virtual const SwFrm* GetFrame() override { return m_pFrm; } + virtual SwEditWin* GetEditWin() override { return m_pEditWin; } const SwPageFrm* GetPageFrame(); }; diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index a96423f3f021..b110421a6d38 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -31,23 +31,23 @@ class SwHeaderFooterWin : public SwFrameMenuButtonBase public: SwHeaderFooterWin( SwEditWin *pEditWin, const SwFrm *pFrm, bool bHeader ); virtual ~SwHeaderFooterWin( ); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetOffset( Point aOffset, long nXLineStart, long nXLineEnd ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Select( ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Select( ) override; - virtual void ShowAll( bool bShow ) SAL_OVERRIDE; - virtual bool Contains( const Point &rDocPt ) const SAL_OVERRIDE; + virtual void ShowAll( bool bShow ) override; + virtual bool Contains( const Point &rDocPt ) const override; bool IsHeader() { return m_bIsHeader; }; bool IsEmptyHeaderFooter( ); void ExecuteCommand(sal_uInt16 nSlot); - void SetReadonly( bool bReadonly ) SAL_OVERRIDE; + void SetReadonly( bool bReadonly ) override; private: DECL_LINK_TYPED( FadeHandler, Timer *, void ); diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 34d1b4c83f5d..23a3a134a0c7 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -35,19 +35,19 @@ class SwPageBreakWin : public SwFrameMenuButtonBase public: SwPageBreakWin( SwEditWin* pEditWin, const SwFrm *pFrm ); virtual ~SwPageBreakWin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Select( ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Activate( ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override; + virtual void Select( ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Activate( ) override; void UpdatePosition( const Point* pEvtPt = NULL ); - virtual void ShowAll( bool bShow ) SAL_OVERRIDE; - virtual bool Contains( const Point &rDocPt ) const SAL_OVERRIDE; + virtual void ShowAll( bool bShow ) override; + virtual bool Contains( const Point &rDocPt ) const override; - void SetReadonly( bool bReadonly ) SAL_OVERRIDE; + void SetReadonly( bool bReadonly ) override; void Fade( bool bFadeIn ); diff --git a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx index 462bca68d334..e9795fdd673b 100644 --- a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx @@ -38,15 +38,15 @@ class SwSpellDialogChildWindow void LockFocusNotification(bool bLock); protected: - virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck) SAL_OVERRIDE; - virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE; - virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage) SAL_OVERRIDE; - virtual bool HasAutoCorrection() SAL_OVERRIDE; - virtual bool HasGrammarChecking() SAL_OVERRIDE; - virtual bool IsGrammarChecking() SAL_OVERRIDE; - virtual void SetGrammarChecking(bool bOn) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck) override; + virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck) override; + virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage) override; + virtual bool HasAutoCorrection() override; + virtual bool HasGrammarChecking() override; + virtual bool IsGrammarChecking() override; + virtual void SetGrammarChecking(bool bOn) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; public: SwSpellDialogChildWindow ( diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx index 5a51d05dd340..1e15c274b8dc 100644 --- a/sw/source/uibase/inc/SwXFilterOptions.hxx +++ b/sw/source/uibase/inc/SwXFilterOptions.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; }; diff --git a/sw/source/uibase/inc/abstract.hxx b/sw/source/uibase/inc/abstract.hxx index 0c12d35e1812..c97826a4a381 100644 --- a/sw/source/uibase/inc/abstract.hxx +++ b/sw/source/uibase/inc/abstract.hxx @@ -31,7 +31,7 @@ class SwInsertAbstractDlg : public SfxModalDialog public: SwInsertAbstractDlg( vcl::Window* pParent ); virtual ~SwInsertAbstractDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt8 GetLevel() const; sal_uInt8 GetPara() const; diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx index aab03f4b5ba4..7a24e98273ba 100644 --- a/sw/source/uibase/inc/actctrl.hxx +++ b/sw/source/uibase/inc/actctrl.hxx @@ -29,7 +29,7 @@ class SW_DLLPUBLIC NumEditAction: public NumericField protected: void Action(); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; public: NumEditAction( vcl::Window* pParent, const ResId& rResId ) : NumericField(pParent, rResId) {} @@ -46,7 +46,7 @@ public: : Edit(pParent, nStyle) { } - virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& ) override; void SetReturnActionLink(const Link<ReturnActionEdit&,void>& rLink) { aReturnActionLink = rLink;} diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx index e66a632fc09b..23c31e68b293 100644 --- a/sw/source/uibase/inc/annotsh.hxx +++ b/sw/source/uibase/inc/annotsh.hxx @@ -71,7 +71,7 @@ public: void StateSearch(SfxItemSet &); virtual ::svl::IUndoManager* - GetUndoManager() SAL_OVERRIDE; + GetUndoManager() override; static SfxItemPool* GetAnnotationPool(SwView& rV); }; diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index 115e2eaf8ae5..f1319b0783de 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -53,7 +53,7 @@ public: SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ); virtual ~SwAsciiFilterDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void FillOptions( SwAsciiOptions& rOptions ); }; diff --git a/sw/source/uibase/inc/autoedit.hxx b/sw/source/uibase/inc/autoedit.hxx index 421236967b74..ccfde8c46d85 100644 --- a/sw/source/uibase/inc/autoedit.hxx +++ b/sw/source/uibase/inc/autoedit.hxx @@ -27,7 +27,7 @@ public: AutoEdit( vcl::Window* pParent, ResId aResId ) : Edit( pParent, aResId ){} protected: - virtual void KeyInput( const KeyEvent& rEvent ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rEvent ) override; }; // Implementation in autocorr.cxx diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx index 50b561f9576e..db8bb316cfd6 100644 --- a/sw/source/uibase/inc/barcfg.hxx +++ b/sw/source/uibase/inc/barcfg.hxx @@ -26,13 +26,13 @@ class SwToolbarConfigItem : public utl::ConfigItem static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwToolbarConfigItem( bool bWeb ); virtual ~SwToolbarConfigItem(); - 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; void SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId ); }; diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx index c1f80e8e2af9..442147a745e0 100644 --- a/sw/source/uibase/inc/bmpwin.hxx +++ b/sw/source/uibase/inc/bmpwin.hxx @@ -36,9 +36,9 @@ private: bool bGraphic : 1; bool bLeftAlign : 1; - virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; public: BmpWindow(vcl::Window* pPar, WinBits nStyle); diff --git a/sw/source/uibase/inc/bookctrl.hxx b/sw/source/uibase/inc/bookctrl.hxx index 8d73b0cfcb6d..7ec842f29692 100644 --- a/sw/source/uibase/inc/bookctrl.hxx +++ b/sw/source/uibase/inc/bookctrl.hxx @@ -24,12 +24,12 @@ class SwBookmarkControl : public SfxStatusBarControl { - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; + virtual void Paint( const UserDrawEvent& rEvt ) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index d350197882d6..7bd11cc8d7a1 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -35,7 +35,7 @@ class BookmarkCombo : public SwComboBox sal_Int32 GetNextSelEntryPos(sal_Int32 nPos) const; sal_Int32 GetSelEntryPos(sal_Int32 nPos) const; - virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; + virtual bool PreNotify(NotifyEvent& rNEvt) override; public: BookmarkCombo(vcl::Window* pWin, WinBits nStyle); @@ -58,12 +58,12 @@ class SwInsertBookmarkDlg: public SvxStandardDialog DECL_LINK(ModifyHdl, BookmarkCombo *); DECL_LINK_TYPED(DeleteHdl, Button*, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SwInsertBookmarkDlg(vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq); virtual ~SwInsertBookmarkDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index c37612cdb62d..9bf6bfd340af 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -60,12 +60,12 @@ class SwBreakDlg: public SvxStandardDialog void CheckEnable(); protected: - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SwBreakDlg( vcl::Window *pParent, SwWrtShell &rSh ); virtual ~SwBreakDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetTemplateName() { return aTemplate; } sal_uInt16 GetKind() { return nKind; } diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index efa8758a15b0..e6c9793501c7 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -64,8 +64,8 @@ public: SwDocDisplayItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual bool operator==( const SfxPoolItem& ) const override; void operator=( const SwDocDisplayItem& ); void FillViewOptions( SwViewOption& rVOpt) const; }; @@ -95,8 +95,8 @@ public: SwElemItem(const SwElemItem& rElemItem); SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual bool operator==( const SfxPoolItem& ) const override; void operator=( const SwElemItem& ); void FillViewOptions( SwViewOption& rVOpt) const; @@ -117,9 +117,9 @@ public: SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData ); SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; const OUString &GetFax() const { return sFaxName; } }; @@ -135,8 +135,8 @@ public: SwShadowCursorItem( const SwShadowCursorItem& rElemItem ); SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual bool operator==( const SfxPoolItem& ) const override; void operator=( const SwShadowCursorItem& ); void FillViewOptions( SwViewOption& rVOpt) const; @@ -173,8 +173,8 @@ public: SfxPoolItem(_nWhich){}; SwTestItem( const SwTestItem& pTestItem); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual bool operator==( const SfxPoolItem& ) const override; }; #endif diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index 2935e5bd8b8e..aef9bc08ca1b 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -50,7 +50,7 @@ class SwChangeDBDlg: public SvxStandardDialog DECL_LINK_TYPED(ButtonHdl, Button*, void); DECL_LINK_TYPED(AddDBHdl, Button*, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; void UpdateFields(); void FillDBPopup(); SvTreeListEntry* Insert(const OUString& rDBName); @@ -59,7 +59,7 @@ class SwChangeDBDlg: public SvxStandardDialog public: SwChangeDBDlg(SwView& rVw); virtual ~SwChangeDBDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 8da147d50546..4de3e0a4e913 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -54,7 +54,7 @@ public: virtual ~SwCharDlg(); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; }; class SwCharURLPage : public SfxTabPage @@ -82,12 +82,12 @@ public: const SfxItemSet& rSet ); virtual ~SwCharURLPage(); - 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/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index f15e80bf2aae..3e5f122ec2fa 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -52,7 +52,7 @@ protected: virtual void DrawPage(vcl::RenderContext& rRenderContext, const Point& rPoint, const bool bSecond, - const bool bEnabled) SAL_OVERRIDE; + const bool bEnabled) override; public: SwPageGridExample(vcl::Window* pPar) : SwPageExample(pPar) @@ -60,7 +60,7 @@ public: {} virtual ~SwPageGridExample(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void UpdateExample( const SfxItemSet& rSet ); }; @@ -74,7 +74,7 @@ protected: virtual void DrawPage(vcl::RenderContext& rRenderContext, const Point& rPoint, const bool bSecond, - const bool bEnabled) SAL_OVERRIDE; + const bool bEnabled) override; public: SwColExample(vcl::Window* pPar) @@ -99,14 +99,14 @@ private: SwFormatCol m_aCols; protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; public: SwColumnOnlyExample(vcl::Window*); void SetColumns(const SwFormatCol& rCol); - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_COLEX_HXX diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index ce9c606dce1a..28298d8d8c7e 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -67,7 +67,7 @@ class SwColumnDlg : public SfxModalDialog public: SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh); virtual ~SwColumnDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class ColumnValueSet : public ValueSet @@ -81,8 +81,8 @@ public: : ValueSet(pParent, WB_TABSTOP | WB_ITEMBORDER | WB_DOUBLEBORDER) { } - virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; // column dialog now as TabPage @@ -160,8 +160,8 @@ class SwColumnPage : public SfxTabPage using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; void connectPercentField(PercentField &rWrap, const OString &rName); @@ -172,13 +172,13 @@ class SwColumnPage : public SfxTabPage public: SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwColumnPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } - 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; void SetFrmMode(bool bMod); void SetPageWidth(long nPageWidth); diff --git a/sw/source/uibase/inc/conarc.hxx b/sw/source/uibase/inc/conarc.hxx index ca63894afb54..66825df81b29 100644 --- a/sw/source/uibase/inc/conarc.hxx +++ b/sw/source/uibase/inc/conarc.hxx @@ -31,11 +31,11 @@ public: ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function + virtual void Deactivate() override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX diff --git a/sw/source/uibase/inc/concustomshape.hxx b/sw/source/uibase/inc/concustomshape.hxx index f082cc46c373..d49565d196ba 100644 --- a/sw/source/uibase/inc/concustomshape.hxx +++ b/sw/source/uibase/inc/concustomshape.hxx @@ -39,18 +39,18 @@ class ConstCustomShape : public SwDrawBase ConstCustomShape( SwWrtShell* pSh, SwEditWin* pWin, SwView* pView, SfxRequest& rReq ); // Mouse- & Key-Events - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function OUString GetShapeType() const; static OUString GetShapeTypeFromRequest( SfxRequest& rReq ); - virtual void CreateDefaultObject() SAL_OVERRIDE; + virtual void CreateDefaultObject() override; // #i33136# - virtual bool doConstructOrthogonal() const SAL_OVERRIDE; + virtual bool doConstructOrthogonal() const override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONCUSTOMSHAPE_HXX diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx index a188f1256856..b21f1087d1a0 100644 --- a/sw/source/uibase/inc/condedit.hxx +++ b/sw/source/uibase/inc/condedit.hxx @@ -27,8 +27,8 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper { bool bBrackets, bEnableDrop; - SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; public: ConditionEdit(vcl::Window* pParent, WinBits nStyle); diff --git a/sw/source/uibase/inc/conform.hxx b/sw/source/uibase/inc/conform.hxx index bd116ebe83a3..65e01caf98ce 100644 --- a/sw/source/uibase/inc/conform.hxx +++ b/sw/source/uibase/inc/conform.hxx @@ -27,10 +27,10 @@ public: ConstFormControl(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function - virtual void CreateDefaultObject() SAL_OVERRIDE; + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function + virtual void CreateDefaultObject() override; }; #endif diff --git a/sw/source/uibase/inc/conpoly.hxx b/sw/source/uibase/inc/conpoly.hxx index ceabd6fd4b94..f3276e3a2fef 100644 --- a/sw/source/uibase/inc/conpoly.hxx +++ b/sw/source/uibase/inc/conpoly.hxx @@ -30,11 +30,11 @@ public: ConstPolygon(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - 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; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx index c79753ad16b9..878d99c8031e 100644 --- a/sw/source/uibase/inc/conrect.hxx +++ b/sw/source/uibase/inc/conrect.hxx @@ -34,10 +34,10 @@ class ConstRectangle : public SwDrawBase ConstRectangle(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // Mouse- & Key-Events - virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx index 10cfa93bcb80..07cd57b3588d 100644 --- a/sw/source/uibase/inc/content.hxx +++ b/sw/source/uibase/inc/content.hxx @@ -82,7 +82,7 @@ public: : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr ) {} - virtual bool IsProtect() const SAL_OVERRIDE; + virtual bool IsProtect() const override; const OUString& GetURL() const { return sURL; } const SwTextINetFormat* GetINetAttr() { return pINetAttr; } }; @@ -114,7 +114,7 @@ public: const SwFormatField* GetPostIt() const { return pField; } SwRangeRedline* GetRedline() { return pRedline; } - virtual bool IsProtect() const SAL_OVERRIDE; + virtual bool IsProtect() const override; bool IsPostIt() const {return mbPostIt; } }; diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 4dd8bdca4737..7b9a2afdad98 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -107,52 +107,52 @@ class SwContentTree using SvTreeListBox::EditEntry; protected: - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; SwNavigationPI* GetParentWindow(); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; + virtual void DragFinished( sal_Int8 ) override; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; bool FillTransferData( TransferDataContainer& rTransfer, sal_Int8& rDragMode ); bool HasContentChanged(); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvTreeListEntry* ) SAL_OVERRIDE; - virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; + SvTreeListEntry* ) override; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) override; virtual TriState NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ) SAL_OVERRIDE; + ) override; virtual TriState NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; void EditEntry( SvTreeListEntry* pEntry, EditEntryMode nMode ); void GotoContent(SwContent* pCnt); static void SetInDrag(bool bSet) {bIsInDrag = bSet;} - virtual std::unique_ptr<PopupMenu> CreateContextMenu() SAL_OVERRIDE; - virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; + virtual std::unique_ptr<PopupMenu> CreateContextMenu() override; + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) override; public: SwContentTree(vcl::Window* pParent, const ResId& rResId); virtual ~SwContentTree(); - virtual void dispose() SAL_OVERRIDE; - OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; - OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + virtual void dispose() override; + OUString GetEntryAltText( SvTreeListEntry* pEntry ) const override; + OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const override; SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt); bool ToggleToRoot(); @@ -175,9 +175,9 @@ public: sal_uInt8 GetOutlineLevel()const {return nOutlineLevel;} void SetOutlineLevel(sal_uInt8 nSet); - virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; + virtual bool Expand( SvTreeListEntry* pParent ) override; - virtual bool Collapse( SvTreeListEntry* pParent ) SAL_OVERRIDE; + virtual bool Collapse( SvTreeListEntry* pParent ) override; void ExecCommand(sal_uInt16 nCmd, bool bModifier); @@ -194,15 +194,15 @@ public: DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK_TYPED( TimerUpdate, Timer *, void ); - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; - virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) override; + virtual void RequestingChildren( SvTreeListEntry* pParent ) override; + virtual void GetFocus() override; + virtual void KeyInput(const KeyEvent& rKEvt) override; - virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) SAL_OVERRIDE; + virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) override; using Control::Notify; // FIXME why do we have 2 of these - virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) override; }; @@ -218,7 +218,7 @@ public: } 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; }; namespace sfx2 { class DocumentInserter; } @@ -258,38 +258,38 @@ private: protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; - virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; + virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) override; virtual TriState NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ) SAL_OVERRIDE; + ) override; virtual TriState NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ) SAL_OVERRIDE; + ) override; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; + virtual void DragFinished( sal_Int8 ) override; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvTreeListEntry* ) SAL_OVERRIDE; - virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; + SvTreeListEntry* ) override; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void SelectHdl() SAL_OVERRIDE; - virtual void DeselectHdl() SAL_OVERRIDE; - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void KeyInput(const KeyEvent& rKEvt) override; + virtual void GetFocus() override; + virtual void SelectHdl() override; + virtual void DeselectHdl() override; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) override; void Clear(); @@ -307,13 +307,13 @@ protected: static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} DECL_STATIC_LINK_TYPED(SwGlobalTree, ShowFrameHdl, void*, void); - virtual std::unique_ptr<PopupMenu> CreateContextMenu() SAL_OVERRIDE; - virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; + virtual std::unique_ptr<PopupMenu> CreateContextMenu() override; + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) override; public: SwGlobalTree(vcl::Window* pParent, const ResId& rResId); virtual ~SwGlobalTree(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox); void InsertRegion( const SwGlblDocContent* pCont, diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index aa57f2360343..8609c30a003f 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -63,7 +63,7 @@ class SwConvertTableDlg: public SfxModalDialog public: SwConvertTableDlg( SwView& rView, bool bToTable ); virtual ~SwConvertTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GetValues( sal_Unicode& rDelim, SwInsertTableOptions& rInsTableOpts, diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index b4a5a9b28380..371faa4defe2 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -58,7 +58,7 @@ public: : m_sNone(rNone) { } - virtual OUString filter(const OUString &rText) SAL_OVERRIDE; + virtual OUString filter(const OUString &rText) override; }; class SwCaptionDialog : public SvxStandardDialog @@ -100,7 +100,7 @@ class SwCaptionDialog : public SvxStandardDialog DECL_LINK_TYPED(OptionHdl, Button *, void); DECL_LINK_TYPED(CaptionHdl, Button *, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; void DrawSample(); void ApplyCaptionOrder(); //#i61007# order of captions @@ -109,7 +109,7 @@ class SwCaptionDialog : public SvxStandardDialog public: SwCaptionDialog( vcl::Window *pParent, SwView &rV ); virtual ~SwCaptionDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/dbconfig.hxx b/sw/source/uibase/inc/dbconfig.hxx index 55251ee4de3a..e67382dbf38f 100644 --- a/sw/source/uibase/inc/dbconfig.hxx +++ b/sw/source/uibase/inc/dbconfig.hxx @@ -28,7 +28,7 @@ class SW_DLLPUBLIC SwDBConfig : public utl::ConfigItem { private: SAL_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; SwDBData* pAdrImpl; SwDBData* pBibImpl; @@ -40,7 +40,7 @@ public: void Load(); const SwDBData& GetAddressSource(); const SwDBData& GetBibliographySource(); - 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/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index 833d8670e983..2bf535ef4dc1 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -147,8 +147,8 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool bInsField ); using SfxModalDialog::Notify; - 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 Load(); // set the tables - properties @@ -161,7 +161,7 @@ public: const SwDBData& rData ); virtual ~SwInsertDBColAutoPilot(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index 46a02241d666..1e6f69adbb63 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -44,18 +44,18 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox DECL_DLLPRIVATE_LINK_TYPED( DBCompare, const SvSortData&, sal_Int32 ); SAL_DLLPRIVATE void InitTreeList(); - SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ) override; - SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + SAL_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override; using SvTreeListBox::Select; public: SwDBTreeList(vcl::Window* pParent, WinBits nStyle); virtual ~SwDBTreeList(); - virtual void dispose() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void dispose() override; + virtual Size GetOptimalSize() const override; OUString GetDBName( OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = 0); diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index d6d81ba9d3e8..80dc4c47f2af 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -38,7 +38,7 @@ protected: public: virtual ~CancelableDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetCancelHdl( const Link<Button*,void>& rLink ); void Show(); @@ -60,7 +60,7 @@ public: PrintMonitor( vcl::Window *pParent, bool modal, PrintMonitorType eType ); virtual ~PrintMonitor(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class CreateMonitor : public CancelableDialog @@ -68,7 +68,7 @@ class CreateMonitor : public CancelableDialog public: CreateMonitor( vcl::Window *pParent, bool modal ); virtual ~CreateMonitor(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetTotalCount( sal_Int32 nTotal ); void SetCurrentPosition( sal_Int32 nCurrent ); diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx index 9c87e66af780..3a66f8bc4637 100644 --- a/sw/source/uibase/inc/docfnote.hxx +++ b/sw/source/uibase/inc/docfnote.hxx @@ -31,7 +31,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog sal_uInt16 m_nFootNoteId; sal_uInt16 m_nEndNoteId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; DECL_LINK_TYPED( OkHdl, Button *, void ); diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index 8cd7251e9ef2..abfee6d91d24 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -32,13 +32,13 @@ class SwDocStatPage: public SfxTabPage public: SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwDocStatPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(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; DECL_LINK_TYPED(UpdateHdl, Button*, void); diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index c251c7ba0c51..4aee03283fac 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -66,7 +66,7 @@ friend class SwDropCapsPict; SwWrtShell &rSh; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; void FillSet( SfxItemSet &rSet ); DECL_LINK_TYPED(ClickHdl, Button*, void); @@ -82,14 +82,14 @@ friend class SwDropCapsPict; public: SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwDropCapsPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } - 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; void SetFormat(bool bSet){bFormat = bSet;} }; diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx index a4e2ff6a608a..98e5757c9a9d 100644 --- a/sw/source/uibase/inc/drwtxtsh.hxx +++ b/sw/source/uibase/inc/drwtxtsh.hxx @@ -54,7 +54,7 @@ public: virtual ~SwDrawTextShell(); virtual ::svl::IUndoManager* - GetUndoManager() SAL_OVERRIDE; + GetUndoManager() override; static void StateDisableItems(SfxItemSet &); diff --git a/sw/source/uibase/inc/dselect.hxx b/sw/source/uibase/inc/dselect.hxx index 49bd1fd0af70..c3996640bc41 100644 --- a/sw/source/uibase/inc/dselect.hxx +++ b/sw/source/uibase/inc/dselect.hxx @@ -28,9 +28,9 @@ class DrawSelection : public SwDrawBase DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); // mouse- & key events - virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function + virtual void Activate(const sal_uInt16 nSlotId) override; // activate function }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 9263e84a6bf4..fda3911a3c96 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -185,27 +185,27 @@ friend void PageNumNotify( SwViewShell* pVwSh, protected: - virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; - virtual void PrePaint(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& ) override; + virtual void PrePaint(vcl::RenderContext& rRenderContext) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() 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 RequestHelp(const HelpEvent& rEvt) 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 RequestHelp(const HelpEvent& rEvt) override; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; // Drag & Drop Interface - 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; - virtual OUString GetSurroundingText() const SAL_OVERRIDE; - virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; + virtual OUString GetSurroundingText() const override; + virtual Selection GetSurroundingTextSelection() const override; void ShowAutoTextCorrectQuickHelp( const OUString& rWord, SvxAutoCorrCfg* pACfg, SvxAutoCorrect* pACorr, bool bFromIME = false ); @@ -216,7 +216,7 @@ protected: bool IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType& rControl, bool& bOverFly, bool& bPageAnchored ) const; public: - virtual void KeyInput(const KeyEvent &rKEvt) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent &rKEvt) override; void UpdatePointer(const Point &, sal_uInt16 nButtons = 0); bool IsDrawSelMode(); @@ -263,7 +263,7 @@ public: const SwView &GetView() const { return m_rView; } SwView &GetView() { return m_rView; } - 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; static inline long GetDDStartPosX() { return m_nDDStartPosX; } static inline long GetDDStartPosY() { return m_nDDStartPosY; } @@ -293,10 +293,10 @@ public: SwEditWin(vcl::Window *pParent, SwView &); virtual ~SwEditWin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// @see OutputDevice::LogicInvalidate(). - void LogicInvalidate(const Rectangle* pRectangle) SAL_OVERRIDE; + void LogicInvalidate(const Rectangle* pRectangle) override; /// Same as MouseButtonDown(), but coordinates are in logic unit. void LogicMouseButtonDown(const MouseEvent& rMouseEvent); /// Same as MouseButtonUp(), but coordinates are in logic unit. diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx index 49faf2339110..9fea992adb2d 100644 --- a/sw/source/uibase/inc/envimg.hxx +++ b/sw/source/uibase/inc/envimg.hxx @@ -60,11 +60,11 @@ public: SwEnvItem& operator =(const SwEnvItem& rItem); - virtual bool operator ==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual bool operator ==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_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 SfxPoolItem* Clone(SfxItemPool* = 0) const 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; }; class SwEnvCfgItem : public utl::ConfigItem @@ -74,7 +74,7 @@ private: static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwEnvCfgItem(); @@ -82,7 +82,7 @@ public: SwEnvItem& GetItem() {return aEnvItem;} - 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/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index cce27158fc39..b8ab936ce842 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -42,15 +42,15 @@ class Printer; class SwEnvPreview : public vcl::Window { - void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; + void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; public: SwEnvPreview(vcl::Window * pParent, WinBits nStyle); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual Size GetOptimalSize() const override; }; class SwEnvDlg : public SfxTabDialog @@ -67,13 +67,13 @@ friend class SwEnvPreview; SfxItemSet *pSenderSet; sal_uInt16 m_nEnvPrintId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; - virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; + virtual short Ok() override; public: SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert); virtual ~SwEnvDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class SwEnvPage : public SfxTabPage @@ -104,15 +104,15 @@ class SwEnvPage : public SfxTabPage public: SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwEnvPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override; void FillItem(SwEnvItem& rItem); - 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/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx index 04bc3dab649f..72688b99c9c3 100644 --- a/sw/source/uibase/inc/fldedt.hxx +++ b/sw/source/uibase/inc/fldedt.hxx @@ -43,11 +43,11 @@ public: SwFieldEditDlg(SwView& rVw); virtual ~SwFieldEditDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK_TYPED(OKHdl, Button*, void); - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; void EnableInsert(bool bEnable); void InsertHdl(); diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index 3f89dc6a8cee..12b797d8c7aa 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -38,10 +38,10 @@ class SwFieldDlg: public SfxTabDialog sal_uInt16 m_nFuncId; sal_uInt16 m_nDbId; - virtual bool Close() SAL_OVERRIDE; - virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ) SAL_OVERRIDE; - virtual void Activate() SAL_OVERRIDE; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; + virtual bool Close() override; + virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ) override; + virtual void Activate() override; + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override; void ReInitTabPage( sal_uInt16 nPageId, bool bOnlyActivate = false ); diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx index 89b70f36c54d..d7abe750b8e6 100644 --- a/sw/source/uibase/inc/fldwrap.hxx +++ b/sw/source/uibase/inc/fldwrap.hxx @@ -31,7 +31,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID(SwFieldDlgWrapper); - virtual bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; + virtual bool ReInitDlg(SwDocShell *pDocSh) override; void ShowReferencePage(); }; @@ -45,7 +45,7 @@ public: SFX_DECL_CHILDWINDOW(SwFieldDataOnlyDlgWrapper); - virtual bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; + virtual bool ReInitDlg(SwDocShell *pDocSh) override; }; #endif diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx index 77aa2a669d97..e9f47ebfd31f 100644 --- a/sw/source/uibase/inc/fontcfg.hxx +++ b/sw/source/uibase/inc/fontcfg.hxx @@ -71,13 +71,13 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem void ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight ); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwStdFontConfig(); virtual ~SwStdFontConfig(); - 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; const OUString& GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];} const OUString& GetFontOutline(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];} diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx index 1e938e22b925..cd74b450d46a 100644 --- a/sw/source/uibase/inc/formedt.hxx +++ b/sw/source/uibase/inc/formedt.hxx @@ -37,7 +37,7 @@ class SwForm; // insert marker for index entry class SwIdxFormDlg : public SvxStandardDialog { - void Apply() SAL_OVERRIDE; + void Apply() override; VclPtr<ListBox> aEntryLB; VclPtr<OKButton> aOKBtn; @@ -65,7 +65,7 @@ class SwIdxFormDlg : public SvxStandardDialog public: SwIdxFormDlg( vcl::Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); virtual ~SwIdxFormDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx index ab5977b9a869..8b95826a1b98 100644 --- a/sw/source/uibase/inc/frmdlg.hxx +++ b/sw/source/uibase/inc/frmdlg.hxx @@ -47,7 +47,7 @@ class SwFrmDlg : public SfxTabDialog sal_uInt16 m_nMacroId; sal_uInt16 m_nBorderId; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: SwFrmDlg( SfxViewFrame *pFrame, vcl::Window *pParent, diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index d83af39b4bae..b29b2b32ce3e 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -127,8 +127,8 @@ class SwFrmPage: public SfxTabPage bool m_bIsMathOLE; bool m_bIsMathBaselineAlignment; - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; DECL_LINK_TYPED(RangeModifyLoseFocusHdl, Control&, void); DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); @@ -186,13 +186,13 @@ class SwFrmPage: public SfxTabPage public: SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } - 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; void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } void SetFormatUsed(bool bFormat); @@ -226,9 +226,9 @@ class SwGrfExtPage: public SfxTabPage DECL_LINK_TYPED(MirrorHdl, Button*, void); DECL_LINK_TYPED(BrowseHdl, Button*, void); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; virtual ~SwGrfExtPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -238,9 +238,9 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); - virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) override; + virtual void Reset(const SfxItemSet *rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; }; class SwFrmURLPage : public SfxTabPage @@ -263,12 +263,12 @@ class SwFrmURLPage : public SfxTabPage public: SwFrmURLPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmURLPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); - 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; }; class SwFrmAddPage : public SfxTabPage @@ -312,13 +312,13 @@ class SwFrmAddPage : public SfxTabPage public: SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmAddPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aAddPgRg; } - 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; void SetFormatUsed(bool bFormat); void SetFrmType(const OUString &rType) { sDlgType = rType; } diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index 78e80933de90..1b14ae803b38 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -47,7 +47,7 @@ public: { } - virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) override; }; struct GlosBibUserData @@ -65,7 +65,7 @@ public: { } - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; }; class SwGlossaryGroupDlg : public SvxStandardDialog @@ -90,7 +90,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog bool IsDeleteAllowed(const OUString &rGroup); protected: - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED(NewHdl, Button *, void); DECL_LINK_TYPED( DeleteHdl, Button*, void ); @@ -103,7 +103,7 @@ public: std::vector<OUString> const& rPathArr, SwGlossaryHdl *pGlosHdl); virtual ~SwGlossaryGroupDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const OUString& GetCreatedGroupName() const {return sCreatedGroup;} }; diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx index c5ae2bff1c08..ff440f13050e 100644 --- a/sw/source/uibase/inc/gloslst.hxx +++ b/sw/source/uibase/inc/gloslst.hxx @@ -70,7 +70,7 @@ public: void Update(); - virtual void Invoke() SAL_OVERRIDE; + virtual void Invoke() override; void ClearGroups(); }; diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index e7ad2c5c9920..4092f98be3e8 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -58,18 +58,18 @@ class SwGlTreeListBox : public SvTreeListBox SvTreeListEntry* pDragEntry; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rContainer, - SvTreeListEntry* ) SAL_OVERRIDE; - virtual bool NotifyAcceptDrop( SvTreeListEntry* ) SAL_OVERRIDE; + SvTreeListEntry* ) override; + virtual bool NotifyAcceptDrop( SvTreeListEntry* ) override; virtual TriState NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos - ) SAL_OVERRIDE; + ) override; virtual TriState NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, - sal_uLong& rNewChildPos) SAL_OVERRIDE; + sal_uLong& rNewChildPos) override; TriState NotifyCopyingOrMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, @@ -77,8 +77,8 @@ class SwGlTreeListBox : public SvTreeListBox public: SwGlTreeListBox(vcl::Window* pParent, WinBits nBits); - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual Size GetOptimalSize() const override; void Clear(); }; @@ -135,7 +135,7 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK_TYPED( PreviewLoadedHdl, SwOneExampleFrame&, void ); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; void Init(); SvTreeListEntry* DoesBlockExist(const OUString& sBlock, const OUString& rShort); void ShowAutoText(const OUString& rGroup, const OUString& rShortName); @@ -149,7 +149,7 @@ class SwGlossaryDlg : public SvxStandardDialog public: SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); virtual ~SwGlossaryDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetCurrGrpName() const; OUString GetCurrShortName() const { diff --git a/sw/source/uibase/inc/glshell.hxx b/sw/source/uibase/inc/glshell.hxx index 17ac5fdcb1bf..6722ec79f5b3 100644 --- a/sw/source/uibase/inc/glshell.hxx +++ b/sw/source/uibase/inc/glshell.hxx @@ -27,7 +27,7 @@ class SwGlosDocShell : public SwDocShell OUString aGroupName; protected: - virtual bool Save() SAL_OVERRIDE; + virtual bool Save() override; public: TYPEINFO_OVERRIDE(); @@ -58,7 +58,7 @@ class SwWebGlosDocShell : public SwWebDocShell OUString aGroupName; protected: - virtual bool Save() SAL_OVERRIDE; + virtual bool Save() override; public: TYPEINFO_OVERRIDE(); diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx index 4226ed89adad..5af24755d0d8 100644 --- a/sw/source/uibase/inc/hyp.hxx +++ b/sw/source/uibase/inc/hyp.hxx @@ -38,11 +38,11 @@ private: bool bInfoBox : 1; // display info-box when ending protected: - virtual void SpellStart( SvxSpellArea eSpell ) SAL_OVERRIDE; - virtual bool SpellContinue() SAL_OVERRIDE; - virtual void SpellEnd( ) SAL_OVERRIDE; - virtual bool SpellMore() SAL_OVERRIDE; - virtual void InsertHyphen( const sal_Int32 nPos ) SAL_OVERRIDE; // insert hyphen + virtual void SpellStart( SvxSpellArea eSpell ) override; + virtual bool SpellContinue() override; + virtual void SpellEnd( ) override; + virtual bool SpellMore() override; + virtual void InsertHyphen( const sal_Int32 nPos ) override; // insert hyphen public: SwHyphWrapper( SwView* pVw, diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index 187a02c1b320..fec27ec571f7 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -34,8 +34,8 @@ class SwWrtShell; // insert fields class SwFieldInputDlg: public SvxStandardDialog { - virtual void Apply() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType ) SAL_OVERRIDE; + virtual void Apply() override; + virtual void StateChanged( StateChangedType ) override; SwWrtShell& rSh; SwInputField* pInpField; @@ -54,7 +54,7 @@ public: SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); virtual ~SwFieldInputDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 444c5b32202f..de5a236bc508 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -40,7 +40,7 @@ public: const OUString& aTableName ); protected: - virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& ) override; }; class SwInputWindow : public ToolBox @@ -71,8 +71,8 @@ friend class InputEdit; using Window::IsActive; protected: - virtual void Resize() SAL_OVERRIDE; - virtual void Click() SAL_OVERRIDE; + virtual void Resize() override; + virtual void Click() override; DECL_LINK_TYPED( MenuHdl, Menu *, bool ); DECL_LINK_TYPED( DropdownClickHdl, ToolBox*, void ); void ApplyFormula(); @@ -81,9 +81,9 @@ protected: public: SwInputWindow( vcl::Window* pParent ); virtual ~SwInputWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void ShowWin(); diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index b292f3106c66..03acd7eea195 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -60,14 +60,14 @@ class SwInsFootNoteDlg: public SvxStandardDialog DECL_LINK_TYPED(NumberExtCharHdl, Button *, void); DECL_LINK_TYPED(NextPrevHdl, Button *, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; void Init(); public: SwInsFootNoteDlg(vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false); virtual ~SwInsFootNoteDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetFontName() { return m_aFontName; } bool IsEndNote() { return m_pEndNoteBtn->IsChecked(); } diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index ba9b57958d53..e4bd75c9bcf0 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -66,7 +66,7 @@ class SwInsTableDlg : public SfxModalDialog public: SwInsTableDlg( SwView& rView ); virtual ~SwInsTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol, SwInsertTableOptions& rInsTableOpts, OUString& rTableAutoFormatName, diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index f436557ae5f3..43afc15e5c9c 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -63,7 +63,7 @@ private: DECL_LINK_TYPED(InsertFileHdl, Button *, void); DECL_LINK_TYPED(DlgClosedHdl, sfx2::FileDialogHelper *, void); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; void CheckTravel(); void SetField(); @@ -71,7 +71,7 @@ private: public: SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh); virtual ~SwJavaEditDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OUString GetScriptText() const { return aText; } diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx index d9ffa02b8a6c..f8102bb3b9f8 100644 --- a/sw/source/uibase/inc/label.hxx +++ b/sw/source/uibase/inc/label.hxx @@ -50,13 +50,13 @@ class SwLabDlg : public SfxTabDialog sal_uInt16 m_nPrivateId; void _ReplaceGroup( const OUString &rMake ); - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: SwLabDlg( vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel); virtual ~SwLabDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SwLabRec* GetRecord(const OUString &rRecName, bool bCont); void GetLabItem(SwLabItem &rItem); diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx index 5f47a4b638e6..783a9b105a33 100644 --- a/sw/source/uibase/inc/labelcfg.hxx +++ b/sw/source/uibase/inc/labelcfg.hxx @@ -38,13 +38,13 @@ private: std::vector<OUString> m_aManufacturers; std::map< OUString, std::map<OUString, SwLabelMeasure> > m_aLabels; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwLabelConfig(); virtual ~SwLabelConfig(); - 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; void FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr); const std::vector<OUString>& GetManufacturers() const {return m_aManufacturers;} diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx index c278c55eec30..629b0ae06d1c 100644 --- a/sw/source/uibase/inc/labimg.hxx +++ b/sw/source/uibase/inc/labimg.hxx @@ -36,9 +36,9 @@ public: SwLabItem& operator =(const SwLabItem& rItem); - virtual bool operator ==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual bool operator ==(const SfxPoolItem& rItem) const override; - virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override; OUString aLstMake; // remember last selection OUString aLstType; @@ -111,14 +111,14 @@ private: com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwLabCfgItem(bool bLabel); SwLabItem& GetItem() {return aItem;} - 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/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index 2d18ef619da8..05ac54261850 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -55,7 +55,7 @@ private: public: SwLineNumberingDlg(SwView *pVw); virtual ~SwLineNumberingDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 81f4588a13f6..4f3ea2383ed7 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -57,13 +57,13 @@ class SwMailConfigPage : public SfxTabPage public: SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwMailConfigPage(); - 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; }; diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx index 597273496683..4a33570314ed 100644 --- a/sw/source/uibase/inc/maildispatcher.hxx +++ b/sw/source/uibase/inc/maildispatcher.hxx @@ -133,8 +133,8 @@ public: void addListener(::rtl::Reference<IMailDispatcherListener> listener); protected: - virtual void SAL_CALL run() SAL_OVERRIDE; - virtual void SAL_CALL onTerminated() SAL_OVERRIDE; + virtual void SAL_CALL run() override; + virtual void SAL_CALL onTerminated() override; private: std::list< ::rtl::Reference<IMailDispatcherListener> > cloneListener(); diff --git a/sw/source/uibase/inc/mailmergechildwindow.hxx b/sw/source/uibase/inc/mailmergechildwindow.hxx index ade2a24c57cf..8b5fd12c7ff0 100644 --- a/sw/source/uibase/inc/mailmergechildwindow.hxx +++ b/sw/source/uibase/inc/mailmergechildwindow.hxx @@ -31,9 +31,9 @@ class SwMailMergeChildWin : public SfxFloatingWindow public: SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); virtual ~SwMailMergeChildWin(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; + virtual void FillInfo(SfxChildWinInfo&) const override; }; class SwMailMergeChildWindow : public SfxChildWindow diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index eb0eed5ee5db..a707fa5cdcda 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -66,11 +66,11 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window void DrawText_Impl(vcl::RenderContext& rRenderContext, const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; + virtual void Resize() override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; void UpdateScrollBar(); DECL_LINK_TYPED(ScrollHdl, ScrollBar*,void); @@ -78,7 +78,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window public: SwAddressPreview(vcl::Window* pParent, WinBits nStyle=WB_BORDER); virtual ~SwAddressPreview(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void positionScrollBar(); @@ -155,8 +155,8 @@ public: {} virtual ~SwAuthenticator(); - virtual OUString SAL_CALL getUserName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getPassword() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getUserName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPassword() throw (css::uno::RuntimeException, std::exception) override; }; @@ -171,7 +171,7 @@ public: virtual ~SwConnectionContext(); virtual css::uno::Any SAL_CALL getValueByName(const OUString& Name) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; class SwMutexBase @@ -193,13 +193,13 @@ public: virtual ~SwConnectionListener(); virtual void SAL_CALL connected(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disconnected(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; }; class SW_DLLPUBLIC SwMailTransferable : @@ -218,40 +218,40 @@ class SW_DLLPUBLIC SwMailTransferable : virtual ~SwMailTransferable(); virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& aFlavor) throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& aFlavor) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; //XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; }; @@ -277,37 +277,37 @@ public: virtual ~SwMailMessage(); // attributes - virtual OUString SAL_CALL getSenderName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSenderAddress() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getReplyToAddress() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSenderName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSenderAddress() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getReplyToAddress() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSubject() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSubject() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSubject(const OUString& _subject) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getBody() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setBody(const css::uno::Reference<css::datatransfer::XTransferable>& _body) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // methods virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<OUString> SAL_CALL getRecipients() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<OUString> SAL_CALL getCcRecipients() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<OUString> SAL_CALL getBccRecipients() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addAttachment(const css::mail::MailAttachment& aMailAttachment) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<css::mail::MailAttachment> SAL_CALL getAttachments() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; void SetSenderName(const OUString& rSenderName) { m_sSenderName = rSenderName; diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx index 78449ae283af..cadd1cdb164f 100644 --- a/sw/source/uibase/inc/mailmergewizard.hxx +++ b/sw/source/uibase/inc/mailmergewizard.hxx @@ -58,12 +58,12 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard using svt::OWizardMachine::skipUntil; protected: - virtual VclPtr<TabPage> createPage( WizardState _nState ) SAL_OVERRIDE; - virtual void enterState( WizardState _nState ) SAL_OVERRIDE; + virtual VclPtr<TabPage> createPage( WizardState _nState ) override; + virtual void enterState( WizardState _nState ) override; // roadmap feature ?? // virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason ); - virtual OUString getStateDisplayName( WizardState _nState ) const SAL_OVERRIDE; + virtual OUString getStateDisplayName( WizardState _nState ) const override; public: SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem); @@ -89,8 +89,8 @@ public: void updateRoadmapItemLabel( WizardState _nState ); - virtual short Execute() SAL_OVERRIDE; - virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; + virtual short Execute() override; + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) override; }; #endif diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 085b535d0642..75be32484346 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -111,7 +111,7 @@ class SwMailMergeDlg : public SvxStandardDialog DECL_LINK(ModifyHdl, void *); DECL_LINK_TYPED( SaveTypeHdl, Button*, void ); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; bool ExecQryShell(); public: @@ -122,7 +122,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0); virtual ~SwMailMergeDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; inline DBManagerOptions GetMergeType() { return nMergeType; } @@ -143,7 +143,7 @@ class SwMailMergeCreateFromDlg : public ModalDialog public: SwMailMergeCreateFromDlg(vcl::Window* pParent); virtual ~SwMailMergeCreateFromDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsThisDocument() const { return m_pThisDocRB->IsChecked(); @@ -156,7 +156,7 @@ class SwMailMergeFieldConnectionsDlg : public ModalDialog public: SwMailMergeFieldConnectionsDlg(vcl::Window* pParent); virtual ~SwMailMergeFieldConnectionsDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsUseExistingConnections() const { diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx index 94fe4bfa94de..3c522329276c 100644 --- a/sw/source/uibase/inc/mergetbl.hxx +++ b/sw/source/uibase/inc/mergetbl.hxx @@ -30,12 +30,12 @@ class SwMergeTableDlg : public SvxStandardDialog bool& m_rMergePrev; protected: - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SwMergeTableDlg( vcl::Window *pParent, bool& rWithPrev ); virtual ~SwMergeTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index 41ccbb425dc1..c05adc2a1099 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -38,11 +38,11 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog SwTOXMgr& rMgr; sal_uInt16 nPos; - void Apply() SAL_OVERRIDE; + void Apply() override; public: SwMultiTOXMarkDlg( vcl::Window* pParent, SwTOXMgr &rTOXMgr ); virtual ~SwMultiTOXMarkDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx index 4859a5682b13..90fe6d348d6a 100644 --- a/sw/source/uibase/inc/navicfg.hxx +++ b/sw/source/uibase/inc/navicfg.hxx @@ -36,13 +36,13 @@ class SwNavigationConfig : public utl::ConfigItem static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwNavigationConfig(); virtual ~SwNavigationConfig(); - 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; ContentTypeId GetRootType()const {return nRootType;} void SetRootType(ContentTypeId nSet){ diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 7f4ba5922ae5..1bfca38237d5 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -43,8 +43,8 @@ enum class RegionMode; class SwNavHelpToolBox : public SwHelpToolBox { - virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent &rEvt) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; public: SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId); }; @@ -123,11 +123,11 @@ class SwNavigationPI : public vcl::Window, protected: - virtual void Resize() SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; // release ObjectShellLock early enough for app end - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; NumEditAction& GetPageEdit(); bool ToggleTree(); @@ -137,7 +137,7 @@ public: SwNavigationPI(SfxBindings*, SfxChildWindowContext*, vcl::Window*); virtual ~SwNavigationPI(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void GotoPage(); // jump to page; bindable function @@ -145,7 +145,7 @@ public: void MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, bool bWithCilds); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; static OUString CreateDropFileName( TransferableDataHelper& rData ); static OUString CleanEntry(const OUString& rEntry); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 348242561141..c957abf8aed3 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -114,12 +114,12 @@ public: SwNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwNumPositionTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -149,8 +149,8 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog sal_uInt16 m_nPositionPageId; protected: - virtual short Ok() SAL_OVERRIDE; - virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; + virtual short Ok() override; + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; DECL_LINK_TYPED(RemoveNumberingHdl, Button*, void); public: SwSvxNumBulletTabDialog(vcl::Window* pParent, diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx index b1968d7f6857..ce553db31d3f 100644 --- a/sw/source/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/uibase/inc/numberingtypelistbox.hxx @@ -37,9 +37,9 @@ class SW_DLLPUBLIC SwNumberingTypeListBox : public ListBox public: SwNumberingTypeListBox( vcl::Window* pWin, WinBits nStyle = WB_BORDER ); virtual ~SwNumberingTypeListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; void Reload(sal_uInt16 nTypeFlags); diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 634c07be327c..9a252de063d2 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -48,7 +48,7 @@ public: NumFormatListBox(vcl::Window* pWin, WinBits nStyle); virtual ~NumFormatListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void Clear(); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 5825f9845b67..741d6dfcce57 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -69,15 +69,15 @@ protected: public: SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwParagraphNumTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return aPageRg; } - virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void ChangesApplied() SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ChangesApplied() override; void EnableNewStart(); void DisableOutline(); diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index 175bed1573bc..1fae3ac8ab32 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -35,7 +35,7 @@ class NumberingPreview : public vcl::Window sal_uInt16 nActLevel; protected: - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override; public: NumberingPreview(vcl::Window* pParent, const ResId& rResId) diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 75db09d9166a..1281502dc2dc 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -62,12 +62,12 @@ private: public: SwCompatibilityOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCompatibilityOptPage(); - 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/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 9f6483273da1..96d6bf678776 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -65,13 +65,13 @@ private: public: SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwLoadOptPage(); - 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; }; class SwCaptionOptDlg : public SfxSingleTabDialog @@ -83,7 +83,7 @@ public: class CaptionComboBox : public SwComboBox { protected: - virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& ) override; public: CaptionComboBox(vcl::Window* pParent, WinBits nStyle) @@ -101,10 +101,10 @@ private: public: SwCaptionPreview(vcl::Window* pParent, WinBits nStyle); void Init(); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; void SetPreviewText( const OUString& rText ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual Size GetOptimalSize() const override; }; class SwCaptionOptPage : public SfxTabPage @@ -169,13 +169,13 @@ public: SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCaptionOptPage(); - 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/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 33641c98fdc3..95c2e191f78d 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -65,12 +65,12 @@ public: SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwContentOptPage(); - 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; }; // TabPage printer settings additions @@ -111,15 +111,15 @@ class SwAddPrinterTabPage : public SfxTabPage public: SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwAddPrinterTabPage(); - 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; void SetFax(const std::vector<OUString>& ); void SetPreview(bool bPrev); - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; class SwStdFontTabPage : public SfxTabPage @@ -180,19 +180,19 @@ class SwStdFontTabPage : public SfxTabPage SwStdFontTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwStdFontTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; public: 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; void SetFontMode(sal_uInt8 nGroup) { nFontGroup = nGroup; } - virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated(const SfxAllItemSet& aSet) override; }; class SwTableOptionsTabPage : public SfxTabPage @@ -224,15 +224,15 @@ class SwTableOptionsTabPage : public SfxTabPage public: SwTableOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwTableOptionsTabPage(); - 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; void SetWrtShell(SwWrtShell* pSh) { pWrtShell = pSh; } - virtual void PageCreated( const SfxAllItemSet& aSet) SAL_OVERRIDE; + virtual void PageCreated( const SfxAllItemSet& aSet) override; }; @@ -269,18 +269,18 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage public: SwShdwCrsrOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwShdwCrsrOptionsTabPage(); - 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; void SetWrtShell(SwWrtShell* pSh) { m_pWrtShell = pSh; } - virtual void PageCreated( const SfxAllItemSet& aSet ) SAL_OVERRIDE; + virtual void PageCreated( const SfxAllItemSet& aSet ) override; }; // mark preview @@ -302,12 +302,12 @@ class SwMarkPreview : public vcl::Window sal_uInt16 nMarkPos; - void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; + void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; void PaintPage(vcl::RenderContext& rRenderContext, const Rectangle &rRect); void InitColors(); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: SwMarkPreview(vcl::Window* pParent, WinBits nWinBits); @@ -315,7 +315,7 @@ public: inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; }; // redlining options @@ -349,12 +349,12 @@ class SwRedlineOptionsTabPage : public SfxTabPage public: SwRedlineOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwRedlineOptionsTabPage(); - 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; }; // TabPage test settings for SW @@ -366,12 +366,12 @@ class SwTestTabPage : public SfxTabPage public: SwTestTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwTestTabPage(); - 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; private: VclPtr<CheckBox> m_pTest1CBox; @@ -409,12 +409,12 @@ class SwCompareOptionsTabPage : public SfxTabPage public: SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCompareOptionsTabPage(); - 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/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 9eb16b76bb29..0856a51c7db0 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -63,15 +63,15 @@ protected: DECL_LINK_TYPED( FormHdl, Button *, void ); DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); - virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; - virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; + virtual short Ok() override; public: SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &); virtual ~SwOutlineTabDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SwNumRule* GetNumRule() {return pNumRule;} sal_uInt16 GetLevel(const OUString &rFormatName) const; @@ -122,15 +122,15 @@ class SwOutlineSettingsTabPage : public SfxTabPage public: SwOutlineSettingsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwOutlineSettingsTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetWrtShell(SwWrtShell* pShell); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; - 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; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index a72d20e92d72..666957c39e77 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -38,11 +38,11 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } - 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; virtual ~SwFootNotePage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr<RadioButton> m_pMaxHeightPageBtn; @@ -68,8 +68,8 @@ private: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; }; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 95a084e47bc5..7180ad473587 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -86,16 +86,16 @@ class SwTextGridPage: public SfxTabPage public: SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwTextGridPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); - 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; - virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; }; #endif diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx index e4b0c66f96f1..43b6ce338e74 100644 --- a/sw/source/uibase/inc/popbox.hxx +++ b/sw/source/uibase/inc/popbox.hxx @@ -31,9 +31,9 @@ class SwHelpToolBox: public ToolBox, public DropTargetHelper using ToolBox::DoubleClick; protected: - virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent &rEvt) override; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; public: SwHelpToolBox(SwNavigationPI* pParent, const ResId &); diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index c24fa277ae94..e07f066d45ab 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -65,11 +65,11 @@ public: virtual ~SwPagePreviewWin(); // calls SwViewShell::Paint - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent & ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void KeyInput( const KeyEvent & ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void MouseButtonDown(const MouseEvent& rMEvt) override; + virtual void DataChanged( const DataChangedEvent& ) override; void SetViewShell( SwViewShell* pShell ); @@ -141,7 +141,7 @@ public: return maPaintedPreviewDocRect; } - void Scroll(long nXMove, long nYMove, ScrollFlags nFlags = ScrollFlags::NONE) SAL_OVERRIDE; + void Scroll(long nXMove, long nYMove, ScrollFlags nFlags = ScrollFlags::NONE) override; /** Method to enable/disable book preview @param _bBookPreview @@ -152,7 +152,7 @@ public: */ bool SetBookPreviewMode( const bool _bBookPreview ); - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; }; /** @@ -200,10 +200,10 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell DECL_DLLPRIVATE_LINK_TYPED(EndScrollHdl, ScrollBar*, void); SAL_DLLPRIVATE bool ChgPage( int eMvMode, bool bUpdateScrollbar = true ); - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; + SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) override; + SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override; + SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions ) override; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, bool bInner ); @@ -220,8 +220,8 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SfxRequest* _pReq = 0 ); protected: - 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; void SetZoom(SvxZoomType eSet, sal_uInt16 nFactor); diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 07c31232d494..3c7b4810f97a 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -140,10 +140,10 @@ class SwModelessRedlineAcceptDlg : public SfxModelessDialog public: SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, vcl::Window *pParent); virtual ~SwModelessRedlineAcceptDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Activate() SAL_OVERRIDE; - virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; + virtual void Activate() override; + virtual void FillInfo(SfxChildWinInfo&) const override; void Initialize (SfxChildWinInfo* pInfo); }; @@ -157,7 +157,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID( SwRedlineAcceptChild ); - virtual bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; + virtual bool ReInitDlg(SwDocShell *pDocSh) override; }; /// Redline (Manage Changes) panel for the sidebar. @@ -167,11 +167,11 @@ class SwRedlineAcceptPanel : public PanelLayout, public SfxListener public: SwRedlineAcceptPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame); virtual ~SwRedlineAcceptPanel(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// We need to be a SfxListener to be able to update the list of changes when we get SFX_HINT_DOCCHANGED. using Control::Notify; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; }; #endif diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 22b94605f697..0bbb394eddb3 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -131,7 +131,7 @@ class SwEditRegionDlg : public SfxModalDialog public: SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ); virtual ~SwEditRegionDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SelectSection(const OUString& rSectionName); @@ -183,12 +183,12 @@ class SwInsertSectionTabPage : public SfxTabPage public: SwInsertSectionTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet); virtual ~SwInsertSectionTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetWrtShell(SwWrtShell& rSh); - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet* ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -228,10 +228,10 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage public: SwSectionFootnoteEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFootnoteEndTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet* ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -247,10 +247,10 @@ class SwSectionIndentTabPage : public SfxTabPage public: SwSectionIndentTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet* ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -270,8 +270,8 @@ class SwInsertSectionTabDialog : public SfxTabDialog sal_uInt16 m_nIndentPage; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; - virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; + virtual short Ok() override; public: SwInsertSectionTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwInsertSectionTabDialog(); @@ -290,7 +290,7 @@ class SwSectionPropertyTabDialog : public SfxTabDialog sal_uInt16 m_nIndentPage; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; public: SwSectionPropertyTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwSectionPropertyTabDialog(); diff --git a/sw/source/uibase/inc/rowht.hxx b/sw/source/uibase/inc/rowht.hxx index 9727c8d9d555..4dd2565287a6 100644 --- a/sw/source/uibase/inc/rowht.hxx +++ b/sw/source/uibase/inc/rowht.hxx @@ -33,12 +33,12 @@ class SwTableHeightDlg : public SvxStandardDialog SwWrtShell &rSh; protected: - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SwTableHeightDlg( vcl::Window *pParent, SwWrtShell &rS ); virtual ~SwTableHeightDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx index 1c43a34e1e2d..d2d6ff267985 100644 --- a/sw/source/uibase/inc/scroll.hxx +++ b/sw/source/uibase/inc/scroll.hxx @@ -35,7 +35,7 @@ class SwScrollbar: public ScrollBar public: void ExtendedShow( bool bVisible = true ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE; + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override; bool IsVisible(bool bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; } // changing of document size diff --git a/sw/source/uibase/inc/selglos.hxx b/sw/source/uibase/inc/selglos.hxx index 81914a479142..3dfb3ec8c149 100644 --- a/sw/source/uibase/inc/selglos.hxx +++ b/sw/source/uibase/inc/selglos.hxx @@ -35,7 +35,7 @@ protected: public: SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName); virtual ~SwSelGlossaryDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void InsertGlos(const OUString &rRegion, const OUString &rGlosName) { diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx index 456108504aac..9e50950ba0c0 100644 --- a/sw/source/uibase/inc/splittbl.hxx +++ b/sw/source/uibase/inc/splittbl.hxx @@ -36,12 +36,12 @@ class SwSplitTableDlg : public SvxStandardDialog sal_uInt16 m_nSplit; protected: - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: SwSplitTableDlg( vcl::Window *pParent, SwWrtShell &rSh ); virtual ~SwSplitTableDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt16 GetSplitMode() const { return m_nSplit; } }; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index 1fdd395228e0..e7cea26f9e10 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -43,13 +43,13 @@ class TextViewOutWin : public vcl::Window ExtTextView* pTextView; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKeyEvt ) 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 Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void KeyInput( const KeyEvent& rKeyEvt ) 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 DataChanged( const DataChangedEvent& ) override; public: TextViewOutWin(vcl::Window* pParent, WinBits nBits) : @@ -102,22 +102,22 @@ private: protected: - virtual void Resize() SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void Resize() override; + virtual void DataChanged( const DataChangedEvent& ) override; + virtual void GetFocus() override; // virtual void LoseFocus(); void CreateTextEngine(); void DoSyntaxHighlight( sal_uInt16 nPara ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); public: SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ); virtual ~SwSrcEditWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetScrollBarRanges(); void InitScrollBars(); @@ -132,7 +132,7 @@ public: TextViewOutWin* GetOutWin() {return pOutWin;} - virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) SAL_OVERRIDE; + virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) override; void ClearModifyFlag() { pTextEngine->SetModified(false); } @@ -146,7 +146,7 @@ public: void SetStartLine(sal_uInt16 nLine){nStartLine = nLine;} - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; void HandleWheelCommand( const CommandEvent& rCEvt ); void SetTextEncoding(rtl_TextEncoding eEncoding); diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx index 3999908a9090..e381e4c201a6 100644 --- a/sw/source/uibase/inc/srcview.hxx +++ b/sw/source/uibase/inc/srcview.hxx @@ -41,7 +41,7 @@ class SwSrcView: public SfxViewShell void Init(); // for read-only switching - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; protected: sal_uInt16 StartSearchAndReplace(const SvxSearchItem& rItem, @@ -77,8 +77,8 @@ public: void Load(SwDocShell* pDocShell); - virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, SfxPrinterChangeFlags nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; - virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; + virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, SfxPrinterChangeFlags nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ) override; + virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly ); diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index e67b47a7e7bb..db80c6f8014a 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -74,7 +74,7 @@ class SwSortDlg : public SvxStandardDialog sal_uInt16 nX; sal_uInt16 nY; - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; sal_Unicode GetDelimChar() const; DECL_LINK_TYPED( CheckHdl, Button*, void ); @@ -86,7 +86,7 @@ class SwSortDlg : public SvxStandardDialog public: SwSortDlg(vcl::Window * pParent, SwWrtShell &rSh); virtual ~SwSortDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index a778987903b5..b2b791a9a212 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -135,14 +135,14 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper SwTransferable& operator=( const SwTransferable& ) = delete; protected: - 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 css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; - virtual void ObjectReleased() SAL_OVERRIDE; + const css::datatransfer::DataFlavor& rFlavor ) override; + virtual void DragFinished( sal_Int8 nDropAction ) override; + virtual void ObjectReleased() override; using TransferableHelper::StartDrag; @@ -204,7 +204,7 @@ public: void Invalidate() {m_pWrtShell = 0;} static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); - 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 diff --git a/sw/source/uibase/inc/swlbox.hxx b/sw/source/uibase/inc/swlbox.hxx index d07472f99df5..be17d9871897 100644 --- a/sw/source/uibase/inc/swlbox.hxx +++ b/sw/source/uibase/inc/swlbox.hxx @@ -64,9 +64,9 @@ public: virtual ~SwComboBox(); void InsertSwEntry(const SwBoxEntry&); - virtual sal_Int32 InsertEntry(const OUString& rStr, sal_Int32 = 0) SAL_OVERRIDE; + virtual sal_Int32 InsertEntry(const OUString& rStr, sal_Int32 = 0) override; - virtual void RemoveEntryAt(sal_Int32 nPos) SAL_OVERRIDE; + virtual void RemoveEntryAt(sal_Int32 nPos) override; sal_Int32 GetSwEntryPos(const SwBoxEntry& rEntry) const; const SwBoxEntry& GetSwEntry(sal_Int32) const; diff --git a/sw/source/uibase/inc/swmessdialog.hxx b/sw/source/uibase/inc/swmessdialog.hxx index c8028265e616..edced676f6ab 100644 --- a/sw/source/uibase/inc/swmessdialog.hxx +++ b/sw/source/uibase/inc/swmessdialog.hxx @@ -29,7 +29,7 @@ public: SwMessageAndEditDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription); virtual ~SwMessageAndEditDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWMESSDIALOG_HXX diff --git a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx index 2a4728a689e1..863f2d6d30c1 100644 --- a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx @@ -30,10 +30,10 @@ class SwModalRedlineAcceptDlg : public SfxModalDialog public: SwModalRedlineAcceptDlg(vcl::Window *pParent); virtual ~SwModalRedlineAcceptDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void AcceptAll( bool bAccept ); - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; }; #endif diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx index 523dcce86a26..3661d73b9b8e 100644 --- a/sw/source/uibase/inc/swrenamexnameddlg.hxx +++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx @@ -49,7 +49,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess ); virtual ~SwRenameXNamedDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetForbiddenChars(const OUString& rSet) { diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 9f22e2b50356..d04043961249 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -34,13 +34,13 @@ public: SfxBindings& rBindings, WinBits nWinStyle); virtual ~SwCommentRuler (); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** * Paint the ruler. * \param rRect ignored */ - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; protected: SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility @@ -55,26 +55,26 @@ protected: * * When on comment control, it toggles the comment panel visibility. */ - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; /** * Callback function to handle a mouse move event. * * When on comment control, it let the control responsive by highlighting. */ - virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) override; /** * Callback function to handle a context menu call (mouse right button click). * * When on comment control, it does not do anything. */ - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; /** * Update the view. * * Update the ruler appearance according to the document view and * current cursor position. */ - virtual void Update() SAL_OVERRIDE; + virtual void Update() override; /** * Get the rectangle area that should be used to draw the comment control. diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 684023fb526c..0dbbce3a3c17 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -48,9 +48,9 @@ class SwCondCollPage : public SfxTabPage bool m_bNewTemplate; virtual ~SwCondCollPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; DECL_LINK_TYPED( OnOffHdl, Button*, void ); DECL_LINK_TYPED( AssignRemoveHdl, ListBox&, void); @@ -72,8 +72,8 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return m_aPageRg; } - 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; void SetCollection( SwFormat* pFormat, bool bNew ); }; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index d27e74404d9d..a5e8608f5813 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -90,7 +90,7 @@ class SwMultiTOXTabDialog : public SfxTabDialog bool bExampleCreated; bool bGlobalFlag; - virtual short Ok() SAL_OVERRIDE; + virtual short Ok() override; SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); DECL_LINK_TYPED(CreateExample_Hdl, SwOneExampleFrame&, void); @@ -102,9 +102,9 @@ public: SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, bool bGlobal = false); virtual ~SwMultiTOXTabDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; SwForm* GetForm(CurTOXType eType); @@ -222,13 +222,13 @@ class SwTOXSelectTabPage : public SfxTabPage public: SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXSelectTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet* ) override; - 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; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -285,7 +285,7 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer public: SwTokenWindow(vcl::Window* pParent); virtual ~SwTokenWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetTabPage(SwTOXEntryTabPage *pParent) { m_pParent = pParent; } @@ -315,8 +315,8 @@ public: bool CreateQuickHelp(Control* pCtrl, const SwFormToken& rToken, const HelpEvent& ); - virtual void GetFocus() SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void setAllocation(const Size &rAllocation) override; void SetFocus2theAllBtn(); private: sal_uInt32 GetControlIndex(FormTokenType eType) const; @@ -328,11 +328,11 @@ class SwIdxTreeListBox : public SvTreeListBox { VclPtr<SwTOXEntryTabPage> pParent; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; public: SwIdxTreeListBox(vcl::Window* pPar, WinBits nStyle); virtual ~SwIdxTreeListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetTabPage(SwTOXEntryTabPage* pPar) { pParent = pPar; } }; @@ -438,12 +438,12 @@ class SwTOXEntryTabPage : public SfxTabPage public: SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXEntryTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet* ) override; + virtual void ActivatePage( const SfxItemSet& ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -453,7 +453,7 @@ public: void PreTokenButtonRemoved(const SwFormToken& rToken); void SetFocus2theAllBtn(); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; }; class SwTOXStylesTabPage : public SfxTabPage @@ -485,13 +485,13 @@ class SwTOXStylesTabPage : public SfxTabPage public: SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXStylesTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) override; + virtual void Reset( const SfxItemSet* ) override; - 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; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index 4fe7e7959722..9d0cf903c92d 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -152,7 +152,7 @@ public: class SwIndexMarkFloatDlg : public SfxModelessDialog { SwIndexMarkPane m_aContent; - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; public: SwIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, @@ -168,7 +168,7 @@ class SwIndexMarkModalDlg : public SvxStandardDialog public: SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; }; class SwAuthMarkModalDlg; @@ -227,7 +227,7 @@ public: class SwAuthMarkFloatDlg : public SfxModelessDialog { SwAuthorMarkPane m_aContent; - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; public: SwAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, @@ -243,7 +243,7 @@ class SwAuthMarkModalDlg : public SvxStandardDialog public: SwAuthMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh); - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWUIIDXMRK_HXX diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx index 6a9c8a6ea6af..874c090c5f93 100644 --- a/sw/source/uibase/inc/swuipardlg.hxx +++ b/sw/source/uibase/inc/swuipardlg.hxx @@ -37,7 +37,7 @@ class SwParaDlg: public SfxTabDialog sal_uInt16 m_nAreaId; sal_uInt16 m_nTransparenceId; - void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; + void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override; public: SwParaDlg( vcl::Window *pParent, diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx index af5836c6999e..99c678764c75 100644 --- a/sw/source/uibase/inc/swwrtshitem.hxx +++ b/sw/source/uibase/inc/swwrtshitem.hxx @@ -33,8 +33,8 @@ public: SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); SwWrtShellItem( const SwWrtShellItem& ); - 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; SwWrtShell* GetValue() const { return pWrtSh; } diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx index 6f6d8f5c7d12..7dc2c24f9b71 100644 --- a/sw/source/uibase/inc/syncbtn.hxx +++ b/sw/source/uibase/inc/syncbtn.hxx @@ -32,7 +32,7 @@ class SwSyncBtnDlg : public SfxFloatingWindow public: SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); virtual ~SwSyncBtnDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class SwSyncChildWin : public SfxChildWindow diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx index 2bd62de07066..45f9ca152e33 100644 --- a/sw/source/uibase/inc/tabledlg.hxx +++ b/sw/source/uibase/inc/tabledlg.hxx @@ -35,7 +35,7 @@ class SwTableTabDlg : public SfxTabDialog sal_uInt16 m_nBackgroundId; sal_uInt16 m_nBorderId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override; public: SwTableTabDlg( vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh ); diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index 2c6b868c81b4..523f1aebd052 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -82,7 +82,7 @@ public: bool bSetAutoFormat = true, const SwTableAutoFormat* pSelFormat = 0 ); virtual ~SwAutoFormatDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const; }; diff --git a/sw/source/uibase/inc/tbxanchr.hxx b/sw/source/uibase/inc/tbxanchr.hxx index fcc6db520fe9..5ee3595f8d87 100644 --- a/sw/source/uibase/inc/tbxanchr.hxx +++ b/sw/source/uibase/inc/tbxanchr.hxx @@ -27,9 +27,9 @@ class SwTbxAnchor : public SfxToolBoxControl public: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void Click() SAL_OVERRIDE; - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void Click() override; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index d461e5a5fda5..370fce92670b 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -63,7 +63,7 @@ private: public: SwTitlePageDlg( vcl::Window *pParent ); virtual ~SwTitlePageDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; #endif diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx index dd60e200787a..db280d42c315 100644 --- a/sw/source/uibase/inc/tmpdlg.hxx +++ b/sw/source/uibase/inc/tmpdlg.hxx @@ -76,10 +76,10 @@ public: SwWrtShell* pActShell = 0, bool bNew = false ); - virtual void RefreshInputSet() SAL_OVERRIDE; + virtual void RefreshInputSet() override; - virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; - virtual short Ok() SAL_OVERRIDE; + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; + virtual short Ok() override; }; #endif diff --git a/sw/source/uibase/inc/tmplctrl.hxx b/sw/source/uibase/inc/tmplctrl.hxx index 37722d748590..fec163968e19 100644 --- a/sw/source/uibase/inc/tmplctrl.hxx +++ b/sw/source/uibase/inc/tmplctrl.hxx @@ -24,11 +24,11 @@ class SwTemplateControl : public SfxStatusBarControl { protected: - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; + virtual void Paint( const UserDrawEvent& rEvt ) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 54427c49bec7..3b23ac631bf1 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -39,16 +39,16 @@ public: SwPageFootnoteInfoItem(const SwPageFootnoteInfoItem& rItem ); virtual ~SwPageFootnoteInfoItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const 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; + const IntlWrapper* pIntl = 0 ) 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; SwPageFootnoteInfo& GetPageFootnoteInfo() { return aFootnoteInfo; } const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return aFootnoteInfo; } @@ -62,8 +62,8 @@ public: SwPtrItem( const sal_uInt16 nId = FN_PARAM_GRF_DIALOG, void* pPtr = 0); SwPtrItem( const SwPtrItem& rItem ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual bool operator==( const SfxPoolItem& ) const override; void* GetValue() const { return pMisc; } }; @@ -77,11 +77,11 @@ public: SwUINumRuleItem( const SwUINumRuleItem& rItem ); virtual ~SwUINumRuleItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual bool operator==( const SfxPoolItem& ) 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 SwNumRule* GetNumRule() const { return pRule; } SwNumRule* GetNumRule() { return pRule; } @@ -92,7 +92,7 @@ class SwBackgroundDestinationItem : public SfxUInt16Item public: SwBackgroundDestinationItem(sal_uInt16 nWhich, sal_uInt16 nValue); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; }; class SW_DLLPUBLIC SwPaMItem : public SfxPoolItem @@ -103,8 +103,8 @@ public: SwPaMItem( const sal_uInt16 nId = FN_PARAM_PAM, SwPaM* pPaM = NULL); SwPaMItem( const SwPaMItem& rItem ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual bool operator==( const SfxPoolItem& ) const override; SwPaM* GetValue() const { return m_pPaM; } }; diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index 2a88b7229a5d..a1558fd82298 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -57,7 +57,7 @@ public: // XEventListener virtual void SAL_CALL disposing( - const ::com::sun::star::lang::EventObject& rEventObject ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const ::com::sun::star::lang::EventObject& rEventObject ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; void ViewDestroyed() { pView = 0; } }; @@ -70,12 +70,12 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper< // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObject ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // XClipboardListener virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& rEventObject ) throw (com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; public: SwClipboardChangeListener( SwView& rView ) : pView( &rView ) {} diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx index 9563e16a4f01..acaa4033b36a 100644 --- a/sw/source/uibase/inc/unoatxt.hxx +++ b/sw/source/uibase/inc/unoatxt.hxx @@ -64,26 +64,26 @@ public: SwXAutoTextContainer(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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; + 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 ) override; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::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& Name) 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; + 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; //XAutoTextContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup > SAL_CALL insertNewByName(const OUString& aGroupName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) 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; }; @@ -111,44 +111,44 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //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; //XAutoTextGroup - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::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 void SAL_CALL setName(const OUString& Name_) 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& Name_) 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 ::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; + 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 ) override; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::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& Name) 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; + 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; //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 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; - 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; - 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; - 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; - 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; - 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; + 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) 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) 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) 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) 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) 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) override; void Invalidate(); }; @@ -193,7 +193,7 @@ protected: void implFlushDocument( bool _bCloseDoc = false ); // SfxListener overridables - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; protected: virtual ~SwXAutoTextEntry(); // ref-counted objects are not to be deleted from outside -> protected dtor @@ -204,33 +204,33 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //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; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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; - 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; - 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; - virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL 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 ) 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 ) 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 ) override; + virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::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) 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; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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; - virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL 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 ) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL 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 ) override; //XAutoTextEntry - virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)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; - 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; // 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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; void Invalidate() {pGlossaries = 0;} const SwGlossaries* GetGlossaries() { return pGlossaries; } @@ -254,7 +254,7 @@ public: virtual ~SwAutoTextEventDescriptor(); virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; protected: @@ -265,7 +265,7 @@ protected: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException) override; virtual void getByName( SvxMacro& rMacro, /// macro to be filled @@ -273,7 +273,7 @@ protected: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException) override; }; #endif diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx index 3871d3c18257..51088a65c8c5 100644 --- a/sw/source/uibase/inc/unodispatch.hxx +++ b/sw/source/uibase/inc/unodispatch.hxx @@ -67,21 +67,21 @@ public: virtual ~SwXDispatchProviderInterceptor(); //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; - 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; + 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) 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) 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; - 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; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL 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) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL 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) override; // XEventListener - 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 disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; //XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - 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; // view destroyed void Invalidate(); @@ -109,15 +109,15 @@ public: 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; - 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; - 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; + 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) 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) override; //XSelectionChangeListener - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) 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; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; static const sal_Char* GetDBChangeURL(); }; diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx index 99f21d17a7ef..2620d258b940 100644 --- a/sw/source/uibase/inc/unomailmerge.hxx +++ b/sw/source/uibase/inc/unomailmerge.hxx @@ -140,33 +140,33 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XCancellable - virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() 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 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; - 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; - 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; - 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; - 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; - 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; + 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) 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) 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) 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) 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) 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) override; // XMailMergeBroadcaster - virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) 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 addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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; + 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) 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) 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; }; #endif diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx index 5def889b8ec6..b629a16b242a 100644 --- a/sw/source/uibase/inc/unomod.hxx +++ b/sw/source/uibase/inc/unomod.hxx @@ -54,19 +54,19 @@ public: //XViewSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XPrintSettings virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPrintSettings() - 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; }; enum SwXPrintSettingsType @@ -89,27 +89,27 @@ protected: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; virtual void _postSetValues () throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _preGetValues () throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) override; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; virtual ~SwXPrintSettings() throw(); @@ -118,11 +118,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 SwXViewSettings : public comphelper::ChainableHelperNoState @@ -145,33 +145,33 @@ protected: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void _postSetValues() throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _preGetValues () throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; virtual ~SwXViewSettings() throw(); @@ -179,9 +179,9 @@ public: SwXViewSettings(bool bWeb, SwView* pView); //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; bool IsValid() const {return bObjectValid;} void Invalidate() {bObjectValid = false;} diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index ff7839ca53b9..fbb9fabf9f05 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -42,9 +42,9 @@ class SwFrmCtrlWindow : public VclEventBox public: SwFrmCtrlWindow(vcl::Window* pParent, SwOneExampleFrame* pFrame); - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual Size GetOptimalSize() const override; + virtual void Resize() override; }; class MenuResource : public Resource diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx index aa5fb76a5aec..806d11da27b9 100644 --- a/sw/source/uibase/inc/unotxvw.hxx +++ b/sw/source/uibase/inc/unotxvw.hxx @@ -76,76 +76,76 @@ protected: public: SwXTextView(SwView* pSwView); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 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; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire( ) throw() override; + virtual void SAL_CALL release( ) throw() 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; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) 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) override; //XSelectionSupplier virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& rInterface) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, - std::exception) SAL_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; - 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; + 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 ) 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 ) 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; - virtual sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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) override; + virtual sal_Bool SAL_CALL isFormDesignMode( ) 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) 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 > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + 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 > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override; //XTextViewCursorSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XViewSettings - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XRubySelection virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setRubyList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic ) 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; - 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; + 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) 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; - 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; - 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; - 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; - 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; + 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) 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) 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) 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) 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; //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; - 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; + 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) override; void NotifySelChanged(); void NotifyDBChanged(); @@ -183,154 +183,154 @@ public: DECLARE_XINTERFACE() //XTextViewCursor - virtual sal_Bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //XTextCursor - neu virtual void SAL_CALL collapseToStart() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL collapseToEnd() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL isCollapsed() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XPageCursor virtual sal_Bool SAL_CALL jumpToFirstPage() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL jumpToLastPage() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToNextPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + std::exception) override; + virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL jumpToNextPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getPage() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + 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; + 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; + 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; + std::exception) override; virtual OUString SAL_CALL getString() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL setString(const OUString& aString) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XScreenCursor virtual sal_Bool SAL_CALL screenDown() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL screenUp() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XViewCursor virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; //XLineCursor virtual sal_Bool SAL_CALL isAtStartOfLine() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL isAtEndOfLine() throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand) 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; + 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; + 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; - 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; - 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; - 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; - 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; + 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) 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) 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) 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) 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; + 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; + 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; + std::exception) 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; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //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; void Invalidate(){m_pView = 0;} // ITextCursorHelper - virtual const SwPaM* GetPaM() const SAL_OVERRIDE; - virtual SwPaM* GetPaM() SAL_OVERRIDE; - virtual const SwDoc* GetDoc() const SAL_OVERRIDE; - virtual SwDoc* GetDoc() SAL_OVERRIDE; + virtual const SwPaM* GetPaM() const override; + virtual SwPaM* GetPaM() override; + virtual const SwDoc* GetDoc() const override; + virtual SwDoc* GetDoc() override; }; #endif diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index 560fafab46e9..865aadf7daec 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -34,14 +34,14 @@ private: com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwContentViewConfig(bool bWeb, SwMasterUsrPref& rParent); virtual ~SwContentViewConfig(); // utl::ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override; void Load(); void SetModified(){ConfigItem::SetModified();} @@ -55,13 +55,13 @@ private: com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwLayoutViewConfig(bool bWeb, SwMasterUsrPref& rParent); virtual ~SwLayoutViewConfig(); - 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; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -73,13 +73,13 @@ private: static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwGridConfig(bool bWeb, SwMasterUsrPref& rParent); virtual ~SwGridConfig(); - 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; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -91,13 +91,13 @@ private: static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwCursorConfig(SwMasterUsrPref& rParent); virtual ~SwCursorConfig(); - 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; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -108,13 +108,13 @@ private: SwMasterUsrPref& rParent; com::sun::star::uno::Sequence<OUString> aPropNames; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SwWebColorConfig(SwMasterUsrPref& rParent); virtual ~SwWebColorConfig(); - 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; void Load(); void SetModified(){ConfigItem::SetModified();} }; diff --git a/sw/source/uibase/inc/viewlayoutctrl.hxx b/sw/source/uibase/inc/viewlayoutctrl.hxx index fb47e04263be..240dbb083a7b 100644 --- a/sw/source/uibase/inc/viewlayoutctrl.hxx +++ b/sw/source/uibase/inc/viewlayoutctrl.hxx @@ -35,10 +35,10 @@ public: SwViewLayoutControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); virtual ~SwViewLayoutControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; - virtual bool MouseButtonDown( const MouseEvent & ) SAL_OVERRIDE; - virtual bool MouseMove( const MouseEvent & ) SAL_OVERRIDE; + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void Paint( const UserDrawEvent& rEvt ) override; + virtual bool MouseButtonDown( const MouseEvent & ) override; + virtual bool MouseMove( const MouseEvent & ) override; }; #endif diff --git a/sw/source/uibase/inc/wordcountctrl.hxx b/sw/source/uibase/inc/wordcountctrl.hxx index 8d2aeeb05d54..9130600ae3f0 100644 --- a/sw/source/uibase/inc/wordcountctrl.hxx +++ b/sw/source/uibase/inc/wordcountctrl.hxx @@ -28,7 +28,7 @@ public: virtual ~SwWordCountStatusBarControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; }; diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx index 0b52b2d230b7..75dbd31e0552 100644 --- a/sw/source/uibase/inc/wordcountdialog.hxx +++ b/sw/source/uibase/inc/wordcountdialog.hxx @@ -28,7 +28,7 @@ struct SwDocStat; class SwWordCountFloatDlg : public SfxModelessDialog { - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc); void showCJK(bool bShowCJK); void showStandardizedPages(bool bShowStandardizedPages); @@ -57,7 +57,7 @@ public: vcl::Window *pParent, SfxChildWinInfo* pInfo); virtual ~SwWordCountFloatDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void UpdateCounts(); void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat); diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index 3362d314d02a..6f65bb7c14a1 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -63,10 +63,10 @@ public: SwTbxAutoTextCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwTbxAutoTextCtrl(); - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; DECL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool); }; @@ -79,10 +79,10 @@ public: SwTbxFieldCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwTbxFieldCtrl(); - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; }; class SwScrollNaviPopup; @@ -91,8 +91,8 @@ class SwScrollNaviToolBox : public ToolBox { VclPtr<SwScrollNaviPopup> m_pNaviPopup; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; public: SwScrollNaviToolBox(vcl::Window* pParent, SwScrollNaviPopup* pNaviPopup, WinBits nWinStyle) @@ -101,7 +101,7 @@ public: { } virtual ~SwScrollNaviToolBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class SwScrollNaviPopup : public SfxPopupWindow @@ -118,12 +118,12 @@ class SwScrollNaviPopup : public SfxPopupWindow protected: DECL_LINK_TYPED(SelectHdl, ToolBox*, void); - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window *pParent ); virtual ~SwScrollNaviPopup(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static OUString GetQuickHelpText(bool bNext); @@ -139,7 +139,7 @@ class SwHlpImageButton : public ImageButton SwHlpImageButton(vcl::Window* pParent, const ResId& rResId, bool bUpBtn) : ImageButton(pParent, rResId), bUp(bUpBtn){} - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; }; @@ -153,9 +153,9 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; - virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; + virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override; }; #endif diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index dc2720013da5..0bd251d83c23 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -78,12 +78,12 @@ class SwWrapTabPage: public SfxTabPage bool m_bContourImage; virtual ~SwWrapTabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ApplyImageList(); - virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void ActivatePage(const SfxItemSet& rSet) override; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; DECL_LINK( RangeModifyHdl, MetricField * ); DECL_LINK_TYPED( RangeLoseFocusHdl, Control&, void ); @@ -100,8 +100,8 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); - 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; static const sal_uInt16* GetRanges() { return m_aWrapPageRg; } inline void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 904da2b56aad..421152791b11 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -326,13 +326,13 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = 0 ); void LaunchOLEObj( long nVerb = 0 ); // start server - virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) SAL_OVERRIDE; + virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) override; virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, const SwRect *pFlyFrmRect = 0, - const bool bNoTextFrmPrtAreaChanged = false ) SAL_OVERRIDE; + const bool bNoTextFrmPrtAreaChanged = false ) override; virtual void ConnectObj( svt::EmbeddedObjectRef& xIPObj, const SwRect &rPrt, - const SwRect &rFrm ) SAL_OVERRIDE; + const SwRect &rFrm ) override; // styles and formats @@ -392,7 +392,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool StartDropDownFieldDlg(SwField*, bool bNextButton, OString* pWindowState = 0); //"Handler" for changes at DrawView - for controls. - virtual void DrawSelChanged( ) SAL_OVERRIDE; + virtual void DrawSelChanged( ) override; // jump to bookmark and set the "selections-flags" correctly again bool GotoMark( const ::sw::mark::IMark* const pMark ); @@ -432,8 +432,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void NavigatorPaste( const NaviContentBookmark& rBkmk, const sal_uInt16 nAction ); - virtual void ApplyViewOptions( const SwViewOption &rOpt ) SAL_OVERRIDE; - virtual void SetReadonlyOption( bool bSet ) SAL_OVERRIDE; + virtual void ApplyViewOptions( const SwViewOption &rOpt ) override; + virtual void SetReadonlyOption( bool bSet ) override; // automatic update of styles void AutoUpdateFrame(SwFrameFormat* pFormat, const SfxItemSet& rStyleSet); @@ -469,7 +469,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, bool bSelect = false); void ChangeHeaderOrFooter(const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning); - virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) SAL_OVERRIDE; + virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) override; private: diff --git a/sw/source/uibase/inc/wview.hxx b/sw/source/uibase/inc/wview.hxx index 44e44f7e5f77..40b1f8872ed7 100644 --- a/sw/source/uibase/inc/wview.hxx +++ b/sw/source/uibase/inc/wview.hxx @@ -25,7 +25,7 @@ class SW_DLLPUBLIC SwWebView: public SwView { protected: - virtual void SelectShell() SAL_OVERRIDE; + virtual void SelectShell() override; public: SFX_DECL_VIEWFACTORY(SwWebView); diff --git a/sw/source/uibase/inc/zoomctrl.hxx b/sw/source/uibase/inc/zoomctrl.hxx index 758b674684fe..f4d04b4239f6 100644 --- a/sw/source/uibase/inc/zoomctrl.hxx +++ b/sw/source/uibase/inc/zoomctrl.hxx @@ -26,10 +26,10 @@ class SwZoomControl : public SvxZoomStatusBarControl private: OUString sPreviewZoom; public: - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + const SfxPoolItem* pState ) override; + virtual void Paint( const UserDrawEvent& rEvt ) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/uibase/lingu/sdrhhcwrap.hxx b/sw/source/uibase/lingu/sdrhhcwrap.hxx index 88f4ed742431..cd3da9107555 100644 --- a/sw/source/uibase/lingu/sdrhhcwrap.hxx +++ b/sw/source/uibase/lingu/sdrhhcwrap.hxx @@ -47,7 +47,7 @@ public: virtual ~SdrHHCWrapper(); - virtual bool ConvertNextDocument() SAL_OVERRIDE; + virtual bool ConvertNextDocument() override; void StartTextConversion(); }; diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 3306d4a5b9bd..8c26419167d8 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -456,8 +456,8 @@ public: virtual ~SwZoomBox_Impl(); protected: - virtual void Select() SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Select() override; + virtual bool Notify( NotifyEvent& rNEvt ) override; void ReleaseFocus(); diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index cb65f2f18cd3..0a5120785575 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -96,7 +96,7 @@ public: { } - virtual void Update(Graphic & rGraphic) SAL_OVERRIDE + virtual void Update(Graphic & rGraphic) override { DBG_TESTSOLARMUTEX(); m_pShell->Push(); diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index c7671c144d31..796cb84ea4ce 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -46,7 +46,7 @@ public: const bool bLandscape ); virtual ~PageColumnControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr< svx::sidebar::ValueSetWithTextControl> mpColumnValueSet; diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index be2ded8d722c..31c226cb47da 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -62,7 +62,7 @@ public: const FieldUnit eFUnit, const SfxMapUnit eUnit ); virtual ~PageMarginControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr< svx::sidebar::ValueSetWithTextControl> mpMarginValueSet; diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index 69dc50074848..7d44d7b58bcd 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -40,7 +40,7 @@ public: PagePropertyPanel& rPanel, const bool bLandscape ); virtual ~PageOrientationControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr< svx::sidebar::ValueSetWithTextControl> mpOrientationValueSet; diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index d19b8f453a04..a575e8eb3840 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -64,7 +64,7 @@ namespace sw { namespace sidebar { const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled) SAL_OVERRIDE; + const bool bIsEnabled) override; SfxBindings* GetBindings() const { @@ -102,7 +102,7 @@ namespace sw { namespace sidebar { SfxBindings* pBindings ); private: virtual ~PagePropertyPanel(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SfxBindings* mpBindings; diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index 59ce8845cdd2..f434b2b2ca55 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -49,7 +49,7 @@ public: const bool bLandscape, const FieldUnit eFUnit ); virtual ~PageSizeControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: VclPtr< svx::sidebar::ValueSetWithTextControl> mpSizeValueSet; diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx index f30d560667cc..921c056ddbf9 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx @@ -54,7 +54,7 @@ public: virtual void NotifyItemUpdate(const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled) SAL_OVERRIDE; + const bool bIsEnabled) override; private: struct TemplateEntry @@ -75,7 +75,7 @@ private: SfxBindings* pBindings); virtual ~StylePresetsPanel(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SfxBindings* mpBindings; diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index ae6feab3ca69..5181ac3be1f0 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -64,18 +64,18 @@ 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 { return OUString("org.apache.openoffice.comp.sw.sidebar.SwPanelFactory"); } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; } }; diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx index a7a09d773022..ae8a37ecc51f 100644 --- a/sw/source/uibase/sidebar/ThemePanel.hxx +++ b/sw/source/uibase/sidebar/ThemePanel.hxx @@ -54,7 +54,7 @@ public: virtual void NotifyItemUpdate(const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled) SAL_OVERRIDE; + const bool bIsEnabled) override; private: ThemePanel(vcl::Window* pParent, @@ -62,7 +62,7 @@ private: SfxBindings* pBindings); virtual ~ThemePanel(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SfxBindings* mpBindings; diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx index b64b32e70740..38230b51fac9 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx @@ -44,10 +44,10 @@ namespace sw { namespace sidebar { const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled) SAL_OVERRIDE; + const bool bIsEnabled) override; virtual ~WrapPropertyPanel(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; WrapPropertyPanel( vcl::Window* pParent, diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 40f5a9314081..e947e2c82d6c 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -83,13 +83,13 @@ class SwFormatTablePage : public SfxTabPage public: SwFormatTablePage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwFormatTablePage(); - 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 void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ActivatePage( const SfxItemSet& rSet ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; }; // TabPage Format/Table/Columns @@ -134,13 +134,13 @@ class SwTableColumnPage : public SfxTabPage public: SwTableColumnPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTableColumnPage(); - 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 void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) override; + virtual void Reset( const SfxItemSet* rSet ) override; + virtual void ActivatePage( const SfxItemSet& rSet ) override; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; }; @@ -184,10 +184,10 @@ class SwTextFlowPage : public SfxTabPage public: SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTextFlowPage(); - 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; void SetShell(SwWrtShell* pSh); diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 7798f39c5550..ee4f6a767188 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -148,12 +148,12 @@ class SwPreviewZoomDlg : public SvxStandardDialog VclPtr<NumericField> m_pRowEdit; VclPtr<NumericField> m_pColEdit; - virtual void Apply() SAL_OVERRIDE; + virtual void Apply() override; public: explicit SwPreviewZoomDlg( SwPagePreviewWin& rParent ); virtual ~SwPreviewZoomDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; SwPreviewZoomDlg::SwPreviewZoomDlg( SwPagePreviewWin& rParent ) diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 29ad1bcf791e..584c57129a64 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -828,7 +828,7 @@ private: public: SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ); virtual ~SwFieldDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; SwFieldDialog::SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ) : diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx index f7688b0b5512..edd0c703ca81 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.hxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx @@ -49,22 +49,22 @@ protected: VclPtr<SfxPrinter> mpPrinter; virtual void _preSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void _postSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; virtual void _preGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE; + css::uno::RuntimeException) override; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) override; protected: virtual ~SwXDocumentSettings() throw(); @@ -73,23 +73,23 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - 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; + throw () override; virtual void SAL_CALL release( ) - throw () SAL_OVERRIDE; + throw () 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; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) 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) override; }; #endif diff --git a/sw/source/uibase/uno/unodefaults.hxx b/sw/source/uibase/uno/unodefaults.hxx index 465226a109ff..5a22d6043405 100644 --- a/sw/source/uibase/uno/unodefaults.hxx +++ b/sw/source/uibase/uno/unodefaults.hxx @@ -30,7 +30,7 @@ public: SwSvxUnoDrawPool( SwDoc* pDoc ) throw(); virtual ~SwSvxUnoDrawPool() throw(); - virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() SAL_OVERRIDE; + virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() override; }; #endif diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 2d241fd3dac8..657d5d54d6a1 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -203,11 +203,11 @@ namespace virtual ~DelayedFileDeletion( ); // XCloseListener - virtual void SAL_CALL queryClosing( const EventObject& _rSource, sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL notifyClosing( const EventObject& _rSource ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL queryClosing( const EventObject& _rSource, sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception) override; + virtual void SAL_CALL notifyClosing( const EventObject& _rSource ) throw (RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; private: void implTakeOwnership( ); diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx index 8bf731e9e20c..5d11b2892d1d 100644 --- a/sw/source/uibase/uno/unomodule.hxx +++ b/sw/source/uibase/uno/unomodule.hxx @@ -58,22 +58,22 @@ public: {} // XNotifyingDispatch - virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override; // XDispatchProvider - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) override ; virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , const OUString & sTargetFrameName, - sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) override ; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx index 38366cb97ab6..71c34527f1a5 100644 --- a/sw/source/uibase/utlui/bookctrl.cxx +++ b/sw/source/uibase/utlui/bookctrl.cxx @@ -46,7 +46,7 @@ public: private: sal_uInt16 nCurId; - virtual void Select() SAL_OVERRIDE; + virtual void Select() override; }; BookmarkPopup_Impl::BookmarkPopup_Impl() : diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 0c6d105f0c20..3fd0e98e910b 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3459,7 +3459,7 @@ public: const OUString& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {} 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 SwContentTree::InitEntry(SvTreeListEntry* pEntry, diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index d393b1e81726..100fddaa9cf2 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -133,7 +133,7 @@ public: StartListening(rFrame); } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; bool IsValid() const {return bValid;} }; diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 77643b0ff4fe..adb7a9d85084 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -60,7 +60,7 @@ class SwGlossDecideDlg : public ModalDialog public: explicit SwGlossDecideDlg(vcl::Window* pParent); virtual ~SwGlossDecideDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; ListBox& GetListBox() {return *m_pListLB;} }; diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index 4580ea8dff33..a676c00f273d 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -45,7 +45,7 @@ public: private: sal_uInt16 nCurId; - virtual void Select() SAL_OVERRIDE; + virtual void Select() override; }; SwTemplatePopup_Impl::SwTemplatePopup_Impl() : diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index 2d9e241c8290..cb690424a655 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -207,7 +207,7 @@ class FieldDeletionModify : public SwModify } } - void Modify( const SfxPoolItem* pOld, const SfxPoolItem *) SAL_OVERRIDE + void Modify( const SfxPoolItem* pOld, const SfxPoolItem *) override { // Input field has been deleted: better to close the dialog if (pOld) |