diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
| commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
| tree | a70f4957c454b443520cbf91250c41d9eea80017 /include/svtools | |
| parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) | |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'include/svtools')
75 files changed, 818 insertions, 818 deletions
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index fd162f353586..8f21baac5177 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -45,7 +45,7 @@ public: virtual ~ODocumentInfoPreview(); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void clear(); diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index 6155b4b394b2..9bc37a41c52d 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -65,9 +65,9 @@ class HostDetailsContainer : public DetailsContainer HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, const OUString& sScheme ); virtual ~HostDetailsContainer( ) { }; - virtual void show( bool bShow = true ); - virtual INetURLObject getUrl( ); - virtual bool setUrl( const INetURLObject& rUrl ); + virtual void show( bool bShow = true ) SAL_OVERRIDE; + virtual INetURLObject getUrl( ) SAL_OVERRIDE; + virtual bool setUrl( const INetURLObject& rUrl ) SAL_OVERRIDE; protected: void setScheme( const OUString& sScheme ) { m_sScheme = sScheme; } @@ -87,10 +87,10 @@ class DavDetailsContainer : public HostDetailsContainer DavDetailsContainer( VclBuilderContainer* pBuilder ); ~DavDetailsContainer( ) { }; - virtual void show( bool bShow = true ); + virtual void show( bool bShow = true ) SAL_OVERRIDE; protected: - virtual bool verifyScheme( const OUString& rScheme ); + virtual bool verifyScheme( const OUString& rScheme ) SAL_OVERRIDE; private: DECL_LINK ( ToggledDavsHdl, CheckBox * pCheckBox ); @@ -107,8 +107,8 @@ class SmbDetailsContainer : public DetailsContainer SmbDetailsContainer( VclBuilderContainer* pBuilder ); ~SmbDetailsContainer( ) { }; - virtual INetURLObject getUrl( ); - virtual bool setUrl( const INetURLObject& rUrl ); + virtual INetURLObject getUrl( ) SAL_OVERRIDE; + virtual bool setUrl( const INetURLObject& rUrl ) SAL_OVERRIDE; }; class CmisDetailsContainer : public DetailsContainer @@ -130,9 +130,9 @@ class CmisDetailsContainer : public DetailsContainer CmisDetailsContainer( VclBuilderContainer* pBuilder ); ~CmisDetailsContainer( ) { }; - virtual INetURLObject getUrl( ); - virtual bool setUrl( const INetURLObject& rUrl ); - virtual void setUsername( const OUString& rUsername ); + virtual INetURLObject getUrl( ) SAL_OVERRIDE; + virtual bool setUrl( const INetURLObject& rUrl ) SAL_OVERRIDE; + virtual void setUsername( const OUString& rUsername ) SAL_OVERRIDE; private: void selectRepository( ); diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index e483be94abe9..cd2cae45e1b6 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -63,7 +63,7 @@ public: void Commit(); //SfxListener: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void SetVCLSettings(); }; diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index cdb76f1b1db4..13c0a6ba6a2f 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -70,27 +70,27 @@ public: //===== XAccessible ===================================================== virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL - containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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 ); + getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL - getBounds() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getBounds() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL - getLocation() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getLocation() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL - getLocationOnScreen() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getLocationOnScreen() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL - getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isShowing() throw( ::com::sun::star::uno::RuntimeException ); @@ -112,72 +112,72 @@ public: throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int32 SAL_CALL - getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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 ); + throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL - getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL - getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( void ) throw( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ); + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_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 ); + addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_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 ); + removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual ::rtl::OUString SAL_CALL - getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL - getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: @@ -188,7 +188,7 @@ protected: virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; /// @returns true if it's disposed or in disposing inline bool IsAlive( void ) const; diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 68b9ff80c867..8a5d1a386db9 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -109,7 +109,7 @@ namespace svt void implConstruct(); // Window overridables - virtual bool PreNotify( NotifyEvent& _rNEvt ); + virtual bool PreNotify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; // implementations void implScrollFields(sal_Int32 _nPos, bool _bAdjustFocus, bool _bAdjustScrollbar); diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index f08ec1a19b86..63ccad654ab6 100644 --- a/include/svtools/apearcfg.hxx +++ b/include/svtools/apearcfg.hxx @@ -60,8 +60,8 @@ public: SvtTabAppearanceCfg( ); ~SvtTabAppearanceCfg( ); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; sal_uInt16 GetDragMode () const { return nDragMode; } diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 154f6462d0a6..576358fd05d0 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -327,7 +327,7 @@ protected: // (ueber RowInserted und RowRemoved), daher ist das Ueberladen // dieser Methode ueberfluessig! public: - virtual long GetRowCount() const; + virtual long GetRowCount() const SAL_OVERRIDE; protected: // fuer Anzeige im VScrollBar z.B. auf "?" oder setzen @@ -411,21 +411,21 @@ public: ~BrowseBox(); // ererbte ueberladene Handler - virtual void StateChanged( StateChangedType nStateChange ); - virtual void MouseButtonDown( const MouseEvent& rEvt ); - virtual void MouseMove( const MouseEvent& rEvt ); - virtual void MouseButtonUp( const MouseEvent& rEvt ); - virtual void KeyInput( const KeyEvent& rEvt ); - virtual void LoseFocus(); - virtual void GetFocus(); - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Command( const CommandEvent& rEvt ); - virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ); - - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); // will forward everything got to the second AcceptDrop method - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); // will forward everything got to the second ExecuteDrop method + 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( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong 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 sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); @@ -504,16 +504,16 @@ public: bool GoToRowColumnId( long nRow, sal_uInt16 nColId ); // selections - virtual void SetNoSelection(); - virtual void SelectAll(); - virtual void SelectRow( long nRow, bool _bSelect = true, bool bExpand = true ); + virtual void SetNoSelection() SAL_OVERRIDE; + virtual void SelectAll() SAL_OVERRIDE; + virtual void SelectRow( long nRow, bool _bSelect = true, bool bExpand = true ) SAL_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; + virtual bool IsRowSelected( long nRow ) const SAL_OVERRIDE; bool IsColumnSelected( sal_uInt16 nColumnId ) const; long FirstSelectedRow( bool bInverse = false ); long LastSelectedRow(); @@ -592,7 +592,7 @@ public: /** @return the current column count */ - sal_uInt16 GetColumnCount() const { return ColCount(); } + sal_uInt16 GetColumnCount() const SAL_OVERRIDE { return ColCount(); } /** commitBrowseBoxEvent commit the event at all listeners of the browsebox @param nEventId @@ -641,7 +641,7 @@ public: @return the Rectangle */ - virtual Rectangle calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen = true); + virtual Rectangle calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen = true) SAL_OVERRIDE; /** calculates the Rectangle of the table @param _bOnScreen @@ -649,7 +649,7 @@ public: @return the Rectangle */ - virtual Rectangle calcTableRect(bool _bOnScreen = true); + virtual Rectangle calcTableRect(bool _bOnScreen = true) SAL_OVERRIDE; /** @param _nRowId @@ -661,7 +661,7 @@ public: @return the Rectangle */ - virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true); + virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true) SAL_OVERRIDE; /// return <TRUE/> if and only if the accessible object for this instance has been created and is alive bool isAccessibleAlive( ) const; @@ -670,7 +670,7 @@ public: public: /** Creates and returns the accessible object of the whole BrowseBox. */ virtual css::uno::Reference< - css::accessibility::XAccessible > CreateAccessible(); + css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; // Children --------------------------------------------------------------- @@ -680,31 +680,31 @@ public: @return The XAccessible interface of the specified cell. */ virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ); + CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) SAL_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 ); + CreateAccessibleRowHeader( sal_Int32 nRow ) SAL_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 ); + CreateAccessibleColumnHeader( sal_uInt16 nColumnPos ) SAL_OVERRIDE; /** @return The count of additional controls of the control area. */ - virtual sal_Int32 GetAccessibleControlCount() const; + virtual sal_Int32 GetAccessibleControlCount() const SAL_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 ); + CreateAccessibleControl( sal_Int32 nIndex ) SAL_OVERRIDE; // Conversions ------------------------------------------------------------ @@ -714,28 +714,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_Int32& rnRow, sal_uInt16& rnColumnId, const Point& rPoint ) SAL_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 ); + virtual bool ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ) SAL_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 ); + virtual bool ConvertPointToColumnHeader( sal_uInt16& rnColumnPos, const Point& rPoint ) SAL_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 ); + virtual bool ConvertPointToControlIndex( sal_Int32& rnIndex, const Point& rPoint ) SAL_OVERRIDE; // Object data and state -------------------------------------------------- @@ -747,7 +747,7 @@ public: @return The name of the specified object. */ - virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE; /** return the description of the specified object. @param eObjType @@ -757,49 +757,49 @@ public: @return The description of the specified object. */ - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE; /** @return The header text of the specified row. */ - virtual OUString GetRowDescription( sal_Int32 nRow ) const; + virtual OUString GetRowDescription( sal_Int32 nRow ) const SAL_OVERRIDE; /** @return The header text of the specified column. */ - virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const; + virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const SAL_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; + ::svt::AccessibleBrowseBoxObjType eObjType ) const SAL_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_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; /** Sets focus to current cell of the data table. */ - virtual void GrabTableFocus(); + virtual void GrabTableFocus() SAL_OVERRIDE; // IAccessibleTableProvider - virtual sal_Int32 GetCurrRow() const; - virtual sal_uInt16 GetCurrColumn() const; - virtual bool HasRowHeader() const; - virtual bool IsCellFocusable() const; - virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); - virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ); - virtual bool IsColumnSelected( long _nColumn ) const; - virtual sal_Int32 GetSelectedRowCount() const; - virtual sal_Int32 GetSelectedColumnCount() const; - virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const; - virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const; - virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; - virtual OUString GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const; - virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; - virtual void GrabFocus(); - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); - virtual Window* GetAccessibleParentWindow() const; - virtual Window* GetWindowInstance(); + virtual sal_Int32 GetCurrRow() const SAL_OVERRIDE; + virtual sal_uInt16 GetCurrColumn() const SAL_OVERRIDE; + virtual bool HasRowHeader() const SAL_OVERRIDE; + virtual bool IsCellFocusable() 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( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual void GrabFocus() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; + virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual Window* GetWindowInstance() SAL_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 17d547d2116a..e60949100731 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -32,9 +32,9 @@ class SVT_DLLPUBLIC BrowserHeader: public HeaderBar BrowseBox* _pBrowseBox; protected: - virtual void Command( const CommandEvent& rCEvt ); - virtual void Select(); - virtual void EndDrag(); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; + virtual void EndDrag() SAL_OVERRIDE; public: BrowserHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG ); diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index e92d9d513ac7..9fd8e8abccb7 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -260,19 +260,19 @@ public: Calendar( Window* pParent, WinBits nWinStyle = 0 ); ~Calendar(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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( 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 SelectionChanging(); virtual void DateRangeChanged(); @@ -420,7 +420,7 @@ public: virtual void Select(); - virtual bool ShowDropDown( bool bShow ); + virtual bool ShowDropDown( bool bShow ) SAL_OVERRIDE; virtual Calendar* CreateCalendar( Window* pParent ); Calendar* GetCalendar(); @@ -439,7 +439,7 @@ public: const Link& GetSelectHdl() const { return maSelectHdl; } protected: - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; }; #endif // INCLUDED_SVTOOLS_CALENDAR_HXX diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 5003d1e222da..5557c491bf70 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -43,10 +43,10 @@ public: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XClipboardListener virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& event ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index c4aedb7a8899..62388ba437da 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -166,7 +166,7 @@ public: ColorListBox( Window* pParent, const ResId& rResId ); virtual ~ColorListBox(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; using ListBox::InsertEntry; virtual sal_Int32 InsertEntry( const OUString& rStr, @@ -304,7 +304,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); bool UpdatePaintLineColor( void ); // returns sal_True if maPaintCol has changed - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void UpdateEntries( long nOldWidth ); sal_Int32 GetStylePos( sal_Int32 nListPos, long nWidth ); @@ -423,7 +423,7 @@ public: WinBits nWinStyle = WB_SORT ); virtual ~FontNameBox(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; void Fill( const FontList* pList ); @@ -455,12 +455,12 @@ public: FontStyleBox( Window* pParent, WinBits nBits ); virtual ~FontStyleBox(); - virtual void Select(); - virtual void LoseFocus(); - virtual void Modify(); - virtual Size GetOptimalSize() const; + virtual void Select() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetText( const OUString& rText ); + void SetText( const OUString& rText ) SAL_OVERRIDE; void Fill( const OUString& rName, const FontList* pList ); private: @@ -498,14 +498,14 @@ class SVT_DLLPUBLIC FontSizeBox : public MetricBox SVT_DLLPRIVATE void ImplInit(); protected: - virtual OUString CreateFieldText( sal_Int64 nValue ) const; + virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; public: FontSizeBox( Window* pParent, WinBits nWinStyle = 0 ); virtual ~FontSizeBox(); - void Reformat(); - void Modify(); + void Reformat() SAL_OVERRIDE; + void Modify() SAL_OVERRIDE; void Fill( const FontInfo* pInfo, const FontList* pList ); @@ -520,10 +520,10 @@ public: { bPtRelative = bPtRel; SetRelative( true ); } bool IsPtRelative() const { return bPtRelative; } - virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); - virtual void SetValue( sal_Int64 nNewValue ); - virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; - virtual sal_Int64 GetValue() const; + 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; private: // declared as private because some compilers would generate the default functions diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index b42a51be03fd..86d5dff1c7c9 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -54,10 +54,10 @@ namespace svt inline void SetDialogClosedLink( const Link& 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); + virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener methods - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index c9875b4bac55..1b7bf1ed5bc7 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -215,7 +215,7 @@ namespace svt { } - virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, Window& _rOperateOn ) const + virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, Window& _rOperateOn ) const SAL_OVERRIDE { _rOperateOn.Enable( m_rCheckable.IsChecked() ); } @@ -239,7 +239,7 @@ namespace svt { } - bool payAttentionTo( const VclWindowEvent& _rEvent ) const + bool payAttentionTo( const VclWindowEvent& _rEvent ) const SAL_OVERRIDE { if ( ( _rEvent.GetWindow() == &m_rWindow ) && ( ( _rEvent.GetId() == VCLEVENT_RADIOBUTTON_TOGGLE ) diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 978eb2a4ce02..b4706b6039e5 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -162,28 +162,28 @@ namespace svt EDIT& GetEditWindow() { return static_cast< EDIT& >( GetControl() ); } - virtual Control& GetControl(); + virtual Control& GetControl() SAL_OVERRIDE; - virtual OUString GetText( LineEnd aSeparator ) const; - virtual void SetText( const OUString& _rStr ); + virtual OUString GetText( LineEnd aSeparator ) const SAL_OVERRIDE; + virtual void SetText( const OUString& _rStr ) SAL_OVERRIDE; - virtual bool IsReadOnly() const; - virtual void SetReadOnly( bool bReadOnly ); + virtual bool IsReadOnly() const SAL_OVERRIDE; + virtual void SetReadOnly( bool bReadOnly ) SAL_OVERRIDE; - virtual sal_Int32 GetMaxTextLen() const; - virtual void SetMaxTextLen( sal_Int32 _nMaxLen ); + virtual sal_Int32 GetMaxTextLen() const SAL_OVERRIDE; + virtual void SetMaxTextLen( sal_Int32 _nMaxLen ) SAL_OVERRIDE; - virtual Selection GetSelection() const; - virtual void SetSelection( const Selection& _rSelection ); + virtual Selection GetSelection() const SAL_OVERRIDE; + virtual void SetSelection( const Selection& _rSelection ) SAL_OVERRIDE; - virtual void ReplaceSelected( const OUString& _rStr ); - virtual void DeleteSelected(); - virtual OUString GetSelected( LineEnd aSeparator ) const; + virtual void ReplaceSelected( const OUString& _rStr ) SAL_OVERRIDE; + virtual void DeleteSelected() SAL_OVERRIDE; + virtual OUString GetSelected( LineEnd aSeparator ) const SAL_OVERRIDE; - virtual void SetModified(); - virtual bool IsModified() const; - virtual void ClearModified(); - virtual void SetModifyHdl( const Link& _rLink ); + virtual void SetModified() SAL_OVERRIDE; + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; + virtual void SetModifyHdl( const Link& _rLink ) SAL_OVERRIDE; }; #include <svtools/editimplementation.hxx> @@ -203,10 +203,10 @@ namespace svt protected: // Window overridables - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; // MultiLineEdit overridables - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; private: bool dispatchKeyEvent( const KeyEvent& _rEvent ); @@ -225,8 +225,8 @@ namespace svt { } - virtual OUString GetText( LineEnd aSeparator ) const; - virtual OUString GetSelected( LineEnd aSeparator ) const; + virtual OUString GetText( LineEnd aSeparator ) const SAL_OVERRIDE; + virtual OUString GetSelected( LineEnd aSeparator ) const SAL_OVERRIDE; }; @@ -246,13 +246,13 @@ namespace svt const IEditImplementation* GetEditImplementation( ) const { return m_pEditImplementation; } IEditImplementation* GetEditImplementation( ) { return m_pEditImplementation; } - virtual void SetModified(); - virtual bool IsModified() const; - virtual void ClearModified(); + virtual void SetModified() SAL_OVERRIDE; + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const; - virtual void SetModifyHdl(const Link& rLink); + virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; + virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; }; @@ -265,13 +265,13 @@ namespace svt SpinCellController(SpinField* pSpinField); SpinField& GetSpinWindow() const {return (SpinField &)GetWindow();} - virtual void SetModified(); - virtual bool IsModified() const; - virtual void ClearModified(); + virtual void SetModified() SAL_OVERRIDE; + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const; - virtual void SetModifyHdl(const Link& rLink); + virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; + virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; }; @@ -287,13 +287,13 @@ namespace svt CheckBoxControl(Window* pParent, WinBits nWinStyle = 0); ~CheckBoxControl(); - virtual void GetFocus(); - virtual bool PreNotify(NotifyEvent& rEvt); - virtual void Paint(const Rectangle& rClientRect); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& _rEvent ); - virtual void Resize(); + virtual void GetFocus() SAL_OVERRIDE; + virtual bool PreNotify(NotifyEvent& rEvt) SAL_OVERRIDE; + virtual void Paint(const Rectangle& rClientRect) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& _rEvent ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void SetClickHdl(const Link& rHdl) {m_aClickLink = rHdl;} const Link& GetClickHdl() const {return m_aClickLink;} @@ -318,12 +318,12 @@ namespace svt CheckBoxCellController(CheckBoxControl* pWin):CellController(pWin){} CheckBox& GetCheckBox() const; - virtual bool IsModified() const; - virtual void ClearModified(); + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; protected: - virtual void SetModifyHdl(const Link& rLink); - virtual bool WantMouseEvent() const; + virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; + virtual bool WantMouseEvent() const SAL_OVERRIDE; }; @@ -337,7 +337,7 @@ namespace svt ComboBoxControl(Window* pParent, WinBits nWinStyle = 0); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; @@ -351,12 +351,12 @@ namespace svt ComboBoxCellController(ComboBoxControl* pParent); ComboBoxControl& GetComboBox() const {return (ComboBoxControl &)GetWindow();} - virtual bool IsModified() const; - virtual void ClearModified(); + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const; - virtual void SetModifyHdl(const Link& rLink); + virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; + virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; }; @@ -370,7 +370,7 @@ namespace svt ListBoxControl(Window* pParent, WinBits nWinStyle = 0); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; @@ -384,12 +384,12 @@ namespace svt ListBoxCellController(ListBoxControl* pParent); ListBoxControl& GetListBox() const {return (ListBoxControl &)GetWindow();} - virtual bool IsModified() const; - virtual void ClearModified(); + virtual bool IsModified() const SAL_OVERRIDE; + virtual void ClearModified() SAL_OVERRIDE; protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const; - virtual void SetModifyHdl(const Link& rLink); + virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; + virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; }; @@ -401,7 +401,7 @@ namespace svt TYPEINFO_OVERRIDE(); FormattedFieldCellController( FormattedField* _pFormatted ); - virtual void CommitModifications(); + virtual void CommitModifications() SAL_OVERRIDE; }; @@ -414,7 +414,7 @@ namespace svt :BrowserHeader(pParent, nWinBits){} protected: - virtual void DoubleClick(); + virtual void DoubleClick() SAL_OVERRIDE; }; @@ -505,32 +505,32 @@ namespace svt protected: BrowserHeader* GetHeaderBar() const {return pHeader;} - virtual BrowserHeader* CreateHeaderBar(BrowseBox* pParent); + virtual BrowserHeader* CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; // if you want to have an own header ... virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent); - virtual void ColumnMoved(sal_uInt16 nId); - virtual void ColumnResized(sal_uInt16 nColId); - virtual void Resize(); + virtual void ColumnMoved(sal_uInt16 nId) SAL_OVERRIDE; + virtual void ColumnResized(sal_uInt16 nColId) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); - virtual bool SeekRow(long nRow); + virtual bool SeekRow(long nRow) SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void KeyInput(const KeyEvent& rEvt); - virtual void MouseButtonDown(const BrowserMouseEvent& rEvt); - virtual void MouseButtonUp(const BrowserMouseEvent& rEvt); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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; using BrowseBox::MouseButtonUp; using BrowseBox::MouseButtonDown; - virtual bool PreNotify(NotifyEvent& rNEvt ); - virtual bool Notify(NotifyEvent& rNEvt); + virtual bool PreNotify(NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; - virtual void EndScroll(); + virtual void EndScroll() SAL_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; @@ -542,19 +542,19 @@ namespace svt virtual RowStatus GetRowStatus(long nRow) const; - virtual void RowHeightChanged(); + virtual void RowHeightChanged() SAL_OVERRIDE; // callbacks for the data window - virtual void ImplStartTracking(); - virtual void ImplTracking(); - virtual void ImplEndTracking(); + virtual void ImplStartTracking() SAL_OVERRIDE; + virtual void ImplTracking() SAL_OVERRIDE; + virtual void ImplEndTracking() SAL_OVERRIDE; // when changing a row: // CursorMoving: cursor is beeing moved, but GetCurRow() still provides the old row virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); // cursor has been moved - virtual void CursorMoved(); + virtual void CursorMoved() SAL_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 void InitController(CellControllerRef& rController, long nRow, sal_uInt16 nCol); virtual void ResizeController(CellControllerRef& rController, const Rectangle&); virtual void ReleaseController(CellControllerRef& pController, long nRow, sal_uInt16 nCol); - virtual void DoubleClick(const BrowserMouseEvent&); + virtual void DoubleClick(const BrowserMouseEvent&) SAL_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; + virtual bool IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const SAL_OVERRIDE; void PaintTristate(OutputDevice& rDev, const Rectangle& rRect, const TriState& eState, bool _bEnabled=true) const; @@ -621,10 +621,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 ); + CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos ) SAL_OVERRIDE; /** @return The count of additional controls of the control area. */ - virtual sal_Int32 GetAccessibleControlCount() const; + virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; /** Creates the accessible object of an additional control. @param nIndex @@ -633,7 +633,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 ); + CreateAccessibleControl( sal_Int32 nIndex ) SAL_OVERRIDE; /** Creates the accessible object of a column header. @param nColumnId @@ -642,13 +642,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 ); + CreateAccessibleRowHeader( sal_Int32 _nRow ) SAL_OVERRIDE; /** Sets focus to current cell of the data table. */ - virtual void GrabTableFocus(); + virtual void GrabTableFocus() SAL_OVERRIDE; - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); + 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; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState); @@ -658,7 +658,7 @@ namespace svt private: virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, - sal_uInt16 nColumnId ) const; + sal_uInt16 nColumnId ) const SAL_OVERRIDE; using Control::ImplInitSettings; SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SVT_DLLPRIVATE void DetermineFocus( const sal_uInt16 _nGetFocusFlags = 0); diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx index 2276e0132644..a7c1291e4de1 100644 --- a/include/svtools/editsyntaxhighlighter.hxx +++ b/include/svtools/editsyntaxhighlighter.hxx @@ -36,15 +36,15 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit virtual void DoBracketHilight(sal_uInt16 aKey); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); ~MultiLineEditSyntaxHighlight(); - virtual void UpdateData(); - virtual void SetText(const OUString& rNewText); - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) + virtual void UpdateData() SAL_OVERRIDE; + virtual void SetText(const OUString& rNewText) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE { SetText( rStr ); SetSelection( rNewSelection ); } Color GetColorValue(TokenTypes aToken); diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 0f5a4dbae228..3efcfb8d4247 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -38,7 +38,7 @@ public: SfxErrorContext( sal_uInt16 nCtxIdP, const OUString &aArg1, Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); - bool GetString(sal_uLong nErrId, OUString &rStr); + bool GetString(sal_uLong nErrId, OUString &rStr) SAL_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; + virtual bool CreateString( const ErrorInfo *, OUString &, sal_uInt16 &) const SAL_OVERRIDE; }; #endif diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index f77148c9dae9..f3808dbfe066 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -35,9 +35,9 @@ private: protected: - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; public: // object, replacement image, and the aspect diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index 495ced772ffd..e4dbacaab765 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -69,7 +69,7 @@ public: ExtendedColorConfig(); ~ExtendedColorConfig(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_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 dd80a3f938c6..47809595576f 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -57,9 +57,9 @@ private: SVT_DLLPRIVATE void ImplBrowseFile( ); protected: - SVT_DLLPRIVATE void Resize(); - SVT_DLLPRIVATE void GetFocus(); - SVT_DLLPRIVATE void StateChanged( StateChangedType nType ); + SVT_DLLPRIVATE void Resize() SAL_OVERRIDE; + SVT_DLLPRIVATE void GetFocus() SAL_OVERRIDE; + SVT_DLLPRIVATE void StateChanged( StateChangedType nType ) SAL_OVERRIDE; SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); DECL_DLLPRIVATE_LINK( ButtonHdl, void* ); @@ -70,13 +70,13 @@ public: Edit& GetEdit() { return maEdit; } PushButton& GetButton() { return maButton; } - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; void SetOpenDialog( bool bOpen ) { mbOpenDlg = bOpen; } bool IsOpenDialog() const { return mbOpenDlg; } - void SetText( const OUString& rStr ); - OUString GetText() const; + void SetText( const OUString& rStr ) SAL_OVERRIDE; + OUString GetText() const SAL_OVERRIDE; OUString GetSelectedText() const { return maEdit.GetSelected(); } void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); } diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 1ba68e71f1dd..f75cb5c0ec4a 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -40,8 +40,8 @@ namespace svt FileURLBox( Window* _pParent, WinBits _nStyle ); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_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 4d845b6527c2..a1a2aa835ce0 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -77,7 +77,7 @@ private: DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar * ); protected: - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; public: SvtFileView( Window* pParent, const ResId& rResId, bool bOnlyFolder, bool bMultiSelection ); @@ -93,8 +93,8 @@ public: void SetHelpId( const OString& rHelpId ); const OString& GetHelpId( ) const; - void SetSizePixel( const Size& rNewSize ); - virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); + void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; + virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE; void SetSortColumn( bool bValue ) { bSortColumn = bValue; } bool GetSortColumn() { return bSortColumn; } @@ -195,7 +195,7 @@ public: void EndInplaceEditing( bool _bCancel ); protected: - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; }; // struct SvtContentEntry ------------------------------------------------ diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index 3dc58ab5e912..3c83d6d8fc62 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -158,11 +158,11 @@ public: // Formatueberpruefung waehrend der Eingabe ? // Spin-Handling - virtual void Up(); - virtual void Down(); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; // Standard-Implementierung : hoch- oder runterzaehlen des aktuellen double einfach um die gesetzte SpinSize - virtual void First(); - virtual void Last(); + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; // Standard-Implementierung : aktuelles double setzen auf eingestellten first respektive last value void SetSpinSize(double dStep) { m_dSpinSize = dStep; } @@ -178,8 +178,8 @@ public: void TreatAsNumber(bool bDoSo) { m_bTreatAsNumber = bDoSo; } public: - virtual void SetText( const OUString& rStr ); - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE; // die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf sal_False sitzt /** nehmen wir mal an, irgendjemand will das ganze schoene double-Handling gar nicht haben, sondern @@ -234,9 +234,9 @@ public: bool IsUsingInputStringForFormatting() const; protected: - virtual bool Notify(NotifyEvent& rNEvt); + virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; void impl_Modify(bool makeValueDirty = true); - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; // CheckText ueberschreiben fuer Ueberpruefung zur Eingabezeit virtual bool CheckText(const OUString&) const { return true; } @@ -254,7 +254,7 @@ protected: virtual SvNumberFormatter* CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; } SvNumberFormatter* ImplGetFormatter() const { return m_pFormatter ? m_pFormatter : ((FormattedField*)this)->CreateFormatter(); } - bool PreNotify(NotifyEvent& rNEvt); + bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; virtual void ReFormat(); }; @@ -276,9 +276,9 @@ public: virtual ~DoubleNumericField(); protected: - virtual bool CheckText(const OUString& sText) const; + virtual bool CheckText(const OUString& sText) const SAL_OVERRIDE; - virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat); + virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat) SAL_OVERRIDE; void ResetConformanceTester(); }; @@ -303,7 +303,7 @@ public: void setPrependCurrSym(bool _bPrepend); protected: - virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat); + virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat) SAL_OVERRIDE; void UpdateCurrencyFormat(); }; diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index 0ad275989cb1..4bac9db32dd7 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.hxx @@ -41,8 +41,8 @@ public: SvtFontSubstConfig(); virtual ~SvtFontSubstConfig(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_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 fe735a20d515..22babad68288 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -54,23 +54,23 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu bool isBound() 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); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + 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; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); - 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); + 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; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XFrameActionListener - virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: struct Listener diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index b02698a926ff..15b542cc3458 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 ); + virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, ExecuteInfo* ); diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 217de45144ad..3ec3b7b255d0 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -97,27 +97,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); + 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; // XTypeProvider - virtual com::sun::star::uno::Sequence<com::sun::star::uno::Type> SAL_CALL getTypes( ) throw(com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) = 0; + 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; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) = 0; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception); - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) = 0; + 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 ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_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); - 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); + 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; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL execute( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + 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; // 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); + 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; protected: /** create the concret dialog instance. note that m_aMutex is not locked when this method get's called, diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 09fdbfdfa7ad..4b392a9693e1 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -304,9 +304,9 @@ protected: virtual void GraphicManagerDestroyed(); virtual SvStream* GetSwapStream() const; - virtual void Load( SvStream& ); - virtual void Save( SvStream& ); - virtual void Assign( const SvDataCopyStream& ); + virtual void Load( SvStream& ) SAL_OVERRIDE; + virtual void Save( SvStream& ) SAL_OVERRIDE; + virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE; public: diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 94f30889b849..940633dfa810 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -294,16 +294,16 @@ public: HeaderBar( Window* pParent, WinBits nWinBits = WB_STDHEADERBAR ); ~HeaderBar(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong 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 UserDraw( const UserDrawEvent& rUDEvt ); virtual void StartDrag(); @@ -370,9 +370,9 @@ public: /** Creates and returns the accessible object of the header bar. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_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( sal_Bool bCreate ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( sal_Bool bCreate ) SAL_OVERRIDE; }; diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index e06c7e93b77e..6aca1a439c87 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -46,8 +46,8 @@ public: SvxHtmlOptions(); ~SvxHtmlOptions(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_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 954cd4d6a96b..4b6de2647dc0 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -40,10 +40,10 @@ namespace svt HyperLabelImpl* m_pImpl; Link maClickHdl; - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + 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; void DeactivateHyperMode(Font aFont, const Color aColor); void ActivateHyperMode(Font aFont, const Color aColor); @@ -55,7 +55,7 @@ namespace svt HyperLabel( Window* _pParent, WinBits _nWinStyle = 0 ); ~HyperLabel( ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetID( sal_Int16 _ID ); sal_Int16 GetID() const; diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx index 1750dc7638a0..ac4cb9ad9bae 100644 --- a/include/svtools/imapcirc.hxx +++ b/include/svtools/imapcirc.hxx @@ -35,8 +35,8 @@ class SVT_DLLPUBLIC IMapCircleObject : public IMapObject protected: // Binaer-Im-/Export - virtual void WriteIMapObject( SvStream& rOStm ) const; - virtual void ReadIMapObject( SvStream& rIStm ); + virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE; + virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE; public: @@ -51,14 +51,14 @@ public: bool bPixelCoords = true ); virtual ~IMapCircleObject() {}; - virtual sal_uInt16 GetType() const; - virtual bool IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual bool IsHit( const Point& rPoint ) const SAL_OVERRIDE; Point GetCenter( bool bPixelCoords = true ) const; sal_uLong GetRadius( bool bPixelCoords = true ) const; // liefert das BoundRect des Kreis-Objektes in 1/100mm - virtual Rectangle GetBoundRect() const; + virtual Rectangle GetBoundRect() const SAL_OVERRIDE; void Scale( const Fraction& rFractX, const Fraction& rFracY ); diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx index 5c7615e1c41e..7089e140854b 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; - virtual void ReadIMapObject( SvStream& rIStm ); + virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE; + virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE; bool ReadPreProLine( SvStream& rIStm, OUString& rStr ); @@ -54,13 +54,13 @@ public: bool bPixelCoords = true ); virtual ~IMapPolygonObject() {}; - virtual sal_uInt16 GetType() const; - virtual bool IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual bool IsHit( const Point& rPoint ) const SAL_OVERRIDE; Polygon GetPolygon( bool bPixelCoords = true ) const; // liefert das BoundRect des Polygon-Objektes in 1/100mm - virtual Rectangle GetBoundRect() const { return aPoly.GetBoundRect(); } + virtual Rectangle GetBoundRect() const SAL_OVERRIDE { return aPoly.GetBoundRect(); } bool HasExtraEllipse() const { return bEllipse; } const Rectangle& GetExtraEllipse() const { return aEllipse; } diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx index 72106265577b..17c96841a5d1 100644 --- a/include/svtools/imaprect.hxx +++ b/include/svtools/imaprect.hxx @@ -34,8 +34,8 @@ class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject protected: // Binaer-Im-/Export - virtual void WriteIMapObject( SvStream& rOStm ) const; - virtual void ReadIMapObject( SvStream& rIStm ); + virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE; + virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE; public: @@ -50,13 +50,13 @@ public: bool bPixelCoords = true ); virtual ~IMapRectangleObject() {}; - virtual sal_uInt16 GetType() const; - virtual bool IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual bool IsHit( const Point& rPoint ) const SAL_OVERRIDE; Rectangle GetRectangle( bool bPixelCoords = true ) const; // liefert das BoundRect des Rechteck-Objektes in 1/100mm - virtual Rectangle GetBoundRect() const { return aRect; } + virtual Rectangle GetBoundRect() const SAL_OVERRIDE { return aRect; } void Scale( const Fraction& rFractX, const Fraction& rFracY ); diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 0d14ba13d913..0c314de0dd70 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -52,10 +52,10 @@ friend class SvtURLBox_Impl; SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID); protected: - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Select(); - virtual void Modify(); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: SvtURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 82ee15894e68..46478a47c69b 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -229,23 +229,23 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control protected: - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled ); virtual void DocumentRectChanged(); virtual void VisibleRectChanged(); virtual bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Paint( 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 ClickIcon(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + 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 DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, @@ -255,7 +255,7 @@ protected: SvxIconChoiceCtrlEntry* pEntry, bool bInplaceEdit ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; void CallImplEventListeners(sal_uLong nEvent, void* pData); @@ -346,7 +346,7 @@ public: /** Creates and returns the accessible object of the Box. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; #endif // INCLUDED_SVTOOLS_IVCTRL_HXX diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx index 9cd45830b0dd..08e4f75f4304 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw (); + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SVT_DLLPRIVATE JavaContext(); //not implemented diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx index c20aeabc756f..2425cee6df96 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL release() throw() SAL_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); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: oslInterlockedCount m_aRefCount; diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index 7ff7a9198fd2..ca854d07b9e1 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); + virtual void SAL_CALL disposing ( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDropTargetListener - virtual void SAL_CALL drop ( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragEnter ( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragExit ( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragOver ( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception); + 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; 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 67497cac07e4..ed4f4c386fcf 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -154,7 +154,7 @@ protected: int _GetNextRawToken(); // scanne das naechste Token, - virtual int _GetNextToken(); + virtual int _GetNextToken() SAL_OVERRIDE; virtual ~HTMLParser(); @@ -163,7 +163,7 @@ protected: public: HTMLParser( SvStream& rIn, bool bReadNewDoc = true ); - virtual SvParserState CallParser(); // Aufruf des Parsers + virtual SvParserState CallParser() SAL_OVERRIDE; // Aufruf des Parsers bool IsNewDoc() const { return bNewDoc; } bool IsInHeader() const { return bIsInHeader; } @@ -217,7 +217,7 @@ public: const HTMLOptions& GetOptions( sal_uInt16 *pNoConvertToken=0 ); // fuers asynchrone lesen aus dem SvStream - virtual void Continue( int nToken ); + virtual void Continue( int nToken ) SAL_OVERRIDE; protected: diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx index 3deb006c17c4..8b596eaa5594 100644 --- a/include/svtools/parrtf.hxx +++ b/include/svtools/parrtf.hxx @@ -53,7 +53,7 @@ protected: void SkipGroup(); // scanne das naechste Token, - virtual int _GetNextToken(); + virtual int _GetNextToken() SAL_OVERRIDE; virtual void ReadUnknownData(); virtual void ReadBitmapData(); @@ -70,14 +70,14 @@ protected: public: SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize = 3 ); - virtual SvParserState CallParser(); // Aufruf des Parsers + virtual SvParserState CallParser() SAL_OVERRIDE; // Aufruf des Parsers int GetOpenBrakets() const { return nOpenBrakets; } // fuers asynchrone lesen aus dem SvStream // virtual void SaveState( int nToken ); // virtual void RestoreState(); - virtual void Continue( int nToken ); + virtual void Continue( int nToken ) SAL_OVERRIDE; }; #endif // INCLUDED_SVTOOLS_PARRTF_HXX diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index 1164f93cdb70..168c43b79076 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) = 0; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; + 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; // 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); - virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception); + 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; // 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); + 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; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XMenuListener - virtual void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + 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; // 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 ); - 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 ); + 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; // 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 ); - 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 ); - 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 ); + 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; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual 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 49513fe86d2d..8925481980a8 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -44,30 +44,30 @@ public: virtual ::Window* createPopupWindow( ::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); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + 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; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + 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; // 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); + 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; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); + 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; private: boost::scoped_ptr< PopupWindowControllerImpl > mpImpl; }; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 7b0daef856f1..c83feda4609c 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -65,10 +65,10 @@ public: void SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; } Printer* GetPrinter() const { return mpPrinter; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; void SetOptionsHdl( const Link& rLink ); }; diff --git a/include/svtools/roadmap.hxx b/include/svtools/roadmap.hxx index 2a7b0e44cff4..a35e217b82e4 100644 --- a/include/svtools/roadmap.hxx +++ b/include/svtools/roadmap.hxx @@ -52,7 +52,7 @@ namespace svt protected: RoadmapImpl* m_pImpl; // Window overridables - void Paint( const Rectangle& _rRect ); + void Paint( const Rectangle& _rRect ) SAL_OVERRIDE; void implInit(); public: @@ -84,12 +84,12 @@ namespace svt void SetItemSelectHdl( const Link& _rHdl ); Link GetItemSelectHdl( ) const; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void GetFocus(); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; protected: - bool PreNotify( NotifyEvent& rNEvt ); + bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; protected: /// called when an item has been selected by any means diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index f8165a1204f9..c2dcc819e88d 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -82,15 +82,15 @@ namespace svt void SetRoadmapHelpId( const OString& _rId ); void SetRoadmapInteractive( bool _bInteractive ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; // returns whether a given state is enabled bool isStateEnabled( WizardState _nState ) const; // WizardDialog overridables - virtual bool canAdvance() const; - virtual void updateTravelUI(); + virtual bool canAdvance() const SAL_OVERRIDE; + virtual void updateTravelUI() SAL_OVERRIDE; protected: /** declares a valid path in the wizard @@ -165,7 +165,7 @@ protected: @see activatePath */ - virtual WizardState determineNextState( WizardState _nCurrentState ) const; + virtual WizardState determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE; /** en- or disables a state @@ -194,7 +194,7 @@ protected: bool knowsState( WizardState _nState ) const; // OWizardMachine overriables - virtual void enterState( WizardState _nState ); + virtual void enterState( WizardState _nState ) SAL_OVERRIDE; /** returns a human readable name for a given state @@ -210,7 +210,7 @@ protected: This member is inherited from OWizardMachine, and default-implemented in this class for all states which have been described using describeState. */ - virtual TabPage* createPage( WizardState _nState ); + virtual TabPage* createPage( WizardState _nState ) SAL_OVERRIDE; /** asks for a new label of the wizard page diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 1924153b3d55..d162639627d0 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -715,13 +715,13 @@ public: Ruler( Window* pParent, WinBits nWinStyle = WB_STDRULER ); virtual ~Ruler(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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( 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 long StartDrag(); virtual void Drag(); @@ -730,8 +730,8 @@ public: virtual void DoubleClick(); virtual void ExtraDown(); - void Activate(); - void Deactivate(); + void Activate() SAL_OVERRIDE; + void Deactivate() SAL_OVERRIDE; bool IsActive() const { return mbActive; } void SetWinPos( long nOff = 0, long nWidth = 0 ); @@ -823,7 +823,7 @@ public: void DrawTicks(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; #endif // _RULER_HXX diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 512498f2d6d7..a85c9cd64253 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -65,22 +65,22 @@ public: ScrollableWindow( Window* pParent, WinBits nBits = 0, ScrollableWindowFlags = SCRWIN_DEFAULT ); - virtual void Resize(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void DataChanged( const DataChangedEvent& rDEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDEvt ) SAL_OVERRIDE; virtual void StartScroll(); virtual void EndScroll( long nDeltaX, long nDeltaY ); using OutputDevice::SetMapMode; - virtual void SetMapMode( const MapMode& rNewMapMode ); + virtual void SetMapMode( const MapMode& rNewMapMode ) SAL_OVERRIDE; virtual MapMode GetMapMode() const; void SetTotalSize( const Size& rNewSize ); Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } using Window::Scroll; - virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 ); + virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; private: SVT_DLLPRIVATE Size GetOutputSizePixel() const; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index f1615604420e..0b458e7ef8b0 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -31,7 +31,7 @@ private: SvSimpleTable* m_pTable; protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: SvSimpleTableContainer( Window* pParent, const ResId& rResId ); @@ -39,9 +39,9 @@ public: void SetTable(SvSimpleTable* pTable); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; }; class SVT_DLLPUBLIC SvSimpleTable : public SvHeaderTabListBox @@ -69,10 +69,10 @@ private: protected: - virtual void NotifyScrolled(); + virtual void NotifyScrolled() SAL_OVERRIDE; - virtual void SetTabs(); - virtual void Paint( const Rectangle& rRect ); + virtual void SetTabs() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void HBarClick(); virtual void HBarDblClick(); @@ -80,7 +80,7 @@ protected: virtual void HBarDrag(); virtual void HBarEndDrag(); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual sal_Int32 ColCompare(SvTreeListEntry*,SvTreeListEntry*); public: diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index ccb0aaa57774..957aa5315c59 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -58,40 +58,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); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + 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; // 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); + 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; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); - 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); + 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; // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusbarController - virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + 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 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); + const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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); - virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::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; protected: struct Listener diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx index b6e23763065b..7f61dd8f9bf8 100644 --- a/include/svtools/stdmenu.hxx +++ b/include/svtools/stdmenu.hxx @@ -112,8 +112,8 @@ public: FontNameMenu(); virtual ~FontNameMenu(); - virtual void Select(); - virtual void Highlight(); + virtual void Select() SAL_OVERRIDE; + virtual void Highlight() SAL_OVERRIDE; void Fill( const FontList* pList ); @@ -142,8 +142,8 @@ public: FontSizeMenu(); ~FontSizeMenu(); - virtual void Select(); - virtual void Highlight(); + virtual void Select() SAL_OVERRIDE; + virtual void Highlight() SAL_OVERRIDE; void Fill( const FontInfo& rInfo, const FontList* pList ); diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index d0dad086a4a4..67197be94add 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -41,8 +41,8 @@ namespace svt protected: // TransferableHelper overridables - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ) SAL_OVERRIDE; }; diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index d270cb6c9ef5..8c66b83511e7 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -98,17 +98,17 @@ public: SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const OUString& rStr); SvLBoxString(); virtual ~SvLBoxString(); - virtual sal_uInt16 GetType() const; - virtual void InitViewData(SvTreeListBox*, SvTreeListEntry*, SvViewDataItem*); + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual void InitViewData(SvTreeListBox*, SvTreeListEntry*, SvViewDataItem*) SAL_OVERRIDE; OUString GetText() const { return maText; } virtual OUString GetExtendText() const { return OUString(); } void SetText( const OUString& rText ) { maText = rText; } virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; - virtual SvLBoxItem* Create() const; - virtual void Clone( SvLBoxItem* pSource ); + virtual SvLBoxItem* Create() const SAL_OVERRIDE; + virtual void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; }; class SvLBoxBmp : public SvLBoxItem @@ -117,12 +117,12 @@ class SvLBoxBmp : public SvLBoxItem public: SvLBoxBmp(); virtual ~SvLBoxBmp(); - virtual sal_uInt16 GetType() const; - virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); - virtual SvLBoxItem* Create() const; - virtual void Clone( SvLBoxItem* pSource ); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; + virtual SvLBoxItem* Create() const SAL_OVERRIDE; + virtual void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; }; @@ -152,13 +152,13 @@ public: SvLBoxButtonData* pBData ); SvLBoxButton(); virtual ~SvLBoxButton(); - virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); - virtual sal_uInt16 GetType() const; + virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; + virtual sal_uInt16 GetType() const SAL_OVERRIDE; virtual bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* ); virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); - virtual SvLBoxItem* Create() const; - virtual void Clone( SvLBoxItem* pSource ); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; + virtual SvLBoxItem* Create() const SAL_OVERRIDE; + virtual void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; sal_uInt16 GetButtonFlags() const { return nItemFlags; } bool IsStateChecked() const { return (nItemFlags & SV_ITEMSTATE_CHECKED)!=0; } bool IsStateUnchecked() const { return (nItemFlags & SV_ITEMSTATE_UNCHECKED)!=0; } @@ -214,12 +214,12 @@ public: SvLBoxContextBmp(); virtual ~SvLBoxContextBmp(); - virtual sal_uInt16 GetType() const; - virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); + virtual sal_uInt16 GetType() const SAL_OVERRIDE; + virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); - virtual SvLBoxItem* Create() const; - virtual void Clone( SvLBoxItem* pSource ); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; + virtual SvLBoxItem* Create() const SAL_OVERRIDE; + virtual void Clone( SvLBoxItem* pSource ) SAL_OVERRIDE; bool SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 ); diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx index 64d81bd721fe..7d84c2efee4d 100644 --- a/include/svtools/svmedit.hxx +++ b/include/svtools/svmedit.hxx @@ -35,7 +35,7 @@ public: MultiLineEdit( Window* pParent, const ResId& rResId ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface(sal_Bool bCreate = sal_True); + GetComponentInterface(sal_Bool bCreate = sal_True) SAL_OVERRIDE; }; diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index a084f568597b..c8d1551735e2 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(); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); + virtual void SetTabs() SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; OUString GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const; SvTreeListEntry* GetEntryOnPos( sal_uLong _nEntryPos ) const; @@ -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 ); + SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) SAL_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 ); + SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) SAL_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; + virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; OUString GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ) const; 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(); + virtual void Resize() SAL_OVERRIDE; void SetTabJustify( sal_uInt16 nTab, SvTabJustify ); }; @@ -142,20 +142,20 @@ public: SvHeaderTabListBox( Window* pParent, WinBits nBits ); ~SvHeaderTabListBox(); - virtual void Paint( const Rectangle& ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; void InitHeaderBar( HeaderBar* pHeaderBar ); bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND, - sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); + sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) SAL_OVERRIDE; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent, - sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); + sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ) SAL_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 ); - virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND); - virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = TREELIST_APPEND ); + 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; void RemoveEntry( SvTreeListEntry* _pEntry ); void Clear(); @@ -167,85 +167,85 @@ public: bool IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState ); /** @return The count of the rows. */ - virtual long GetRowCount() const; + virtual long GetRowCount() const SAL_OVERRIDE; /** @return The count of the columns. */ - virtual sal_uInt16 GetColumnCount() const; + virtual sal_uInt16 GetColumnCount() const SAL_OVERRIDE; /** @return The position of the current row. */ - virtual sal_Int32 GetCurrRow() const; + virtual sal_Int32 GetCurrRow() const SAL_OVERRIDE; /** @return The position of the current column. */ - virtual sal_uInt16 GetCurrColumn() const; + virtual sal_uInt16 GetCurrColumn() const SAL_OVERRIDE; /** @return The description of a row. @param _nRow The row which description is in demand. */ - virtual OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const SAL_OVERRIDE; /** @return The description of a column. @param _nColumn The column which description is in demand. */ - virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const; + virtual OUString GetColumnDescription( sal_uInt16 _nColumn ) const SAL_OVERRIDE; /** @return <TRUE/>, if the object has a row header. */ - virtual bool HasRowHeader() const; //GetColumnId + virtual bool HasRowHeader() const SAL_OVERRIDE; //GetColumnId /** @return <TRUE/>, if the object can focus a cell. */ - virtual bool IsCellFocusable() const; - virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); + virtual bool IsCellFocusable() const SAL_OVERRIDE; + virtual bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) SAL_OVERRIDE; - virtual void SetNoSelection(); + virtual void SetNoSelection() SAL_OVERRIDE; using SvListView::SelectAll; - virtual void SelectAll(); - virtual void SelectAll( bool bSelect, bool bPaint = true ); - virtual void SelectRow( long _nRow, bool _bSelect = true, bool bExpand = true ); - virtual void SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ); - virtual sal_Int32 GetSelectedRowCount() const; - virtual sal_Int32 GetSelectedColumnCount() const; + 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; /** @return <TRUE/>, if the row is selected. */ - virtual bool IsRowSelected( long _nRow ) const; - virtual bool IsColumnSelected( long _nColumn ) const; - virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const; - virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const; + 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; /** @return <TRUE/>, if the cell is visible. */ - virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; - virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const; + virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; + virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const SAL_OVERRIDE; - virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ); - virtual Rectangle calcTableRect( bool _bOnScreen = true ); - virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen = true ); + 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 css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ); - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ); + 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 sal_Int32 GetAccessibleControlCount() const; - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ); - virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ); + 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 bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ); - virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ); - virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ); + 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 OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const; - virtual Window* GetWindowInstance(); + 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 Window* GetWindowInstance() SAL_OVERRIDE; using SvTreeListBox::FillAccessibleStateSet; - virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const; - virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const; - virtual void GrabTableFocus(); + 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; // OutputDevice - virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); + virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) SAL_OVERRIDE; // Window - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; - virtual void GrabFocus(); - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); - virtual Window* GetAccessibleParentWindow() const; + virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual void GrabFocus() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; + virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; /** Creates and returns the accessible object of the whole BrowseBox. */ - virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); + 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; }; #endif // INCLUDED_SVTOOLS_SVTABBX_HXX diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index ca025cc86396..0c7751a404fe 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -412,14 +412,14 @@ public: TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); virtual ~TabBar(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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( 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 void Select(); virtual void DoubleClick(); @@ -555,7 +555,7 @@ public: const Link& GetScrollAreaContextHdl() const { return maScrollAreaContextHdl; } // accessibility - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; #endif // INCLUDED_SVTOOLS_TABBAR_HXX diff --git a/include/svtools/table/defaultinputhandler.hxx b/include/svtools/table/defaultinputhandler.hxx index 11544fd5369c..e1079163cf91 100644 --- a/include/svtools/table/defaultinputhandler.hxx +++ b/include/svtools/table/defaultinputhandler.hxx @@ -44,16 +44,16 @@ namespace svt { namespace table DefaultInputHandler(); ~DefaultInputHandler(); - virtual bool MouseMove ( ITableControl& _rControl, const MouseEvent& rMEvt ); - virtual bool MouseButtonDown ( ITableControl& _rControl, const MouseEvent& rMEvt ); - virtual bool MouseButtonUp ( ITableControl& _rControl, const MouseEvent& rMEvt ); - virtual bool KeyInput ( ITableControl& _rControl, const KeyEvent& rKEvt ); - virtual bool GetFocus ( ITableControl& _rControl ); - virtual bool LoseFocus ( ITableControl& _rControl ); - virtual bool RequestHelp ( ITableControl& _rControl, const HelpEvent& rHEvt ); - virtual bool Command ( ITableControl& _rControl, const CommandEvent& rCEvt ); - virtual bool PreNotify ( ITableControl& _rControl, NotifyEvent& rNEvt ); - virtual bool Notify ( ITableControl& _rControl, NotifyEvent& rNEvt ); + virtual bool MouseMove ( ITableControl& _rControl, const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual bool MouseButtonDown ( ITableControl& _rControl, const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual bool MouseButtonUp ( ITableControl& _rControl, const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual bool KeyInput ( ITableControl& _rControl, const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual bool GetFocus ( ITableControl& _rControl ) SAL_OVERRIDE; + virtual bool LoseFocus ( ITableControl& _rControl ) SAL_OVERRIDE; + virtual bool RequestHelp ( ITableControl& _rControl, const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual bool Command ( ITableControl& _rControl, const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual bool PreNotify ( ITableControl& _rControl, NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify ( ITableControl& _rControl, NotifyEvent& rNEvt ) SAL_OVERRIDE; }; diff --git a/include/svtools/table/gridtablerenderer.hxx b/include/svtools/table/gridtablerenderer.hxx index 6842fc33cda2..8022c81ec6af 100644 --- a/include/svtools/table/gridtablerenderer.hxx +++ b/include/svtools/table/gridtablerenderer.hxx @@ -68,34 +68,34 @@ namespace svt { namespace table virtual void PaintHeaderArea( OutputDevice& _rDevice, const Rectangle& _rArea, bool _bIsColHeaderArea, bool _bIsRowHeaderArea, - const StyleSettings& _rStyle ); + const StyleSettings& _rStyle ) SAL_OVERRIDE; virtual void PaintColumnHeader( ColPos _nCol, bool _bActive, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle ); + const StyleSettings& _rStyle ) SAL_OVERRIDE; virtual void PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rRowArea, - const StyleSettings& _rStyle ); + const StyleSettings& _rStyle ) SAL_OVERRIDE; virtual void PaintRowHeader( bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle ); + const StyleSettings& _rStyle ) SAL_OVERRIDE; virtual void PaintCell( ColPos const i_col, bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle ); - virtual void ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect); - virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect); + const StyleSettings& _rStyle ) SAL_OVERRIDE; + virtual void ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; + virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; virtual bool FitsIntoCell( ::com::sun::star::uno::Any const & i_cellContent, ColPos const i_colPos, RowPos const i_rowPos, bool const i_active, bool const i_selected, OutputDevice& i_targetDevice, Rectangle const & i_targetArea - ) const; + ) const SAL_OVERRIDE; virtual bool GetFormattedCellString( ::com::sun::star::uno::Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, OUString & o_cellString - ) const; + ) const SAL_OVERRIDE; private: struct CellRenderContext; diff --git a/include/svtools/table/tablecontrol.hxx b/include/svtools/table/tablecontrol.hxx index e04ba5bbbc57..d8c5bf24c2a9 100644 --- a/include/svtools/table/tablecontrol.hxx +++ b/include/svtools/table/tablecontrol.hxx @@ -82,7 +82,7 @@ namespace svt { namespace table if there is no active cell, e.g. because the table does not contain any rows or columns. */ - sal_Int32 GetCurrentRow() const; + sal_Int32 GetCurrentRow() const SAL_OVERRIDE; ITableControl& getTableControlInterface(); @@ -96,7 +96,7 @@ namespace svt { namespace table if there is no active cell, e.g. because the table does not contain any rows or columns. */ - sal_Int32 GetCurrentColumn() const; + sal_Int32 GetCurrentColumn() const SAL_OVERRIDE; /** activates the cell at the given position @@ -134,7 +134,7 @@ namespace svt { namespace table return GoTo( GetCurrentColumn(), _nRow ); } - SVT_DLLPRIVATE virtual void Resize(); + SVT_DLLPRIVATE virtual void Resize() SAL_OVERRIDE; virtual void Select(); /**after removing a row, updates the vector which contains the selected rows @@ -144,18 +144,18 @@ namespace svt { namespace table Window& getDataWindow(); // Window overridables - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void StateChanged( StateChangedType i_nStateChange ); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType i_nStateChange ) SAL_OVERRIDE; /** Creates and returns the accessible object of the whole GridControl. */ - SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); - SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ); - SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const; - SVT_DLLPRIVATE virtual bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ); - SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const; - SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const; + SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) SAL_OVERRIDE; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const SAL_OVERRIDE; + SVT_DLLPRIVATE virtual bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ) SAL_OVERRIDE; + SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const SAL_OVERRIDE; + SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const SAL_OVERRIDE; // temporary methods // Those do not really belong into the public API - they're intended for firing A11Y-related events. However, @@ -166,38 +166,38 @@ namespace svt { namespace table // IAccessibleTable - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; - virtual void GrabFocus(); - virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); - virtual Window* GetAccessibleParentWindow() const; - virtual Window* GetWindowInstance(); - virtual sal_Int32 GetAccessibleControlCount() const; - virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ); - virtual long GetRowCount() const; - virtual long GetColumnCount() const; - virtual bool HasRowHeader() const; - virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ); - virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ); - virtual Rectangle calcHeaderCellRect( bool _bIsColumnBar, sal_Int32 nPos); - virtual Rectangle calcTableRect( bool _bOnScreen = true ); - virtual Rectangle calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos ); - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); - virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const; - virtual OUString GetRowDescription( sal_Int32 _nRow ) const; - virtual OUString GetRowName(sal_Int32 _nIndex) const; - virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const; - virtual OUString GetColumnName( sal_Int32 _nIndex ) const; - virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const; - virtual bool HasRowHeader(); - virtual bool HasColHeader(); - virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const; - - virtual sal_Int32 GetSelectedRowCount() const; - virtual sal_Int32 GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const; - virtual bool IsRowSelected( sal_Int32 const i_rowIndex ) const; - virtual void SelectRow( sal_Int32 const i_rowIndex, bool const i_select ); - virtual void SelectAllRows( bool const i_select ); + virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual void GrabFocus() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; + virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual Window* GetWindowInstance() SAL_OVERRIDE; + virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; + virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) SAL_OVERRIDE; + virtual long GetRowCount() const SAL_OVERRIDE; + virtual long GetColumnCount() const SAL_OVERRIDE; + virtual bool HasRowHeader() const SAL_OVERRIDE; + virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ) SAL_OVERRIDE; + virtual Rectangle calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) SAL_OVERRIDE; + virtual Rectangle calcHeaderCellRect( bool _bIsColumnBar, sal_Int32 nPos) SAL_OVERRIDE; + virtual Rectangle calcTableRect( bool _bOnScreen = true ) SAL_OVERRIDE; + virtual Rectangle calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos ) SAL_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 void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const SAL_OVERRIDE; + virtual OUString GetRowDescription( sal_Int32 _nRow ) const SAL_OVERRIDE; + virtual OUString GetRowName(sal_Int32 _nIndex) const SAL_OVERRIDE; + virtual OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const SAL_OVERRIDE; + virtual OUString GetColumnName( sal_Int32 _nIndex ) const SAL_OVERRIDE; + virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const SAL_OVERRIDE; + virtual bool HasRowHeader() SAL_OVERRIDE; + virtual bool HasColHeader() SAL_OVERRIDE; + virtual OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const SAL_OVERRIDE; + + virtual sal_Int32 GetSelectedRowCount() const SAL_OVERRIDE; + virtual sal_Int32 GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const SAL_OVERRIDE; + virtual bool IsRowSelected( sal_Int32 const i_rowIndex ) const SAL_OVERRIDE; + virtual void SelectRow( sal_Int32 const i_rowIndex, bool const i_select ) SAL_OVERRIDE; + virtual void SelectAllRows( bool const i_select ) SAL_OVERRIDE; private: diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 61853ac29a8a..238fa2a6083e 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -56,15 +56,15 @@ public: ~ToolbarMenu(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + 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( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; void appendEntry( int nEntryId, const OUString& rStr, MenuItemBits nItemBits = 0 ); void appendEntry( int nEntryId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits = 0 ); @@ -92,7 +92,7 @@ public: void highlightFirstEntry(); protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; // todo: move to new base class that will replace SfxPopupWindow void AddStatusListener( const OUString& rCommandURL ); @@ -104,8 +104,8 @@ protected: // the status updates): virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: DECL_LINK( HighlightHdl, Control * ); diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 06127e027312..a8a6e657bc4b 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); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + 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 css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_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); + 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; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); - 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); + 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; // 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 ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); + 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; // 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); - 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); + 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; // XPropertySet - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + 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; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; const OUString& getCommandURL() const { return m_aCommandURL; } diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index c5867111db14..ed829ea21de7 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -56,22 +56,22 @@ namespace svt DECLARE_IREFERENCE() // IDeckLayouter - virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ); - virtual void Destroy(); - virtual void SetFocusToPanelSelector(); - virtual size_t GetAccessibleChildCount() const; + 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 ::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; // IToolPanelDeckListener - virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ); - virtual void PanelRemoved( const size_t i_nPosition ); - virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); - virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ); - virtual void Dying(); + 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; private: // triggers a re-arrance of the panel deck elements diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index 35323d7aee6e..b4f7b6ac58b3 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -65,23 +65,23 @@ namespace svt PushButton& GetScrollButton( const bool i_bForward ); // Window overridables - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; protected: // Window overridables - virtual void Paint( const Rectangle& i_rRect ); - virtual void Resize(); - virtual void MouseMove( const MouseEvent& i_rMouseEvent ); - virtual void MouseButtonDown( const MouseEvent& i_rMouseEvent ); - virtual void MouseButtonUp( const MouseEvent& i_rMouseEvent ); - virtual void RequestHelp( const HelpEvent& i_rHelpEvent ); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void KeyInput( const KeyEvent& i_rKeyEvent ); - virtual void DataChanged( const DataChangedEvent& i_rDataChanedEvent ); + virtual void Paint( 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 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool i_bCreate ); + GetComponentInterface( sal_Bool i_bCreate ) SAL_OVERRIDE; private: ::std::auto_ptr< PanelTabBar_Impl > m_pImpl; diff --git a/include/svtools/toolpanel/refbase.hxx b/include/svtools/toolpanel/refbase.hxx index 7de482b37693..15fda1805fb1 100644 --- a/include/svtools/toolpanel/refbase.hxx +++ b/include/svtools/toolpanel/refbase.hxx @@ -44,16 +44,16 @@ namespace svt { } - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; private: oslInterlockedCount m_refCount; }; #define DECLARE_IREFERENCE() \ - virtual oslInterlockedCount SAL_CALL acquire(); \ - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; \ + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; #define IMPLEMENT_IREFERENCE( classname ) \ diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx index 72e234ea5fc1..8f9106cd2142 100644 --- a/include/svtools/toolpanel/tablayouter.hxx +++ b/include/svtools/toolpanel/tablayouter.hxx @@ -73,15 +73,15 @@ namespace svt TabAlignment GetTabAlignment() const; // IDeckLayouter - virtual Rectangle Layout( const Rectangle& i_rDeckPlayground ); - virtual void Destroy(); - virtual void SetFocusToPanelSelector(); - virtual size_t GetAccessibleChildCount() const; + 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 ::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; // IReference DECLARE_IREFERENCE() diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index 7423d75e0488..0a046553f7ce 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -152,24 +152,24 @@ namespace svt const ::Window& GetPanelWindowAnchor() const; // IToolPanelDeck - virtual size_t GetPanelCount() const; - virtual PToolPanel GetPanel( const size_t i_nPos ) const; + virtual size_t GetPanelCount() const SAL_OVERRIDE; + virtual PToolPanel GetPanel( const size_t i_nPos ) const SAL_OVERRIDE; virtual ::boost::optional< size_t > - GetActivePanel() const; - virtual void ActivatePanel( const ::boost::optional< size_t >& i_rPanel ); - virtual size_t InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ); - virtual PToolPanel RemovePanel( const size_t i_nPosition ); - virtual void AddListener( IToolPanelDeckListener& i_rListener ); - virtual void RemoveListener( IToolPanelDeckListener& i_rListener ); + 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; protected: // Window overridables - virtual void Resize(); - virtual bool Notify( NotifyEvent& i_rNotifyEvent ); - virtual void GetFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& i_rNotifyEvent ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool i_bCreate ); + GetComponentInterface( sal_Bool i_bCreate ) SAL_OVERRIDE; private: ::std::auto_ptr< ToolPanelDeck_Impl > m_pImpl; diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 87d998dcf0fd..866c4faa4715 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -144,11 +144,11 @@ private: private: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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 ); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + 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; public: @@ -174,24 +174,24 @@ 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); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception); + 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; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDragSourceListener - virtual void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(::com::sun::star::uno::RuntimeException, std::exception); + 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; 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); + 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; protected: // derivees need to access lostOwnership in case hey override it @@ -260,7 +260,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 ); + 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; }; struct TransferableDataHelper_Impl; @@ -384,10 +384,10 @@ private: private: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDragGestureListener - virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: @@ -431,14 +431,14 @@ private: private: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDropTargetListener - virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception); + 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; public: @@ -492,9 +492,9 @@ class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper protected: - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; public: diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 470c4468611b..a8c072e3b343 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -294,7 +294,7 @@ protected: virtual void ReadDragServerInfo( const Point&,SvLBoxDDInfo* ); // Invalidate children on enable/disable - virtual void StateChanged( StateChangedType eType ); + virtual void StateChanged( StateChangedType eType ) SAL_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 ); @@ -309,10 +309,10 @@ protected: bool IsEmptyTextAllowed() const; // Return value must be derived from SvViewDataEntry! - virtual SvViewDataEntry* CreateViewData( SvTreeListEntry* ); + virtual SvViewDataEntry* CreateViewData( SvTreeListEntry* ) SAL_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 ); + virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry ) SAL_OVERRIDE; // Calls InitViewData for all Items void RecalcViewData(); // Callback of RecalcViewData @@ -332,15 +332,15 @@ protected: void OnCurrentEntryChanged(); // IMnemonicEntryList - virtual const void* FirstSearchEntry( OUString& _rEntryText ) const; - virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, OUString& _rEntryText ) const; - virtual void SelectSearchEntry( const void* _pEntry ); - virtual void ExecuteSearchEntry( const void* _pEntry ) const; + 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; // ISearchableStringList - virtual ::vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const; - virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const; - virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ); + 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; public: @@ -350,7 +350,7 @@ public: SvTreeList* GetModel() const { return pModel; } using SvListView::SetModel; - void SetModel(SvTreeList* pNewModel); + void SetModel(SvTreeList* pNewModel) SAL_OVERRIDE; sal_uLong GetEntryCount() const {return pModel->GetEntryCount();} SvTreeListEntry* First() const { return pModel->First(); } @@ -456,9 +456,9 @@ public: // Drag & Drop // New D'n'D API - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + 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 DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* ); virtual void DragFinished( sal_Int8 nDropAction ); @@ -491,7 +491,7 @@ public: /** Creates and returns the accessible object of the Box. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; /** Fills the StateSet with all states (except DEFUNC, done by the accessible object). */ virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet ) const; @@ -521,7 +521,7 @@ public: void set_min_width_in_chars(sal_Int32 nChars); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; protected: using SvListView::SelectAll; @@ -578,12 +578,12 @@ protected: // This can be used to hide Elements which are painted from outside into the Control virtual void NotifyInvalidating(); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual void CursorMoved( SvTreeListEntry* pNewCursor ); virtual void PreparePaint( SvTreeListEntry* ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void InitSettings(bool bFont, bool bForeground, bool bBackground); bool IsCellFocusEnabled() const; @@ -671,25 +671,25 @@ public: virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Paint( 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; void SetUpdateMode( bool ); - virtual void ModelHasCleared(); - virtual void ModelHasInserted( SvTreeListEntry* pEntry ); - virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry ); + virtual void ModelHasCleared() SAL_OVERRIDE; + virtual void ModelHasInserted( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry ) SAL_OVERRIDE; virtual void ModelIsMoving(SvTreeListEntry* pSource, - SvTreeListEntry* pTargetParent, sal_uLong nChildPos ); - virtual void ModelHasMoved(SvTreeListEntry* pSource ); - virtual void ModelIsRemoving( SvTreeListEntry* pEntry ); - virtual void ModelHasRemoved( SvTreeListEntry* pEntry ); - void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ); + 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; void ShowTargetEmphasis( SvTreeListEntry*, bool bShow ); void ScrollOutputArea( short nDeltaEntries ); @@ -736,14 +736,14 @@ public: 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 ); + virtual void SelectAll( bool bSelect, bool bPaint = true ) SAL_OVERRIDE; void SetCurEntry( SvTreeListEntry* _pEntry ); SvTreeListEntry* GetCurEntry() const; using Window::Invalidate; - virtual void Invalidate( sal_uInt16 nFlags = 0); - virtual void Invalidate( const Rectangle&, sal_uInt16 nFlags = 0 ); + virtual void Invalidate( sal_uInt16 nFlags = 0) SAL_OVERRIDE; + virtual void Invalidate( const Rectangle&, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; void SetHighlightRange(sal_uInt16 nFirstTab=0,sal_uInt16 nLastTab=0xffff); @@ -752,7 +752,7 @@ public: DECL_LINK( DefaultCompare, SvSortData* ); virtual void ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1, - SvTreeListEntry* pEntry2, sal_uLong nPos ); + SvTreeListEntry* pEntry2, sal_uLong nPos ) SAL_OVERRIDE; void EndSelection(); void RepaintScrollBars() const; @@ -779,7 +779,7 @@ public: long getPreferredDimensions(std::vector<long> &rWidths) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; #define SV_LBOX_DD_FORMAT "SV_LBOX_DD_FORMAT" diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 91bd9ea4a0b8..c2fc7bf1c36a 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -95,7 +95,7 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess (via XNameReplace) /// calls getByName(sal_uInt16) @@ -104,39 +104,39 @@ public: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAxcess (via XNameReplace) virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess (via XNameReplace) virtual sal_Bool SAL_CALL hasByName( const OUString& rName ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess (via XNameReplace) virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess (via XNameReplace) virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo /// must be implemented in subclass virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XServiceInfo virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: @@ -220,7 +220,7 @@ protected: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; using SvBaseEventDescriptor::getByName; virtual void getByName( @@ -229,7 +229,7 @@ protected: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Get the SvxMacroItem from the parent. @@ -264,7 +264,7 @@ public: //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: @@ -278,7 +278,7 @@ protected: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; using SvBaseEventDescriptor::getByName; virtual void getByName( @@ -287,7 +287,7 @@ protected: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// do we have an event? /// return sal_True: we have a macro for the event diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index 443f8f6c3665..33442d864d15 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -41,8 +41,8 @@ namespace svt OFileURLControl(Window* _pParent, WinBits nStyle); protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index e3d9207a0902..fc1fd0768e5b 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -282,27 +282,27 @@ protected: protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; public: ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren = false ); ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false ); ~ValueSet(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Resize(); - virtual Size GetOptimalSize() const; - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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( 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 Select(); virtual void DoubleClick(); diff --git a/include/svtools/vclxaccessibleheaderbar.hxx b/include/svtools/vclxaccessibleheaderbar.hxx index 013322adb791..e3e3f91a9ffe 100644 --- a/include/svtools/vclxaccessibleheaderbar.hxx +++ b/include/svtools/vclxaccessibleheaderbar.hxx @@ -43,23 +43,23 @@ public: HeaderBar* m_pHeadBar; virtual ~VCLXAccessibleHeaderBar(); - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; + virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE; VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow ); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateChild(sal_Int32 i); private: @@ -74,7 +74,7 @@ public: VCLXHeaderBar(Window* pHeaderBar); virtual ~VCLXHeaderBar(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; }; diff --git a/include/svtools/vclxaccessibleheaderbaritem.hxx b/include/svtools/vclxaccessibleheaderbaritem.hxx index 7fe18b29b11b..10a343904f82 100644 --- a/include/svtools/vclxaccessibleheaderbaritem.hxx +++ b/include/svtools/vclxaccessibleheaderbaritem.hxx @@ -65,7 +65,7 @@ protected: virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; public: VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ); @@ -78,35 +78,35 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception){}; - virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {}; + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // _SVTOOLS_VCLACCESSIBLEHEADBARITEM_HXX_ diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 94e7a4a23759..0e0ba2dbaf83 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -103,13 +103,13 @@ namespace svt ~OWizardPage(); // IWizardPageController overridables - virtual void initializePage(); - virtual bool commitPage( WizardTypes::CommitPageReason _eReason ); - virtual bool canAdvance() const; + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; protected: // TabPage overridables - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; /** updates the travel-related UI elements of the OWizardMachine we live in (if any) @@ -202,8 +202,8 @@ namespace svt protected: // WizardDialog overridables - virtual void ActivatePage(); - virtual long DeactivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual long DeactivatePage() SAL_OVERRIDE; // our own overridables diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 836fd6a7682c..698fb3680c5c 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -256,14 +256,14 @@ public: WizardDialog( Window* pParent, const ResId& rResId ); ~WizardDialog(); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void ActivatePage(); virtual long DeactivatePage(); - virtual void queue_resize(); + virtual void queue_resize() SAL_OVERRIDE; bool ShowPrevPage(); bool ShowNextPage(); diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index f99ce60e0ce4..139c51786005 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -44,8 +44,8 @@ public: XWindowItem( const XWindowItem &rItem ); ~XWindowItem(); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual bool operator == ( const SfxPoolItem& rAttr ) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual bool operator == ( const SfxPoolItem& rAttr ) const SAL_OVERRIDE; Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } com::sun::star::uno::Reference< com::sun::star::awt::XWindow > GetXWindow() const { return m_xWin; } |