diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /include/svtools | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svtools')
72 files changed, 761 insertions, 761 deletions
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index 3ebbfec6d9f4..d2aa02aaa101 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -43,9 +43,9 @@ public: ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits); virtual ~ODocumentInfoPreview(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; void clear(); diff --git a/include/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx index 884e08b3e2a2..34fd5968c589 100644 --- a/include/svtools/GraphicExportOptionsDialog.hxx +++ b/include/svtools/GraphicExportOptionsDialog.hxx @@ -63,7 +63,7 @@ private: public: GraphicExportOptionsDialog( vcl::Window* pWindow, const css::uno::Reference<css::lang::XComponent>& rxSourceDocument ); virtual ~GraphicExportOptionsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; css::uno::Sequence<css::beans::PropertyValue> getFilterData(); }; diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 92bafdb75be9..6fcd3c608bc5 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -64,7 +64,7 @@ public : PlaceEditDialog( vcl::Window* pParent); PlaceEditDialog(vcl::Window* pParent, const std::shared_ptr<Place> &rPlace ); virtual ~PlaceEditDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Returns a place instance with given information std::shared_ptr<Place> GetPlace(); diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index 377cbc3370a6..80d9bcc539ee 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -75,9 +75,9 @@ class HostDetailsContainer : public DetailsContainer HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, const OUString& sScheme ); virtual ~HostDetailsContainer( ) { }; - virtual void show( bool bShow = true ) SAL_OVERRIDE; - virtual INetURLObject getUrl( ) SAL_OVERRIDE; - virtual bool setUrl( const INetURLObject& rUrl ) SAL_OVERRIDE; + virtual void show( bool bShow = true ) override; + virtual INetURLObject getUrl( ) override; + virtual bool setUrl( const INetURLObject& rUrl ) override; protected: void setScheme( const OUString& sScheme ) { m_sScheme = sScheme; } @@ -97,10 +97,10 @@ class DavDetailsContainer : public HostDetailsContainer DavDetailsContainer( VclBuilderContainer* pBuilder ); virtual ~DavDetailsContainer( ) { }; - virtual void show( bool bShow = true ) SAL_OVERRIDE; + virtual void show( bool bShow = true ) override; protected: - virtual bool verifyScheme( const OUString& rScheme ) SAL_OVERRIDE; + virtual bool verifyScheme( const OUString& rScheme ) override; private: DECL_LINK_TYPED( ToggledDavsHdl, CheckBox&, void ); @@ -116,9 +116,9 @@ class SmbDetailsContainer : public DetailsContainer SmbDetailsContainer( VclBuilderContainer* pBuilder ); virtual ~SmbDetailsContainer( ) { }; - virtual INetURLObject getUrl( ) SAL_OVERRIDE; - virtual bool setUrl( const INetURLObject& rUrl ) SAL_OVERRIDE; - virtual void show( bool bShow = true ) SAL_OVERRIDE; + virtual INetURLObject getUrl( ) override; + virtual bool setUrl( const INetURLObject& rUrl ) override; + virtual void show( bool bShow = true ) override; }; class CmisDetailsContainer : public DetailsContainer @@ -140,11 +140,11 @@ class CmisDetailsContainer : public DetailsContainer CmisDetailsContainer( VclBuilderContainer* pBuilder, OUString const & sBinding ); virtual ~CmisDetailsContainer( ) { }; - virtual void show( bool bShow = true ) SAL_OVERRIDE; - virtual INetURLObject getUrl( ) SAL_OVERRIDE; - virtual bool setUrl( const INetURLObject& rUrl ) SAL_OVERRIDE; - virtual void setUsername( const OUString& rUsername ) SAL_OVERRIDE; - virtual void setPassword( const OUString& rPass ) SAL_OVERRIDE; + virtual void show( bool bShow = true ) override; + virtual INetURLObject getUrl( ) override; + virtual bool setUrl( const INetURLObject& rUrl ) override; + virtual void setUsername( const OUString& rUsername ) override; + virtual void setPassword( const OUString& rPass ) override; private: void selectRepository( ); diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index 828532c8faf0..1920871fa4a1 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -53,7 +53,7 @@ public: void SetAutoDetectSystemHC(bool bSet); //SfxListener: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void SetVCLSettings(); }; diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index b8811613da1b..b8918b8d28b6 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -76,93 +76,93 @@ public: //===== XAccessible ===================================================== virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL - containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) 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; + getBounds() 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; + getLocation() 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; + getLocationOnScreen() 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; + getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getForeground( ) 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; + getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL - getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::rtl::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 ::rtl::OUString SAL_CALL - getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) override; //===== XAccessibleEventBroadcaster ===================================== 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; + addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )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; + removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; //===== XServiceInfo ==================================================== virtual ::rtl::OUString SAL_CALL - getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; //===== XTypeProvider =================================================== 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; protected: @@ -173,7 +173,7 @@ protected: Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; /// @returns true if it's disposed or in disposing inline bool IsAlive() const; diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 75aa5f7fd8dc..012d9ae0b4dd 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -100,7 +100,7 @@ namespace svt ); virtual ~AddressBookSourceDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // to be used if the object was constructed for editing a field mapping only void getFieldMapping( @@ -110,7 +110,7 @@ namespace svt void implConstruct(); // Window overridables - virtual bool PreNotify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& _rNEvt ) override; // implementations void implScrollFields(sal_Int32 _nPos, bool _bAdjustFocus, bool _bAdjustScrollbar); diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index ae32a48c5d83..a7d7c97e01fd 100644 --- a/include/svtools/apearcfg.hxx +++ b/include/svtools/apearcfg.hxx @@ -56,13 +56,13 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem static bool bInitialized ; SVT_DLLPRIVATE const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SvtTabAppearanceCfg( ); virtual ~SvtTabAppearanceCfg( ); - 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; sal_uInt16 GetDragMode () const { return nDragMode; } diff --git a/include/svtools/autocmpledit.hxx b/include/svtools/autocmpledit.hxx index 6bef6fa982fe..56df6e03e14c 100644 --- a/include/svtools/autocmpledit.hxx +++ b/include/svtools/autocmpledit.hxx @@ -25,7 +25,7 @@ private: void AutoCompleteHandler( Edit* ); bool Match( const OUString& rText ); - bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + bool PreNotify( NotifyEvent& rNEvt ) override; public: AutocompleteEdit( vcl::Window* pParent ); diff --git a/include/svtools/breadcrumb.hxx b/include/svtools/breadcrumb.hxx index d06e097e6bbd..c57c0e3e1fe0 100644 --- a/include/svtools/breadcrumb.hxx +++ b/include/svtools/breadcrumb.hxx @@ -52,7 +52,7 @@ class SVT_DLLPUBLIC Breadcrumb : public VclHBox Breadcrumb( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~Breadcrumb(); - void dispose() SAL_OVERRIDE; + void dispose() override; void EnableFields( bool bEnable ); void SetClickHdl( const Link<Breadcrumb*,void>& rLink ); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 89923f8aa637..ffbef7f3c8f0 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -347,7 +347,7 @@ protected: // (with the help of RowInserted and RowRemoved), so overriding of // the method is needless public: - virtual long GetRowCount() const SAL_OVERRIDE; + virtual long GetRowCount() const override; protected: // for display in VScrollBar set it e.g. on "?" @@ -420,24 +420,24 @@ public: BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode nMode = BrowserMode::NONE ); virtual ~BrowseBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // override inherited handler - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE; - virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) SAL_OVERRIDE; - - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; // will forward everything got to the second AcceptDrop method - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; // will forward everything got to the second ExecuteDrop method + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void MouseButtonDown( const MouseEvent& rEvt ) override; + virtual void MouseMove( const MouseEvent& rEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rEvt ) override; + virtual void KeyInput( const KeyEvent& rEvt ) override; + virtual void LoseFocus() override; + virtual void GetFocus() override; + virtual void Resize() override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Command( const CommandEvent& rEvt ) override; + virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) override; + + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; // will forward everything got to the second AcceptDrop method + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; // will forward everything got to the second ExecuteDrop method virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); @@ -510,16 +510,16 @@ public: bool GoToRowColumnId( long nRow, sal_uInt16 nColId ); // selections - virtual void SetNoSelection() SAL_OVERRIDE; - virtual void SelectAll() SAL_OVERRIDE; - virtual void SelectRow( long nRow, bool _bSelect = true, bool bExpand = true ) SAL_OVERRIDE; + virtual void SetNoSelection() override; + virtual void SelectAll() override; + virtual void SelectRow( long nRow, bool _bSelect = true, bool bExpand = true ) override; void SelectColumnPos( sal_uInt16 nCol, bool _bSelect = true ) { SelectColumnPos( nCol, _bSelect, true); } void SelectColumnId( sal_uInt16 nColId, bool _bSelect = true ) { SelectColumnPos( GetColumnPos(nColId), _bSelect, true); } long GetSelectRowCount() const; sal_uInt16 GetSelectColumnCount() const; - virtual bool IsRowSelected( long nRow ) const SAL_OVERRIDE; + virtual bool IsRowSelected( long nRow ) const override; bool IsColumnSelected( sal_uInt16 nColumnId ) const; long FirstSelectedRow( bool bInverse = false ); long LastSelectedRow(); @@ -596,7 +596,7 @@ public: /** @return the current column count */ - sal_uInt16 GetColumnCount() const SAL_OVERRIDE { return ColCount(); } + sal_uInt16 GetColumnCount() const override { return ColCount(); } /** commitBrowseBoxEvent commit the event at all listeners of the browsebox @param nEventId @@ -645,7 +645,7 @@ public: @return the Rectangle */ - virtual Rectangle calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen = true) SAL_OVERRIDE; + virtual Rectangle calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen = true) override; /** calculates the Rectangle of the table @param _bOnScreen @@ -653,7 +653,7 @@ public: @return the Rectangle */ - virtual Rectangle calcTableRect(bool _bOnScreen = true) SAL_OVERRIDE; + virtual Rectangle calcTableRect(bool _bOnScreen = true) override; /** @param _nRowId @@ -665,7 +665,7 @@ public: @return the Rectangle */ - virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true) SAL_OVERRIDE; + virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true) override; /// return <TRUE/> if and only if the accessible object for this instance has been created and is alive bool isAccessibleAlive( ) const; @@ -674,7 +674,7 @@ public: public: /** Creates and returns the accessible object of the whole BrowseBox. */ virtual css::uno::Reference< - css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + css::accessibility::XAccessible > CreateAccessible() override; // Children --------------------------------------------------------------- @@ -684,31 +684,31 @@ public: @return The XAccessible interface of the specified cell. */ virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) SAL_OVERRIDE; + CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) override; /** Creates the accessible object of a row header. @param nRow The row index of the header. @return The XAccessible interface of the specified row header. */ virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleRowHeader( sal_Int32 nRow ) SAL_OVERRIDE; + CreateAccessibleRowHeader( sal_Int32 nRow ) override; /** Creates the accessible object of a column header. @param nColumnId The column ID of the header. @return The XAccessible interface of the specified column header. */ virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleColumnHeader( sal_uInt16 nColumnPos ) SAL_OVERRIDE; + CreateAccessibleColumnHeader( sal_uInt16 nColumnPos ) override; /** @return The count of additional controls of the control area. */ - virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; + virtual sal_Int32 GetAccessibleControlCount() const override; /** Creates the accessible object of an additional control. @param nIndex The 0-based index of the control. @return The XAccessible interface of the specified control. */ virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleControl( sal_Int32 nIndex ) SAL_OVERRIDE; + CreateAccessibleControl( sal_Int32 nIndex ) override; // Conversions ------------------------------------------------------------ @@ -718,28 +718,28 @@ public: @param rPoint The position in pixels relative to the data window. @return <TRUE/>, if the point could be converted to a valid address. */ virtual bool ConvertPointToCellAddress( - sal_Int32& rnRow, sal_uInt16& rnColumnId, const Point& rPoint ) SAL_OVERRIDE; + sal_Int32& rnRow, sal_uInt16& rnColumnId, const Point& rPoint ) override; /** Converts a point relative to the row header bar origin to a row header index. @param rnRow Out-parameter that takes the row index. @param rPoint The position in pixels relative to the header bar. @return <TRUE/>, if the point could be converted to a valid index. */ - virtual bool ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ) SAL_OVERRIDE; + virtual bool ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ) override; /** Converts a point relative to the column header bar origin to a column header index. @param rnColumnId Out-parameter that takes the column ID. @param rPoint The position in pixels relative to the header bar. @return <TRUE/>, if the point could be converted to a valid index. */ - virtual bool ConvertPointToColumnHeader( sal_uInt16& rnColumnPos, const Point& rPoint ) SAL_OVERRIDE; + virtual bool ConvertPointToColumnHeader( sal_uInt16& rnColumnPos, const Point& rPoint ) override; /** Converts a point relative to the BrowseBox origin to the index of an existing control. @param rnRow Out-parameter that takes the 0-based control index. @param rPoint The position in pixels relative to the BrowseBox. @return <TRUE/>, if the point could be converted to a valid index. */ - virtual bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ) SAL_OVERRIDE; + virtual bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ) override; // Object data and state -------------------------------------------------- @@ -751,7 +751,7 @@ public: @return The name of the specified object. */ - virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override; /** return the description of the specified object. @param eObjType @@ -761,48 +761,48 @@ public: @return The description of the specified object. */ - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override; /** @return The header text of the specified row. */ - virtual OUString GetRowDescription( sal_Int32 nRow ) const SAL_OVERRIDE; + virtual OUString GetRowDescription( sal_Int32 nRow ) const override; /** @return The header text of the specified column. */ - virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const SAL_OVERRIDE; + virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const override; /** Fills the StateSet with all states (except DEFUNC and SHOWING, done by the accessible object), depending on the specified object type. */ virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, - ::svt::AccessibleBrowseBoxObjType eObjType ) const SAL_OVERRIDE; + ::svt::AccessibleBrowseBoxObjType eObjType ) const override; /** Fills the StateSet with all states for one cell (except DEFUNC and SHOWING, done by the accessible object). */ virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, - sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; + sal_Int32 _nRow, sal_uInt16 _nColumn ) const override; /** Sets focus to current cell of the data table. */ - virtual void GrabTableFocus() SAL_OVERRIDE; + virtual void GrabTableFocus() override; // IAccessibleTableProvider - virtual sal_Int32 GetCurrRow() const SAL_OVERRIDE; - virtual sal_uInt16 GetCurrColumn() const SAL_OVERRIDE; - virtual bool HasRowHeader() const SAL_OVERRIDE; - virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) SAL_OVERRIDE; - virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) SAL_OVERRIDE; - virtual bool IsColumnSelected( long _nColumn ) const SAL_OVERRIDE; - virtual sal_Int32 GetSelectedRowCount() const SAL_OVERRIDE; - virtual sal_Int32 GetSelectedColumnCount() const SAL_OVERRIDE; - virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const SAL_OVERRIDE; - virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const SAL_OVERRIDE; - virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; - virtual OUString GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const SAL_OVERRIDE; - virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) SAL_OVERRIDE; - virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; - virtual void GrabFocus() SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; - virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; + virtual sal_Int32 GetCurrRow() const override; + virtual sal_uInt16 GetCurrColumn() const override; + virtual bool HasRowHeader() const override; + virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) override; + virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) override; + virtual bool IsColumnSelected( long _nColumn ) const override; + virtual sal_Int32 GetSelectedRowCount() const override; + virtual sal_Int32 GetSelectedColumnCount() const override; + virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const override; + virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const override; + virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const override; + virtual OUString GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const override; + virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) override; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override; + virtual void GrabFocus() override; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) override; + virtual vcl::Window* GetAccessibleParentWindow() const override; + virtual vcl::Window* GetWindowInstance() override; private: // the following declares some Window/OutputDevice methods private. This happened in the course diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx index c82ccace0601..71e8c8c66af5 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -33,11 +33,11 @@ class SVT_DLLPUBLIC BrowserHeader: public HeaderBar public: virtual ~BrowserHeader(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Select() SAL_OVERRIDE; - virtual void EndDrag() SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void Select() override; + virtual void EndDrag() override; public: BrowserHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG ); diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 6bb8bf365123..da98035a8dac 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -226,7 +226,7 @@ private: SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); SVT_DLLPRIVATE void ImplInitSettings(); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; SVT_DLLPRIVATE void ImplGetWeekFont( vcl::Font& rFont ) const; SVT_DLLPRIVATE void ImplFormat(); @@ -258,21 +258,21 @@ protected: public: Calendar( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~Calendar(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void dispose() override; + + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void Select(); @@ -365,9 +365,9 @@ private: public: CalendarField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CalendarField(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool ShowDropDown( bool bShow ) SAL_OVERRIDE; + virtual bool ShowDropDown( bool bShow ) override; VclPtr<Calendar> CreateCalendar( vcl::Window* pParent ); Calendar* GetCalendar(); @@ -375,7 +375,7 @@ public: void EnableNone( bool bNone = true ) { mbNone = bNone; } protected: - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; }; #endif // INCLUDED_SVTOOLS_CALENDAR_HXX diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 2317b404b8d9..1033b39d4be0 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -44,10 +44,10 @@ public: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XClipboardListener virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& event ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index bdecb651e967..da969fc9de45 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -155,9 +155,9 @@ public: WinBits nWinStyle = WB_BORDER ); ColorListBox( vcl::Window* pParent, const ResId& rResId ); virtual ~ColorListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; + virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; using ListBox::InsertEntry; sal_Int32 InsertEntry( const OUString& rStr, @@ -297,7 +297,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); bool UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void UpdateEntries( long nOldWidth ); sal_Int32 GetStylePos( sal_Int32 nListPos, long nWidth ); @@ -308,7 +308,7 @@ public: LineListBox( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER ); virtual ~LineListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** Set the width in Twips */ void SetWidth( long nWidth ); @@ -390,9 +390,9 @@ public: FontNameBox( vcl::Window* pParent, WinBits nWinStyle = WB_SORT ); virtual ~FontNameBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; + virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; void Fill( const FontList* pList ); @@ -416,12 +416,12 @@ private: public: FontStyleBox( vcl::Window* pParent, WinBits nBits ); - virtual void Select() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void Modify() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Select() override; + virtual void LoseFocus() override; + virtual void Modify() override; + virtual Size GetOptimalSize() const override; - void SetText( const OUString& rText ) SAL_OVERRIDE; + void SetText( const OUString& rText ) override; void Fill( const OUString& rName, const FontList* pList ); private: @@ -454,13 +454,13 @@ class SVT_DLLPUBLIC FontSizeBox : public MetricBox SVT_DLLPRIVATE void ImplInit(); protected: - virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; + virtual OUString CreateFieldText( sal_Int64 nValue ) const override; public: FontSizeBox( vcl::Window* pParent, WinBits nWinStyle = 0 ); - void Reformat() SAL_OVERRIDE; - void Modify() SAL_OVERRIDE; + void Reformat() override; + void Modify() override; void Fill( const vcl::FontInfo* pInfo, const FontList* pList ); @@ -475,10 +475,10 @@ public: { bPtRelative = bPtRel; SetRelative( true ); } bool IsPtRelative() const { return bPtRelative; } - virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ) SAL_OVERRIDE; - virtual void SetValue( sal_Int64 nNewValue ) SAL_OVERRIDE; - virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const SAL_OVERRIDE; - virtual sal_Int64 GetValue() const SAL_OVERRIDE; + virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ) override; + virtual void SetValue( sal_Int64 nNewValue ) override; + virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const override; + virtual sal_Int64 GetValue() const override; private: FontSizeBox( const FontSizeBox& ) = delete; diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index 03304519daa8..df75982afbbd 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -51,10 +51,10 @@ namespace svt inline void SetDialogClosedLink( const Link<css::ui::dialogs::DialogClosedEvent*,void>& rLink ) { m_aDialogClosedLink = rLink; } // XDialogClosedListener methods - virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XEventListener methods - 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; }; diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index fc3fa11f79a4..d1b488754080 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -213,7 +213,7 @@ namespace svt { } - virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, vcl::Window& _rOperateOn ) const SAL_OVERRIDE + virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, vcl::Window& _rOperateOn ) const override { _rOperateOn.Enable( m_rCheckable.IsChecked() ); } @@ -237,7 +237,7 @@ namespace svt { } - bool payAttentionTo( const VclWindowEvent& _rEvent ) const SAL_OVERRIDE + bool payAttentionTo( const VclWindowEvent& _rEvent ) const override { if ( ( _rEvent.GetWindow() == &m_rWindow ) && ( ( _rEvent.GetId() == VCLEVENT_RADIOBUTTON_TOGGLE ) diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 819e7fdd6650..bbabf5b4dd08 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -160,27 +160,27 @@ namespace svt EDIT& GetEditWindow() { return static_cast< EDIT& >( GetControl() ); } - virtual Control& GetControl() SAL_OVERRIDE; + virtual Control& GetControl() override; - virtual OUString GetText( LineEnd aSeparator ) const SAL_OVERRIDE; - virtual void SetText( const OUString& _rStr ) SAL_OVERRIDE; + virtual OUString GetText( LineEnd aSeparator ) const override; + virtual void SetText( const OUString& _rStr ) override; - virtual bool IsReadOnly() const SAL_OVERRIDE; - virtual void SetReadOnly( bool bReadOnly ) SAL_OVERRIDE; + virtual bool IsReadOnly() const override; + virtual void SetReadOnly( bool bReadOnly ) override; - virtual sal_Int32 GetMaxTextLen() const SAL_OVERRIDE; - virtual void SetMaxTextLen( sal_Int32 _nMaxLen ) SAL_OVERRIDE; + virtual sal_Int32 GetMaxTextLen() const override; + virtual void SetMaxTextLen( sal_Int32 _nMaxLen ) override; - virtual Selection GetSelection() const SAL_OVERRIDE; - virtual void SetSelection( const Selection& _rSelection ) SAL_OVERRIDE; + virtual Selection GetSelection() const override; + virtual void SetSelection( const Selection& _rSelection ) override; - virtual void ReplaceSelected( const OUString& _rStr ) SAL_OVERRIDE; - virtual OUString GetSelected( LineEnd aSeparator ) const SAL_OVERRIDE; + virtual void ReplaceSelected( const OUString& _rStr ) override; + virtual OUString GetSelected( LineEnd aSeparator ) const override; - virtual void SetModified() SAL_OVERRIDE; - virtual bool IsModified() const SAL_OVERRIDE; - virtual void ClearModified() SAL_OVERRIDE; - virtual void SetModifyHdl( const Link<>& _rLink ) SAL_OVERRIDE; + virtual void SetModified() override; + virtual bool IsModified() const override; + virtual void ClearModified() override; + virtual void SetModifyHdl( const Link<>& _rLink ) override; }; #include <svtools/editimplementation.hxx> @@ -200,10 +200,10 @@ namespace svt protected: // Window overridables - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; // MultiLineEdit overridables - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; private: bool dispatchKeyEvent( const KeyEvent& _rEvent ); @@ -222,8 +222,8 @@ namespace svt { } - virtual OUString GetText( LineEnd aSeparator ) const SAL_OVERRIDE; - virtual OUString GetSelected( LineEnd aSeparator ) const SAL_OVERRIDE; + virtual OUString GetText( LineEnd aSeparator ) const override; + virtual OUString GetSelected( LineEnd aSeparator ) const override; }; @@ -243,13 +243,13 @@ namespace svt const IEditImplementation* GetEditImplementation( ) const { return m_pEditImplementation; } IEditImplementation* GetEditImplementation( ) { return m_pEditImplementation; } - virtual void SetModified() SAL_OVERRIDE; - virtual bool IsModified() const SAL_OVERRIDE; - virtual void ClearModified() SAL_OVERRIDE; + virtual void SetModified() override; + virtual bool IsModified() const override; + virtual void ClearModified() override; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; - virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE; + virtual bool MoveAllowed(const KeyEvent& rEvt) const override; + virtual void SetModifyHdl(const Link<>& rLink) override; }; @@ -263,13 +263,13 @@ namespace svt const SpinField& GetSpinWindow() const { return static_cast<const SpinField &>(GetWindow()); } SpinField& GetSpinWindow() { return static_cast<SpinField &>(GetWindow()); } - virtual void SetModified() SAL_OVERRIDE; - virtual bool IsModified() const SAL_OVERRIDE; - virtual void ClearModified() SAL_OVERRIDE; + virtual void SetModified() override; + virtual bool IsModified() const override; + virtual void ClearModified() override; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; - virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE; + virtual bool MoveAllowed(const KeyEvent& rEvt) const override; + virtual void SetModifyHdl(const Link<>& rLink) override; }; @@ -285,15 +285,15 @@ namespace svt public: CheckBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); virtual ~CheckBoxControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void GetFocus() SAL_OVERRIDE; - virtual bool PreNotify(NotifyEvent& rEvt) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rClientRect) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& _rEvent ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual bool PreNotify(NotifyEvent& rEvt) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rClientRect) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& _rEvent ) override; + virtual void Resize() override; void SetClickHdl(const Link<VclPtr<CheckBox>,void>& rHdl) {m_aClickLink = rHdl;} @@ -316,12 +316,12 @@ namespace svt CheckBoxCellController(CheckBoxControl* pWin):CellController(pWin){} CheckBox& GetCheckBox() const; - virtual bool IsModified() const SAL_OVERRIDE; - virtual void ClearModified() SAL_OVERRIDE; + virtual bool IsModified() const override; + virtual void ClearModified() override; protected: - virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE; - virtual bool WantMouseEvent() const SAL_OVERRIDE; + virtual void SetModifyHdl(const Link<>& rLink) override; + virtual bool WantMouseEvent() const override; }; @@ -335,7 +335,7 @@ namespace svt ComboBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; }; @@ -349,12 +349,12 @@ namespace svt ComboBoxCellController(ComboBoxControl* pParent); ComboBoxControl& GetComboBox() const { return static_cast<ComboBoxControl &>(GetWindow()); } - virtual bool IsModified() const SAL_OVERRIDE; - virtual void ClearModified() SAL_OVERRIDE; + virtual bool IsModified() const override; + virtual void ClearModified() override; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; - virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE; + virtual bool MoveAllowed(const KeyEvent& rEvt) const override; + virtual void SetModifyHdl(const Link<>& rLink) override; }; @@ -368,7 +368,7 @@ namespace svt ListBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; }; @@ -383,12 +383,12 @@ namespace svt const ListBoxControl& GetListBox() const { return static_cast<const ListBoxControl &>(GetWindow()); } ListBoxControl& GetListBox() { return static_cast<ListBoxControl &>(GetWindow()); } - virtual bool IsModified() const SAL_OVERRIDE; - virtual void ClearModified() SAL_OVERRIDE; + virtual bool IsModified() const override; + virtual void ClearModified() override; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; - virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE; + virtual bool MoveAllowed(const KeyEvent& rEvt) const override; + virtual void SetModifyHdl(const Link<>& rLink) override; private: Link<> maModifyHdl; DECL_LINK_TYPED(ListBoxSelectHdl, ListBox&, void); @@ -403,7 +403,7 @@ namespace svt TYPEINFO_OVERRIDE(); FormattedFieldCellController( FormattedField* _pFormatted ); - virtual void CommitModifications() SAL_OVERRIDE; + virtual void CommitModifications() override; }; @@ -416,7 +416,7 @@ namespace svt :BrowserHeader(pParent, nWinBits){} protected: - virtual void DoubleClick() SAL_OVERRIDE; + virtual void DoubleClick() override; }; @@ -506,32 +506,32 @@ namespace svt protected: BrowserHeader* GetHeaderBar() const {return pHeader;} - virtual VclPtr<BrowserHeader> CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; + virtual VclPtr<BrowserHeader> CreateHeaderBar(BrowseBox* pParent) override; // if you want to have an own header ... virtual VclPtr<BrowserHeader> imp_CreateHeaderBar(BrowseBox* pParent); - virtual void ColumnMoved(sal_uInt16 nId) SAL_OVERRIDE; - virtual void ColumnResized(sal_uInt16 nColId) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void ColumnMoved(sal_uInt16 nId) override; + virtual void ColumnResized(sal_uInt16 nColId) override; + virtual void Resize() override; virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); - virtual bool SeekRow(long nRow) SAL_OVERRIDE; + virtual bool SeekRow(long nRow) override; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; - virtual void MouseButtonDown(const BrowserMouseEvent& rEvt) SAL_OVERRIDE; - virtual void MouseButtonUp(const BrowserMouseEvent& rEvt) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void KeyInput(const KeyEvent& rEvt) override; + virtual void MouseButtonDown(const BrowserMouseEvent& rEvt) override; + virtual void MouseButtonUp(const BrowserMouseEvent& rEvt) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; using BrowseBox::MouseButtonUp; using BrowseBox::MouseButtonDown; - virtual bool PreNotify(NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; + virtual bool PreNotify(NotifyEvent& rNEvt ) override; + virtual bool Notify(NotifyEvent& rNEvt) override; - virtual void EndScroll() SAL_OVERRIDE; + virtual void EndScroll() override; // should be used instead of GetFieldRectPixel, 'cause this method here takes into account the borders Rectangle GetCellRect(long nRow, sal_uInt16 nColId, bool bRelToBrowser = true) const; @@ -543,19 +543,19 @@ namespace svt virtual RowStatus GetRowStatus(long nRow) const; - virtual void RowHeightChanged() SAL_OVERRIDE; + virtual void RowHeightChanged() override; // callbacks for the data window - virtual void ImplStartTracking() SAL_OVERRIDE; - virtual void ImplTracking() SAL_OVERRIDE; - virtual void ImplEndTracking() SAL_OVERRIDE; + virtual void ImplStartTracking() override; + virtual void ImplTracking() override; + virtual void ImplEndTracking() override; // when changing a row: // CursorMoving: cursor is being moved, but GetCurRow() still provides the old row virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); // cursor has been moved - virtual void CursorMoved() SAL_OVERRIDE; + virtual void CursorMoved() override; virtual void CellModified(); // called whenever a cell has been modified virtual bool SaveModified(); // called whenever a cell should be left, and it's content should be saved @@ -567,7 +567,7 @@ namespace svt virtual CellController* GetController(long nRow, sal_uInt16 nCol); virtual void InitController(CellControllerRef& rController, long nRow, sal_uInt16 nCol); static void ResizeController(CellControllerRef& rController, const Rectangle&); - virtual void DoubleClick(const BrowserMouseEvent&) SAL_OVERRIDE; + virtual void DoubleClick(const BrowserMouseEvent&) override; void ActivateCell() { ActivateCell(GetCurRow(), GetCurColumnId()); } @@ -583,7 +583,7 @@ namespace svt // result in traveling to the next or to th previous cell virtual bool IsTabAllowed(bool bForward) const; - virtual bool IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const SAL_OVERRIDE; + virtual bool IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const override; void PaintTristate(OutputDevice& rDev, const Rectangle& rRect, const TriState& eState, bool _bEnabled=true) const; @@ -594,7 +594,7 @@ namespace svt EditBrowseBox(vcl::Window* pParent, EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = BrowserMode::NONE ); EditBrowseBox(vcl::Window* pParent, const ResId& rId, EditBrowseBoxFlags nBrowserFlags = EditBrowseBoxFlags::NONE, BrowserMode nMode = BrowserMode::NONE ); virtual ~EditBrowseBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool IsEditing() const {return aController.Is();} void InvalidateStatusCell(long nRow) {RowModified(nRow, 0);} @@ -622,10 +622,10 @@ namespace svt The XAccessible interface of the specified cell. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) SAL_OVERRIDE; + CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) override; /** @return The count of additional controls of the control area. */ - virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; + virtual sal_Int32 GetAccessibleControlCount() const override; /** Creates the accessible object of an additional control. @param nIndex @@ -634,7 +634,7 @@ namespace svt The XAccessible interface of the specified control. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessibleControl( sal_Int32 nIndex ) SAL_OVERRIDE; + CreateAccessibleControl( sal_Int32 nIndex ) override; /** Creates the accessible object of a column header. @param nColumnId @@ -643,13 +643,13 @@ namespace svt The XAccessible interface of the specified column header. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessibleRowHeader( sal_Int32 _nRow ) SAL_OVERRIDE; + CreateAccessibleRowHeader( sal_Int32 _nRow ) override; /** Sets focus to current cell of the data table. */ - virtual void GrabTableFocus() SAL_OVERRIDE; + virtual void GrabTableFocus() override; - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE; - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE; + virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; + virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState); @@ -659,7 +659,7 @@ namespace svt private: virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, - sal_uInt16 nColumnId ) const SAL_OVERRIDE; + sal_uInt16 nColumnId ) const override; using Control::ImplInitSettings; SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SVT_DLLPRIVATE void DetermineFocus( const GetFocusFlags _nGetFocusFlags = GetFocusFlags::NONE); diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx index be6da6e118e2..f177f9962ae0 100644 --- a/include/svtools/editsyntaxhighlighter.hxx +++ b/include/svtools/editsyntaxhighlighter.hxx @@ -36,14 +36,14 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit void DoBracketHilight(sal_uInt16 aKey); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: MultiLineEditSyntaxHighlight( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); - virtual void UpdateData() SAL_OVERRIDE; - virtual void SetText(const OUString& rNewText) SAL_OVERRIDE; - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE + virtual void UpdateData() override; + virtual void SetText(const OUString& rNewText) override; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) override { SetText( rStr ); SetSelection( rNewSelection ); } Color GetColorValue(TokenTypes aToken); diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 8197e6fc3cec..612e44b0d180 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -38,7 +38,7 @@ public: SfxErrorContext( sal_uInt16 nCtxIdP, const OUString &aArg1, vcl::Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); - bool GetString(sal_uLong nErrId, OUString &rStr) SAL_OVERRIDE; + bool GetString(sal_uLong nErrId, OUString &rStr) override; private: sal_uInt16 nCtxId; @@ -66,7 +66,7 @@ private: ResMgr *pFreeMgr; SVT_DLLPRIVATE bool GetClassString(sal_uLong lErrId, OUString &) const; - virtual bool CreateString( const ErrorInfo *, OUString &, sal_uInt16 &) const SAL_OVERRIDE; + virtual bool CreateString( const ErrorInfo *, OUString &, sal_uInt16 &) const override; }; #endif diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index 3fd24ce5e058..18e27eec5b34 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -37,9 +37,9 @@ private: protected: - virtual void AddSupportedFormats() SAL_OVERRIDE; - virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; - virtual void ObjectReleased() SAL_OVERRIDE; + virtual void AddSupportedFormats() override; + virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual void ObjectReleased() override; public: // object, replacement image, and the aspect diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index fa2382a5cb63..a2b472665263 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -69,7 +69,7 @@ public: ExtendedColorConfig(); virtual ~ExtendedColorConfig(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // get the configured value ExtendedColorConfigValue GetColorValue(const OUString& _sComponentName,const OUString& _sName)const; diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index c3b58a6c0c76..741e3c509409 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -67,24 +67,24 @@ private: SVT_DLLPRIVATE void ImplBrowseFile( ); protected: - SVT_DLLPRIVATE void Resize() SAL_OVERRIDE; - SVT_DLLPRIVATE void GetFocus() SAL_OVERRIDE; - SVT_DLLPRIVATE void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + SVT_DLLPRIVATE void Resize() override; + SVT_DLLPRIVATE void GetFocus() override; + SVT_DLLPRIVATE void StateChanged( StateChangedType nType ) override; SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); DECL_DLLPRIVATE_LINK_TYPED( ButtonHdl, Button*, void ); public: FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode = FileControlMode::NONE ); virtual ~FileControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; Edit& GetEdit() { return *maEdit.get(); } PushButton& GetButton() { return *maButton.get(); } - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; - void SetText( const OUString& rStr ) SAL_OVERRIDE; - OUString GetText() const SAL_OVERRIDE; + void SetText( const OUString& rStr ) override; + OUString GetText() const override; void SetEditModifyHdl( const Link<>& rLink ); }; diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index c1dfde0f65fb..835c3413b4e1 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -40,8 +40,8 @@ namespace svt FileURLBox( vcl::Window* _pParent, WinBits _nStyle ); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; public: /** transforms the given URL content into a system-dependent notation, if possible, and diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 4070e4a56078..685b05baa35f 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -73,14 +73,14 @@ private: DECL_DLLPRIVATE_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); protected: - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; public: SvtFileView( vcl::Window* pParent, WinBits nBits, bool bOnlyFolder, bool bMultiSelection, bool bShowType = true ); virtual ~SvtFileView(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; const OUString& GetViewURL() const; static OUString GetURL( SvTreeListEntry* pEntry ); @@ -91,8 +91,8 @@ public: void SetHelpId( const OString& rHelpId ); const OString& GetHelpId( ) const; - void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; - virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE; + void SetSizePixel( const Size& rNewSize ) override; + virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override; void SetSortColumn( bool bValue ) { bSortColumn = bValue; } /** initialize the view with the content of a folder given by URL, and apply an immediate filter @@ -178,7 +178,7 @@ public: ::std::vector< SvtContentEntry > GetContent(); protected: - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; }; // struct SvtContentEntry ------------------------------------------------ @@ -214,7 +214,7 @@ public: QueryDeleteDlg_Impl(vcl::Window* pParent, const OUString& rName); virtual ~QueryDeleteDlg_Impl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void EnableAllButton() { m_pAllButton->Enable(true); } }; diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index ce5e154ccfa5..ea9ba48793a5 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -153,11 +153,11 @@ public: // Check format during input // Spin-Handling - virtual void Up() SAL_OVERRIDE; - virtual void Down() SAL_OVERRIDE; + virtual void Up() override; + virtual void Down() override; // Default Implementation: +/- default spin size to the double value - virtual void First() SAL_OVERRIDE; - virtual void Last() SAL_OVERRIDE; + virtual void First() override; + virtual void Last() override; // Default Implementation: Current double is set to the first or last value void SetSpinSize(double dStep) { m_dSpinSize = dStep; } @@ -173,8 +173,8 @@ public: void TreatAsNumber(bool bDoSo) { m_bTreatAsNumber = bDoSo; } public: - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) override; //The following methods are interesting, if m_bTreatAsNumber is set to sal_False //If someone does not care about all the double handling and just wants to print the text formatted. @@ -225,9 +225,9 @@ public: bool IsUsingInputStringForFormatting() const { return m_bUseInputStringForFormatting;} protected: - virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; + virtual bool Notify(NotifyEvent& rNEvt) override; void impl_Modify(bool makeValueDirty = true); - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; // Override CheckTextfor input-time checks virtual bool CheckText(const OUString&) const { return true; } @@ -245,7 +245,7 @@ protected: SvNumberFormatter* CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; } SvNumberFormatter* ImplGetFormatter() const { return m_pFormatter ? m_pFormatter : const_cast<FormattedField*>(this)->CreateFormatter(); } - bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; + bool PreNotify(NotifyEvent& rNEvt) override; void ReFormat(); }; @@ -265,12 +265,12 @@ public: } virtual ~DoubleNumericField(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; protected: - virtual bool CheckText(const OUString& sText) const SAL_OVERRIDE; + virtual bool CheckText(const OUString& sText) const override; - virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat) SAL_OVERRIDE; + virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat) override; void ResetConformanceTester(); }; @@ -291,7 +291,7 @@ public: void setPrependCurrSym(bool _bPrepend); protected: - virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat) SAL_OVERRIDE; + virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat) override; void UpdateCurrencyFormat(); }; diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx index ccf0382ad35d..eb07abd71e2b 100644 --- a/include/svtools/foldertree.hxx +++ b/include/svtools/foldertree.hxx @@ -47,7 +47,7 @@ private: public: FolderTree( vcl::Window* pParent, WinBits nBits ); - virtual void RequestingChildren( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + virtual void RequestingChildren( SvTreeListEntry* pEntry ) override; void FillTreeEntry( SvTreeListEntry* pEntry ); void FillTreeEntry( const OUString & rUrl, const ::std::vector< std::pair< OUString, OUString > >& rFolders ); diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index 278eb66bb936..9e58bc67ec21 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.hxx @@ -39,13 +39,13 @@ private: bool bIsEnabled; SvtFontSubstConfig_Impl* pImpl; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SvtFontSubstConfig(); virtual ~SvtFontSubstConfig(); - 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; bool IsEnabled() const {return bIsEnabled;} void Enable(bool bSet) {bIsEnabled = bSet; SetModified();} diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index dee8a52d89cd..ae90bc4a1711 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -53,23 +53,23 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu void unbindListener(); // 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; - 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; // 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; // 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; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; // XFrameActionListener - virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; protected: struct Listener diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index 5356b27844fa..1bd2c6b1f0b0 100644 --- a/include/svtools/generictoolboxcontroller.hxx +++ b/include/svtools/generictoolboxcontroller.hxx @@ -39,13 +39,13 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController virtual ~GenericToolboxController(); // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; DECL_STATIC_LINK_TYPED( GenericToolboxController, ExecuteHdl_Impl, void*, void ); diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 5765e65eaf2c..9b0afa500eea 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -98,27 +98,27 @@ namespace svt public: // UNO DECLARE_UNO3_DEFAULTS(OGenericUnoDialog, OGenericUnoDialogBase) - 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 com::sun::star::uno::Any SAL_CALL queryInterface(const com::sun::star::uno::Type& _rType) 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 = 0; + 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 = 0; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; // OPropertySetHelper - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException) 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; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute( ) 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; protected: /** create the concret dialog instance. note that m_aMutex is not locked when this method get's called, diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 5da0c1cd7581..7474270e77b4 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -281,23 +281,23 @@ private: SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); SVT_DLLPRIVATE void ImplEndDrag( bool bCancel ); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: HeaderBar( vcl::Window* pParent, WinBits nWinBits = WB_STDHEADERBAR ); virtual ~HeaderBar(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void dispose() override; + + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void StartDrag(); void Drag(); @@ -350,9 +350,9 @@ public: /** Creates and returns the accessible object of the header bar. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( bool bCreate ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( bool bCreate ) override; }; diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index 3239ac7311ee..a8bb1f3093a0 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -40,13 +40,13 @@ class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); void Load( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SvxHtmlOptions(); virtual ~SvxHtmlOptions(); - 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; sal_uInt16 GetFontSize(sal_uInt16 nPos) const; void SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize); diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index 81ef7c396a45..0a2868d35504 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -40,10 +40,10 @@ namespace svt HyperLabelImpl* m_pImpl; Link<HyperLabel*,void> maClickHdl; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; void DeactivateHyperMode(vcl::Font aFont, const Color aColor); void ActivateHyperMode(vcl::Font aFont, const Color aColor); @@ -54,9 +54,9 @@ namespace svt public: HyperLabel( vcl::Window* _pParent, WinBits _nWinStyle = 0 ); virtual ~HyperLabel( ); - 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 SetID( sal_Int16 _ID ); sal_Int16 GetID() const; diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx index 92a28d7063f7..ba2513b51c53 100644 --- a/include/svtools/imapcirc.hxx +++ b/include/svtools/imapcirc.hxx @@ -35,8 +35,8 @@ class SVT_DLLPUBLIC IMapCircleObject : public IMapObject protected: // binary import/export - virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE; - virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE; + virtual void WriteIMapObject( SvStream& rOStm ) const override; + virtual void ReadIMapObject( SvStream& rIStm ) override; public: @@ -51,8 +51,8 @@ public: bool bPixelCoords = true ); virtual ~IMapCircleObject() {} - virtual sal_uInt16 GetType() const SAL_OVERRIDE; - virtual bool IsHit( const Point& rPoint ) const SAL_OVERRIDE; + virtual sal_uInt16 GetType() const override; + virtual bool IsHit( const Point& rPoint ) const override; Point GetCenter( bool bPixelCoords = true ) const; sal_uLong GetRadius( bool bPixelCoords = true ) const; diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx index 0c6ee47198fc..af48e04fa851 100644 --- a/include/svtools/imappoly.hxx +++ b/include/svtools/imappoly.hxx @@ -37,8 +37,8 @@ class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject protected: // Binaer-Im-/Export - virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE; - virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE; + virtual void WriteIMapObject( SvStream& rOStm ) const override; + virtual void ReadIMapObject( SvStream& rIStm ) override; public: IMapPolygonObject() : bEllipse(false) {} @@ -52,8 +52,8 @@ public: bool bPixelCoords = true ); virtual ~IMapPolygonObject() {} - virtual sal_uInt16 GetType() const SAL_OVERRIDE; - virtual bool IsHit( const Point& rPoint ) const SAL_OVERRIDE; + virtual sal_uInt16 GetType() const override; + virtual bool IsHit( const Point& rPoint ) const override; tools::Polygon GetPolygon( bool bPixelCoords = true ) const; diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx index 3b3f332a4caf..ce3eae645fbf 100644 --- a/include/svtools/imaprect.hxx +++ b/include/svtools/imaprect.hxx @@ -34,8 +34,8 @@ class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject protected: // binary import/export - virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE; - virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE; + virtual void WriteIMapObject( SvStream& rOStm ) const override; + virtual void ReadIMapObject( SvStream& rIStm ) override; public: @@ -50,8 +50,8 @@ public: bool bPixelCoords = true ); virtual ~IMapRectangleObject() {}; - virtual sal_uInt16 GetType() const SAL_OVERRIDE; - virtual bool IsHit( const Point& rPoint ) const SAL_OVERRIDE; + virtual sal_uInt16 GetType() const override; + virtual bool IsHit( const Point& rPoint ) const override; Rectangle GetRectangle( bool bPixelCoords = true ) const; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 1d91621290fe..daef69bec7a3 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -53,17 +53,17 @@ friend class SvtURLBox_Impl; SAL_DLLPRIVATE void AutoCompleteHandler( Edit* ); protected: - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Select() SAL_OVERRIDE; - virtual void Modify() SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void Select() override; + virtual void Modify() override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: SvtURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true ); SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true ); SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true ); virtual ~SvtURLBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetBaseURL( const OUString& rURL ); const OUString& GetBaseURL() const { return aBaseURL; } diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 11f9ac5c8a4b..8433d8f02d46 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -213,19 +213,19 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control protected: - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; void ClickIcon(); - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; static void DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, @@ -235,7 +235,7 @@ protected: SvxIconChoiceCtrlEntry* pEntry, bool bInplaceEdit ); - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; void CallImplEventListeners(sal_uLong nEvent, void* pData); @@ -243,7 +243,7 @@ public: SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); virtual ~SvtIconChoiceCtrl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetStyle( WinBits nWinStyle ); WinBits GetStyle() const; @@ -317,7 +317,7 @@ public: /** Creates and returns the accessible object of the Box. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; }; #endif // INCLUDED_SVTOOLS_IVCTRL_HXX diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx index d636d9e2f4e4..818806a52e06 100644 --- a/include/svtools/javacontext.hxx +++ b/include/svtools/javacontext.hxx @@ -52,15 +52,15 @@ namespace svt // 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; + virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () override; // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; private: JavaContext(JavaContext&) = delete; diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx index 4346d8fdf222..7d598ff0e4ea 100644 --- a/include/svtools/javainteractionhandler.hxx +++ b/include/svtools/javainteractionhandler.hxx @@ -44,16 +44,16 @@ 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; + virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() override; // XCurrentContext virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& Request ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; private: oslInterlockedCount m_aRefCount; diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index 9924a3437134..4b906aee5a7b 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -54,14 +54,14 @@ class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1< public: // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing ( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; // XDropTargetListener - virtual void SAL_CALL drop ( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dragEnter ( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dragExit ( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dragOver ( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drop ( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragEnter ( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragExit ( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragOver ( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override; private: void implts_BeginDrag( const css::uno::Sequence< css::datatransfer::DataFlavor >& rSupportedDataFlavors ); diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 85a514f0dc37..a03ca8f34fc3 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -154,7 +154,7 @@ protected: int _GetNextRawToken(); // scan next token - virtual int _GetNextToken() SAL_OVERRIDE; + virtual int _GetNextToken() override; virtual ~HTMLParser(); @@ -163,7 +163,7 @@ protected: public: HTMLParser( SvStream& rIn, bool bReadNewDoc = true ); - virtual SvParserState CallParser() SAL_OVERRIDE; + virtual SvParserState CallParser() override; bool IsNewDoc() const { return bNewDoc; } bool IsInHeader() const { return bIsInHeader; } @@ -208,7 +208,7 @@ public: const HTMLOptions& GetOptions( sal_uInt16 *pNoConvertToken=0 ); // for asynchronous reading from the SvStream - virtual void Continue( int nToken ) SAL_OVERRIDE; + virtual void Continue( int nToken ) override; protected: diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx index 7351522b1756..8fc852d3e5a3 100644 --- a/include/svtools/parrtf.hxx +++ b/include/svtools/parrtf.hxx @@ -51,7 +51,7 @@ protected: void SkipGroup(); // scanne das naechste Token, - virtual int _GetNextToken() SAL_OVERRIDE; + virtual int _GetNextToken() override; void ReadUnknownData(); virtual void ReadBitmapData(); @@ -65,10 +65,10 @@ protected: public: SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize = 3 ); - virtual SvParserState CallParser() SAL_OVERRIDE; // Aufruf des Parsers + virtual SvParserState CallParser() override; // Aufruf des Parsers // fuers asynchrone lesen aus dem SvStream - virtual void Continue( int nToken ) SAL_OVERRIDE; + virtual void Continue( int nToken ) override; }; #endif // INCLUDED_SVTOOLS_PARRTF_HXX diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index 474864ef40ee..8efd1ed82dc0 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -63,37 +63,37 @@ namespace svt virtual ~PopupMenuControllerBase(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; - 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 = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; + 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 = 0; // XPopupMenuController - virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updatePopupMenu() 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; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; // XMenuListener - virtual void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) 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 >& lDescriptor ) 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& sTarget, sal_Int32 nFlags ) 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 >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) 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; + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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; // 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; void dispatchCommand( const OUString& sCommandURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); @@ -105,7 +105,7 @@ namespace svt /** this function is called upon disposing the component */ - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; static void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); virtual void impl_setPopupMenu(); diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index a455670b8c95..68f057a93d7a 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -44,30 +44,30 @@ public: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) = 0; // 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; - 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; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; - 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 = 0; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + 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 = 0; // 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; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: std::unique_ptr< PopupWindowControllerImpl > mxImpl; }; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index afec7688e160..384bc86b7a9b 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -60,15 +60,15 @@ private: public: PrinterSetupDialog( vcl::Window* pWindow ); virtual ~PrinterSetupDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; } Printer* GetPrinter() const { return mpPrinter; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; void SetOptionsHdl( const Link<Button*,void>& rLink ); }; diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index d6ea94aa2703..b79f928ffd29 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -77,7 +77,7 @@ namespace svt WizardButtonFlags _nButtonFlags = WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ); virtual ~RoadmapWizard( ); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetRoadmapHelpId( const OString& _rId ); @@ -87,8 +87,8 @@ namespace svt bool isStateEnabled( WizardState _nState ) const; // WizardDialog overridables - virtual bool canAdvance() const SAL_OVERRIDE; - virtual void updateTravelUI() SAL_OVERRIDE; + virtual bool canAdvance() const override; + virtual void updateTravelUI() override; protected: /** declares a valid path in the wizard @@ -163,7 +163,7 @@ namespace svt @see activatePath */ - virtual WizardState determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE; + virtual WizardState determineNextState( WizardState _nCurrentState ) const override; /** en- or disables a state @@ -192,7 +192,7 @@ namespace svt bool knowsState( WizardState _nState ) const; // OWizardMachine overriables - virtual void enterState( WizardState _nState ) SAL_OVERRIDE; + virtual void enterState( WizardState _nState ) override; /** returns a human readable name for a given state @@ -208,7 +208,7 @@ namespace svt This member is inherited from OWizardMachine, and default-implemented in this class for all states which have been described using describeState. */ - virtual VclPtr<TabPage> createPage( WizardState _nState ) SAL_OVERRIDE; + virtual VclPtr<TabPage> createPage( WizardState _nState ) override; /** asks for a new label of the wizard page diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index aaa88c4189e0..1c606f8ce400 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -686,7 +686,7 @@ private: SVT_DLLPRIVATE void ImplDrawExtra(vcl::RenderContext& rRenderContext, bool bPaint = false); SVT_DLLPRIVATE void ImplUpdate( bool bMustCalc = false ); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; using Window::ImplHitTest; SVT_DLLPRIVATE bool ImplHitTest( const Point& rPosition, @@ -709,15 +709,15 @@ protected: public: Ruler( vcl::Window* pParent, WinBits nWinStyle = WB_STDRULER ); virtual ~Ruler(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual bool StartDrag(); virtual void Drag(); @@ -726,8 +726,8 @@ public: void DoubleClick(); virtual void ExtraDown(); - void Activate() SAL_OVERRIDE; - void Deactivate() SAL_OVERRIDE; + void Activate() override; + void Deactivate() override; void SetWinPos( long nOff = 0, long nWidth = 0 ); long GetWinOffset() const { return mnWinOff; } @@ -796,7 +796,7 @@ public: void DrawTicks(); - 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; }; #endif // INCLUDED_SVTOOLS_RULER_HXX diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index a96b62c032a4..b0832842756e 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -71,21 +71,21 @@ public: ScrollableWindow( vcl::Window* pParent, WinBits nBits = 0, ScrollableWindowFlags = ScrollableWindowFlags::DEFAULT ); virtual ~ScrollableWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Resize() SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDEvt ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDEvt ) override; using OutputDevice::SetMapMode; - virtual void SetMapMode( const MapMode& rNewMapMode ) SAL_OVERRIDE; + virtual void SetMapMode( const MapMode& rNewMapMode ) override; MapMode GetMapMode() const; void SetTotalSize( const Size& rNewSize ); Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } using Window::Scroll; - virtual void Scroll( long nDeltaX, long nDeltaY, ScrollFlags nFlags = ScrollFlags::NONE ) SAL_OVERRIDE; + virtual void Scroll( long nDeltaX, long nDeltaY, ScrollFlags nFlags = ScrollFlags::NONE ) override; private: SVT_DLLPRIVATE Size GetOutputSizePixel() const; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index f892646e2231..7b8816fd0156 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -32,18 +32,18 @@ private: VclPtr<SvSimpleTable> m_pTable; protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: SvSimpleTableContainer( vcl::Window* pParent, WinBits nBits = WB_BORDER ); virtual ~SvSimpleTableContainer(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetTable(SvSimpleTable* pTable); - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; }; class SVT_DLLPUBLIC SvSimpleTable : public SvHeaderTabListBox @@ -71,24 +71,24 @@ private: protected: - virtual void NotifyScrolled() SAL_OVERRIDE; + virtual void NotifyScrolled() override; - virtual void SetTabs() SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void SetTabs() override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; virtual void HBarClick(); void HBarStartDrag(); void HBarDrag(); void HBarEndDrag(); - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; virtual sal_Int32 ColCompare(SvTreeListEntry*,SvTreeListEntry*); public: SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); virtual ~SvSimpleTable(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void UpdateViewSize(); diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index ece18a315129..db58d6867cd1 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -56,40 +56,40 @@ class SVT_DLLPUBLIC StatusbarController : ::Rectangle getControlRect() const; // 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; - 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; // 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; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL update() 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; // 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; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XStatusbarController - virtual sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, ::sal_Int32 nCommand, sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: struct Listener diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx index 2a38a9977964..2a0b46dfdb9f 100644 --- a/include/svtools/stdmenu.hxx +++ b/include/svtools/stdmenu.hxx @@ -107,8 +107,8 @@ public: FontNameMenu(); virtual ~FontNameMenu(); - virtual void Select() SAL_OVERRIDE; - virtual void Highlight() SAL_OVERRIDE; + virtual void Select() override; + virtual void Highlight() override; void Fill( const FontList* pList ); @@ -129,8 +129,8 @@ public: FontSizeMenu(); virtual ~FontSizeMenu(); - virtual void Select() SAL_OVERRIDE; - virtual void Highlight() SAL_OVERRIDE; + virtual void Select() override; + virtual void Highlight() override; void Fill( const vcl::FontInfo& rInfo, const FontList* pList ); diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index dea0989121ad..51b811293d73 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -41,8 +41,8 @@ namespace svt protected: // TransferableHelper overridables - 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; }; diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 89969b0bbbbe..95dded4e417f 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -111,10 +111,10 @@ public: SvLBoxString(); virtual ~SvLBoxString(); - virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual sal_uInt16 GetType() const override; virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, - SvViewDataItem* pViewData) SAL_OVERRIDE; + SvViewDataItem* pViewData) override; OUString GetText() const { @@ -128,10 +128,10 @@ public: virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, - const SvTreeListEntry& rEntry) SAL_OVERRIDE; + const SvTreeListEntry& rEntry) override; - virtual SvLBoxItem* Create() const SAL_OVERRIDE; - virtual void Clone(SvLBoxItem* pSource) SAL_OVERRIDE; + virtual SvLBoxItem* Create() const override; + virtual void Clone(SvLBoxItem* pSource) override; }; class SvLBoxBmp : public SvLBoxItem @@ -140,12 +140,12 @@ class SvLBoxBmp : public SvLBoxItem public: SvLBoxBmp(); virtual ~SvLBoxBmp(); - virtual sal_uInt16 GetType() const SAL_OVERRIDE; - virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; + virtual sal_uInt16 GetType() const override; + virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) override; virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) SAL_OVERRIDE; - virtual SvLBoxItem* Create() const SAL_OVERRIDE; - virtual void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; + const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; + virtual SvLBoxItem* Create() const override; + virtual void Clone( SvLBoxItem* pSource ) override; }; @@ -170,20 +170,20 @@ public: virtual ~SvLBoxButton(); virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, - SvViewDataItem* pViewData) SAL_OVERRIDE; + SvViewDataItem* pViewData) override; - virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual sal_uInt16 GetType() const override; bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* ); virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, - const SvTreeListEntry& rEntry) SAL_OVERRIDE; + const SvTreeListEntry& rEntry) override; - virtual SvLBoxItem* Create() const SAL_OVERRIDE; + virtual SvLBoxItem* Create() const override; - virtual void Clone(SvLBoxItem* pSource) SAL_OVERRIDE; + virtual void Clone(SvLBoxItem* pSource) override; SvItemStateFlags GetButtonFlags() const { return nItemFlags; @@ -254,18 +254,18 @@ public: SvLBoxContextBmp(); virtual ~SvLBoxContextBmp(); - virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual sal_uInt16 GetType() const override; virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, - SvViewDataItem* pViewData) SAL_OVERRIDE; + SvViewDataItem* pViewData) override; virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, - const SvTreeListEntry& rEntry) SAL_OVERRIDE; + const SvTreeListEntry& rEntry) override; - virtual SvLBoxItem* Create() const SAL_OVERRIDE; - virtual void Clone(SvLBoxItem* pSource) SAL_OVERRIDE; + virtual SvLBoxItem* Create() const override; + virtual void Clone(SvLBoxItem* pSource) override; bool SetModeImages(const Image& rBitmap1, const Image& rBitmap2); diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx index 0c322f267e04..07f6510f50f3 100644 --- a/include/svtools/svmedit.hxx +++ b/include/svtools/svmedit.hxx @@ -33,7 +33,7 @@ public: MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface(bool bCreate = true) SAL_OVERRIDE; + GetComponentInterface(bool bCreate = true) override; }; diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index c7596a2a33ce..e98f4665bf91 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -55,8 +55,8 @@ protected: static OUString GetToken( const OUString &sStr, sal_Int32 &nIndex ); - virtual void SetTabs() SAL_OVERRIDE; - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; + virtual void SetTabs() override; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) override; OUString GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const; SvTreeListEntry* GetEntryOnPos( sal_uLong _nEntryPos ) const; @@ -65,7 +65,7 @@ protected: public: SvTabListBox( vcl::Window* pParent, WinBits = WB_BORDER ); virtual ~SvTabListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetTabs(const long* pTabs, MapUnit = MAP_APPFONT); sal_uInt16 TabCount() const { return (sal_uInt16)nTabCount; } using SvTreeListBox::GetTab; @@ -76,7 +76,7 @@ public: virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = 0, bool bChildrenOnDemand = false, sal_uLong nPos=TREELIST_APPEND, void* pUserData = 0, - SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) SAL_OVERRIDE; + SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) override; virtual SvTreeListEntry* InsertEntry( const OUString& rText, const Image& rExpandedEntryBmp, @@ -84,7 +84,7 @@ public: SvTreeListEntry* pParent = 0, bool bChildrenOnDemand = false, sal_uLong nPos = TREELIST_APPEND, void* pUserData = 0, - SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) SAL_OVERRIDE; + SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) override; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); @@ -94,7 +94,7 @@ public: const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL, sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); - virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const override; static OUString GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ); OUString GetEntryText( sal_uLong nPos, sal_uInt16 nCol = 0xffff ) const; using SvTreeListBox::SetEntryText; @@ -104,7 +104,7 @@ public: sal_uLong GetEntryPos( const OUString&, sal_uInt16 nCol = 0xffff ); sal_uLong GetEntryPos( const SvTreeListEntry* pEntry ) const; - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; void SetTabJustify( sal_uInt16 nTab, SvTabJustify ); }; @@ -140,22 +140,22 @@ private: public: SvHeaderTabListBox( vcl::Window* pParent, WinBits nBits ); virtual ~SvHeaderTabListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; void InitHeaderBar( HeaderBar* pHeaderBar ); static bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ); virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND, - sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) SAL_OVERRIDE; + sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) override; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent, - sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ) SAL_OVERRIDE; + sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ) override; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL, - sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) SAL_OVERRIDE; - virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND) SAL_OVERRIDE; - virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = TREELIST_APPEND ) SAL_OVERRIDE; + sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) override; + virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND) override; + virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = TREELIST_APPEND ) override; void RemoveEntry( SvTreeListEntry* _pEntry ); void Clear(); @@ -167,83 +167,83 @@ public: bool IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState ); /** @return The count of the rows. */ - virtual long GetRowCount() const SAL_OVERRIDE; + virtual long GetRowCount() const override; /** @return The count of the columns. */ - virtual sal_uInt16 GetColumnCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetColumnCount() const override; /** @return The position of the current row. */ - virtual sal_Int32 GetCurrRow() const SAL_OVERRIDE; + virtual sal_Int32 GetCurrRow() const override; /** @return The position of the current column. */ - virtual sal_uInt16 GetCurrColumn() const SAL_OVERRIDE; + virtual sal_uInt16 GetCurrColumn() const override; /** @return The description of a row. @param _nRow The row which description is in demand. */ - virtual OUString GetRowDescription( sal_Int32 _nRow ) const SAL_OVERRIDE; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const override; /** @return The description of a column. @param _nColumn The column which description is in demand. */ - virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const SAL_OVERRIDE; + virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const override; /** @return <TRUE/>, if the object has a row header. */ - virtual bool HasRowHeader() const SAL_OVERRIDE; //GetColumnId + virtual bool HasRowHeader() const override; //GetColumnId /** @return <TRUE/>, if the object can focus a cell. */ - virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) SAL_OVERRIDE; + virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) override; - virtual void SetNoSelection() SAL_OVERRIDE; + virtual void SetNoSelection() override; using SvListView::SelectAll; - virtual void SelectAll() SAL_OVERRIDE; - virtual void SelectAll( bool bSelect, bool bPaint = true ) SAL_OVERRIDE; - virtual void SelectRow( long _nRow, bool _bSelect = true, bool bExpand = true ) SAL_OVERRIDE; - virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) SAL_OVERRIDE; - virtual sal_Int32 GetSelectedRowCount() const SAL_OVERRIDE; - virtual sal_Int32 GetSelectedColumnCount() const SAL_OVERRIDE; + virtual void SelectAll() override; + virtual void SelectAll( bool bSelect, bool bPaint = true ) override; + virtual void SelectRow( long _nRow, bool _bSelect = true, bool bExpand = true ) override; + virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) override; + virtual sal_Int32 GetSelectedRowCount() const override; + virtual sal_Int32 GetSelectedColumnCount() const override; /** @return <TRUE/>, if the row is selected. */ - virtual bool IsRowSelected( long _nRow ) const SAL_OVERRIDE; - virtual bool IsColumnSelected( long _nColumn ) const SAL_OVERRIDE; - virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const SAL_OVERRIDE; - virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const SAL_OVERRIDE; + virtual bool IsRowSelected( long _nRow ) const override; + virtual bool IsColumnSelected( long _nColumn ) const override; + virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const override; + virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const override; /** @return <TRUE/>, if the cell is visible. */ - virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; - virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const SAL_OVERRIDE; + virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const override; + virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const override; - virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) SAL_OVERRIDE; - virtual Rectangle calcTableRect( bool _bOnScreen = true ) SAL_OVERRIDE; - virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen = true ) SAL_OVERRIDE; + virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) override; + virtual Rectangle calcTableRect( bool _bOnScreen = true ) override; + virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen = true ) override; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ) SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) override; - virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) SAL_OVERRIDE; - virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) SAL_OVERRIDE; + virtual sal_Int32 GetAccessibleControlCount() const override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) override; + virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) override; - virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ) SAL_OVERRIDE; - virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) SAL_OVERRIDE; - virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) SAL_OVERRIDE; + virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ) override; + virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) override; + virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) override; - virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const SAL_OVERRIDE; - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const SAL_OVERRIDE; - virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override; + virtual vcl::Window* GetWindowInstance() override; - virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const SAL_OVERRIDE; - virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; - virtual void GrabTableFocus() SAL_OVERRIDE; + virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const override; + virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const override; + virtual void GrabTableFocus() override; // OutputDevice - virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) SAL_OVERRIDE; + virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) override; // Window - virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; - virtual void GrabFocus() SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override; + virtual void GrabFocus() override; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) override; + virtual vcl::Window* GetAccessibleParentWindow() const override; /** Creates and returns the accessible object of the whole BrowseBox. */ - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE; - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE; + virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override; + virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override; }; #endif // INCLUDED_SVTOOLS_SVTABBX_HXX diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index f7ae4d4cd5a1..29d2e6ba7a91 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -388,17 +388,17 @@ public: TabBar( vcl::Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); virtual ~TabBar(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void dispose() override; + + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual void Select(); virtual void DoubleClick(); @@ -501,7 +501,7 @@ public: void SetScrollAreaContextHdl( const Link<const CommandEvent&,void>& rLink ) { maScrollAreaContextHdl = rLink; } // accessibility - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; }; #endif // INCLUDED_SVTOOLS_TABBAR_HXX diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index a23422993daa..e020aba5c009 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -51,17 +51,17 @@ public: WinBits nBits ); virtual ~ToolbarMenu(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void dispose() override; + + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvent ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; void appendEntry( int nEntryId, const OUString& rStr, MenuItemBits nItemBits = MenuItemBits::NONE ); void appendEntry( int nEntryId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits = MenuItemBits::NONE ); @@ -89,7 +89,7 @@ public: void highlightFirstEntry(); protected: - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; // todo: move to new base class that will replace SfxPopupWindow void AddStatusListener( const OUString& rCommandURL ); @@ -101,8 +101,8 @@ protected: // the status updates): virtual void statusChanged(const css::frame::FeatureStateEvent& Event ) throw (css::uno::RuntimeException, std::exception); - void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + void StateChanged( StateChangedType nType ) override; + void DataChanged( const DataChangedEvent& rDCEvt ) override; private: DECL_LINK_TYPED( HighlightHdl, ValueSet*, void ); diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 288d8d97a938..9b3ac7a709c8 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -75,44 +75,44 @@ class SVT_DLLPUBLIC ToolboxController : void updateStatus(); // 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; - 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; virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::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; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL update() 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; // XEventListener using cppu::OPropertySetHelper::disposing; - 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; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // OPropertySetHelper - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException) 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 ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() 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 ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; const OUString& getCommandURL() const { return m_aCommandURL; } diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index 45665b6fe454..ccca954efacc 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -47,22 +47,22 @@ namespace svt virtual ~DrawerDeckLayouter(); // IDeckLayouter - virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ) SAL_OVERRIDE; - virtual void Destroy() SAL_OVERRIDE; - virtual void SetFocusToPanelSelector() SAL_OVERRIDE; - virtual size_t GetAccessibleChildCount() const SAL_OVERRIDE; + virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ) override; + virtual void Destroy() override; + virtual void SetFocusToPanelSelector() override; + virtual size_t GetAccessibleChildCount() const override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessibleChild( const size_t i_nChildIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible - ) SAL_OVERRIDE; + ) override; // IToolPanelDeckListener - virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) SAL_OVERRIDE; - virtual void PanelRemoved( const size_t i_nPosition ) SAL_OVERRIDE; - virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) SAL_OVERRIDE; - virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ) SAL_OVERRIDE; - virtual void Dying() SAL_OVERRIDE; + virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) override; + virtual void PanelRemoved( const size_t i_nPosition ) override; + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) override; + virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ) override; + virtual void Dying() override; private: // triggers a re-arrange of the panel deck elements diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index ed24a5d84acc..787058a929ff 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -52,7 +52,7 @@ namespace svt public: PanelTabBar( vcl::Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ); virtual ~PanelTabBar(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // attribute access TabItemContent GetTabItemContent() const; @@ -66,23 +66,23 @@ namespace svt PushButton& GetScrollButton( const bool i_bForward ); // Window overridables - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; protected: // Window overridables - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& i_rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& i_rMouseEvent ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& i_rMouseEvent ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& i_rMouseEvent ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& i_rHelpEvent ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& i_rKeyEvent ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& i_rDataChanedEvent ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& i_rRect ) override; + virtual void Resize() override; + virtual void MouseMove( const MouseEvent& i_rMouseEvent ) override; + virtual void MouseButtonDown( const MouseEvent& i_rMouseEvent ) override; + virtual void MouseButtonUp( const MouseEvent& i_rMouseEvent ) override; + virtual void RequestHelp( const HelpEvent& i_rHelpEvent ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void KeyInput( const KeyEvent& i_rKeyEvent ) override; + virtual void DataChanged( const DataChangedEvent& i_rDataChanedEvent ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( bool i_bCreate ) SAL_OVERRIDE; + GetComponentInterface( bool i_bCreate ) override; private: ::std::unique_ptr< PanelTabBar_Impl > m_pImpl; diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx index fb106270b21f..826029e48cc6 100644 --- a/include/svtools/toolpanel/tablayouter.hxx +++ b/include/svtools/toolpanel/tablayouter.hxx @@ -72,15 +72,15 @@ namespace svt TabAlignment GetTabAlignment() const; // IDeckLayouter - virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ) SAL_OVERRIDE; - virtual void Destroy() SAL_OVERRIDE; - virtual void SetFocusToPanelSelector() SAL_OVERRIDE; - virtual size_t GetAccessibleChildCount() const SAL_OVERRIDE; + virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ) override; + virtual void Destroy() override; + virtual void SetFocusToPanelSelector() override; + virtual size_t GetAccessibleChildCount() const override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessibleChild( const size_t i_nChildIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible - ) SAL_OVERRIDE; + ) override; private: ::std::unique_ptr< TabDeckLayouter_Data > m_pData; diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index 211c099deb93..b3e6cdd5c25d 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -138,7 +138,7 @@ namespace svt public: ToolPanelDeck( vcl::Window& i_rParent, const WinBits i_nStyle = WB_DIALOGCONTROL ); virtual ~ToolPanelDeck(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // attributes PDeckLayouter GetLayouter() const; @@ -153,24 +153,24 @@ namespace svt const vcl::Window& GetPanelWindowAnchor() const; // IToolPanelDeck - virtual size_t GetPanelCount() const SAL_OVERRIDE; - virtual PToolPanel GetPanel( const size_t i_nPos ) const SAL_OVERRIDE; + virtual size_t GetPanelCount() const override; + virtual PToolPanel GetPanel( const size_t i_nPos ) const override; virtual ::boost::optional< size_t > - GetActivePanel() const SAL_OVERRIDE; - virtual void ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) SAL_OVERRIDE; - virtual size_t InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) SAL_OVERRIDE; - virtual PToolPanel RemovePanel( const size_t i_nPosition ) SAL_OVERRIDE; - virtual void AddListener( IToolPanelDeckListener& i_rListener ) SAL_OVERRIDE; - virtual void RemoveListener( IToolPanelDeckListener& i_rListener ) SAL_OVERRIDE; + GetActivePanel() const override; + virtual void ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) override; + virtual size_t InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) override; + virtual PToolPanel RemovePanel( const size_t i_nPosition ) override; + virtual void AddListener( IToolPanelDeckListener& i_rListener ) override; + virtual void RemoveListener( IToolPanelDeckListener& i_rListener ) override; protected: // Window overridables - virtual void Resize() SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& i_rNotifyEvent ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void Resize() override; + virtual bool Notify( NotifyEvent& i_rNotifyEvent ) override; + virtual void GetFocus() override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( bool i_bCreate ) SAL_OVERRIDE; + GetComponentInterface( bool i_bCreate ) override; private: ::std::unique_ptr< ToolPanelDeck_Impl > m_pImpl; diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index cc8286ef14d7..6b308150e644 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -145,11 +145,11 @@ private: private: // 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; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; public: @@ -175,29 +175,29 @@ protected: private: // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // Transferable2 virtual css::uno::Any SAL_CALL getTransferData2( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) - throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::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; // XDragSourceListener - virtual void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: // XClipboardOwner - virtual void SAL_CALL lostOwnership( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL lostOwnership( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; protected: // derivees need to access lostOwnership in case hey override it @@ -265,7 +265,7 @@ public: public: - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; }; struct TransferableDataHelper_Impl; @@ -387,10 +387,10 @@ private: private: // 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; // XDragGestureListener - virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; public: @@ -432,14 +432,14 @@ private: private: // 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; // XDropTargetListener - virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; public: @@ -491,9 +491,9 @@ class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper protected: - virtual void AddSupportedFormats() SAL_OVERRIDE; - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; - virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; + virtual void AddSupportedFormats() override; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; + virtual void DragFinished( sal_Int8 nDropAction ) override; public: diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 86a75daa4483..13707db265d1 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -321,7 +321,7 @@ protected: virtual SvTreeListEntry* GetDropTarget( const Point& ); // Invalidate children on enable/disable - virtual void StateChanged( StateChangedType eType ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType eType ) override; virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND); virtual sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = TREELIST_APPEND ); @@ -335,10 +335,10 @@ protected: bool IsEmptyTextAllowed() const; // Return value must be derived from SvViewDataEntry! - virtual SvViewDataEntry* CreateViewData( SvTreeListEntry* ) SAL_OVERRIDE; + virtual SvViewDataEntry* CreateViewData( SvTreeListEntry* ) override; // InitViewData is called right after CreateViewData // The Entry is has not yet been added to the View in InitViewData! - virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry ) SAL_OVERRIDE; + virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry ) override; // Calls InitViewData for all Items void RecalcViewData(); @@ -356,22 +356,22 @@ protected: void OnCurrentEntryChanged(); // IMnemonicEntryList - virtual const void* FirstSearchEntry( OUString& _rEntryText ) const SAL_OVERRIDE; - virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, OUString& _rEntryText ) const SAL_OVERRIDE; - virtual void SelectSearchEntry( const void* _pEntry ) SAL_OVERRIDE; - virtual void ExecuteSearchEntry( const void* _pEntry ) const SAL_OVERRIDE; + virtual const void* FirstSearchEntry( OUString& _rEntryText ) const override; + virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, OUString& _rEntryText ) const override; + virtual void SelectSearchEntry( const void* _pEntry ) override; + virtual void ExecuteSearchEntry( const void* _pEntry ) const override; // ISearchableStringList - virtual vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE; - virtual vcl::StringEntryIdentifier NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE; - virtual void SelectEntry( vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE; + virtual vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const override; + virtual vcl::StringEntryIdentifier NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const override; + virtual void SelectEntry( vcl::StringEntryIdentifier _entry ) override; public: SvTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 ); SvTreeListBox( vcl::Window* pParent, const ResId& rResId ); virtual ~SvTreeListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SvTreeList* GetModel() const { @@ -380,7 +380,7 @@ public: using SvListView::SetModel; - void SetModel(SvTreeList* pNewModel) SAL_OVERRIDE; + void SetModel(SvTreeList* pNewModel) override; sal_uLong GetEntryCount() const { @@ -498,9 +498,9 @@ public: // Drag & Drop // New D'n'D API - 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 DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* ); virtual void DragFinished( sal_Int8 nDropAction ); @@ -531,7 +531,7 @@ public: /** Creates and returns the accessible object of the Box. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; /** Fills the StateSet of one entry. */ void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const; @@ -558,7 +558,7 @@ public: void set_min_width_in_chars(sal_Int32 nChars); - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; protected: using SvListView::SelectAll; @@ -607,15 +607,15 @@ protected: void SetScrolledHdl( const Link<SvTreeListBox*,void>& rLink ) { aScrolledHdl = rLink; } long GetXOffset() const { return GetMapMode().GetOrigin().X(); } - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; virtual void PreparePaint(vcl::RenderContext& rRenderContext, SvTreeListEntry& rEntry); - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void InitSettings(bool bFont, bool bForeground, bool bBackground); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; bool IsCellFocusEnabled() const; bool SetCurrentTabPos( sal_uInt16 _nNewPos ); @@ -702,25 +702,25 @@ public: virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; void SetUpdateMode( bool ); - virtual void ModelHasCleared() SAL_OVERRIDE; - virtual void ModelHasInserted( SvTreeListEntry* pEntry ) SAL_OVERRIDE; - virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + virtual void ModelHasCleared() override; + virtual void ModelHasInserted( SvTreeListEntry* pEntry ) override; + virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry ) override; virtual void ModelIsMoving(SvTreeListEntry* pSource, - SvTreeListEntry* pTargetParent, sal_uLong nChildPos ) SAL_OVERRIDE; - virtual void ModelHasMoved(SvTreeListEntry* pSource ) SAL_OVERRIDE; - virtual void ModelIsRemoving( SvTreeListEntry* pEntry ) SAL_OVERRIDE; - virtual void ModelHasRemoved( SvTreeListEntry* pEntry ) SAL_OVERRIDE; - void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + SvTreeListEntry* pTargetParent, sal_uLong nChildPos ) override; + virtual void ModelHasMoved(SvTreeListEntry* pSource ) override; + virtual void ModelIsRemoving( SvTreeListEntry* pEntry ) override; + virtual void ModelHasRemoved( SvTreeListEntry* pEntry ) override; + void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ) override; void ShowTargetEmphasis( SvTreeListEntry*, bool bShow ); void ScrollOutputArea( short nDeltaEntries ); @@ -764,14 +764,14 @@ public: virtual bool Collapse( SvTreeListEntry* pParent ); virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ); sal_uLong SelectChildren( SvTreeListEntry* pParent, bool bSelect ); - virtual void SelectAll( bool bSelect, bool bPaint = true ) SAL_OVERRIDE; + virtual void SelectAll( bool bSelect, bool bPaint = true ) override; void SetCurEntry( SvTreeListEntry* _pEntry ); SvTreeListEntry* GetCurEntry() const; using Window::Invalidate; - virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE) SAL_OVERRIDE; - virtual void Invalidate( const Rectangle&, InvalidateFlags nFlags = InvalidateFlags::NONE ) SAL_OVERRIDE; + virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE) override; + virtual void Invalidate( const Rectangle&, InvalidateFlags nFlags = InvalidateFlags::NONE ) override; void SetHighlightRange(sal_uInt16 nFirstTab=0, sal_uInt16 nLastTab=0xffff); @@ -780,7 +780,7 @@ public: DECL_LINK_TYPED( DefaultCompare, const SvSortData&, sal_Int32 ); virtual void ModelNotification( SvListAction nActionId, SvTreeListEntry* pEntry1, - SvTreeListEntry* pEntry2, sal_uLong nPos ) SAL_OVERRIDE; + SvTreeListEntry* pEntry2, sal_uLong nPos ) override; void EndSelection(); ScrollBar* GetVScroll(); @@ -804,7 +804,7 @@ public: long getPreferredDimensions(std::vector<long> &rWidths) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; void SetAlternatingRowColors( const bool bEnable ); }; diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 5f15a43d5c34..92b669fe4dee 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -93,7 +93,7 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess (via XNameReplace) /// calls getByName(sal_uInt16) @@ -102,39 +102,39 @@ public: 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; // XNameAxcess (via XNameReplace) virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess (via XNameReplace) virtual sal_Bool SAL_CALL hasByName( const OUString& rName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess (via XNameReplace) 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; // XElementAccess (via XNameReplace) 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; // XServiceInfo /// must be implemented in subclass virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; // XServiceInfo 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; // XServiceInfo virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; protected: @@ -218,7 +218,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; using SvBaseEventDescriptor::getByName; virtual void getByName( @@ -227,7 +227,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; /// Get the SvxMacroItem from the parent. @@ -262,7 +262,7 @@ 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; protected: @@ -276,7 +276,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; using SvBaseEventDescriptor::getByName; virtual void getByName( @@ -285,7 +285,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; /// do we have an event? /// return true: we have a macro for the event diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index a85c0fd9e84d..c5fc70c2c86f 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -40,8 +40,8 @@ namespace svt OFileURLControl(vcl::Window* _pParent, WinBits nStyle); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; }; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 8d41a49bd4ce..58b508fa37c6 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -248,7 +248,7 @@ private: SVT_DLLPRIVATE void ImplInit(); SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; SVT_DLLPRIVATE void ImplInitScrollBar(); SVT_DLLPRIVATE void ImplDeleteItems(); @@ -280,28 +280,28 @@ private: protected: bool StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ); - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; public: ValueSet( vcl::Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren = false ); ValueSet( vcl::Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false ); virtual ~ValueSet(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void dispose() override; + + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void Resize() override; + virtual Size GetOptimalSize() const override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Select(); void DoubleClick(); diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 7f6f35992222..fab1cfdcbddc 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -107,16 +107,16 @@ namespace svt */ OWizardPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription); virtual ~OWizardPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // IWizardPageController overridables - virtual void initializePage() SAL_OVERRIDE; - virtual bool commitPage( WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; - virtual bool canAdvance() const SAL_OVERRIDE; + virtual void initializePage() override; + virtual bool commitPage( WizardTypes::CommitPageReason _eReason ) override; + virtual bool canAdvance() const override; protected: // TabPage overridables - virtual void ActivatePage() SAL_OVERRIDE; + virtual void ActivatePage() override; /** updates the travel-related UI elements of the OWizardMachine we live in (if any) @@ -175,7 +175,7 @@ namespace svt OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle, WizardButtonFlags _nButtonFlags ); OWizardMachine(vcl::Window* _pParent, WizardButtonFlags _nButtonFlags ); virtual ~OWizardMachine(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /// enable (or disable) buttons void enableButtons(WizardButtonFlags _nWizardButtonFlags, bool _bEnable); @@ -200,8 +200,8 @@ namespace svt protected: // WizardDialog overridables - virtual void ActivatePage() SAL_OVERRIDE; - virtual bool DeactivatePage() SAL_OVERRIDE; + virtual void ActivatePage() override; + virtual bool DeactivatePage() override; // our own overridables diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 984ec15858eb..44f1c6973e21 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -241,16 +241,16 @@ public: WizardDialog( vcl::Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ); virtual ~WizardDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; virtual void ActivatePage(); virtual bool DeactivatePage(); - virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE; + virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; bool ShowPrevPage(); bool ShowNextPage(); diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index 07fc6f005b37..22243f3692c1 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -43,8 +43,8 @@ public: XWindowItem( const XWindowItem &rItem ); virtual ~XWindowItem(); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; - virtual bool operator == ( const SfxPoolItem& rAttr ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual bool operator == ( const SfxPoolItem& rAttr ) const override; vcl::Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } }; |