diff options
Diffstat (limited to 'include/vcl')
52 files changed, 821 insertions, 821 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index a37399215d03..9485a5a22b54 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -213,8 +213,8 @@ class Lanczos3Kernel : public Kernel boost::math::policies::promote_double<false> > SincPolicy; public: Lanczos3Kernel() : Kernel () {} - virtual double GetWidth() const { return 3.0; } - virtual double Calculate (double x) const + virtual double GetWidth() const SAL_OVERRIDE { return 3.0; } + virtual double Calculate (double x) const SAL_OVERRIDE { return (-3.0 <= x && x < 3.0) ? SincFilter(x) * SincFilter( x / 3.0 ) : 0.0; } @@ -234,8 +234,8 @@ class BicubicKernel : public Kernel { public: BicubicKernel() : Kernel () {} private: - virtual double GetWidth() const { return 2.0; } - virtual double Calculate (double x) const + virtual double GetWidth() const SAL_OVERRIDE { return 2.0; } + virtual double Calculate (double x) const SAL_OVERRIDE { if (x < 0.0) { @@ -258,8 +258,8 @@ class BilinearKernel : public Kernel { public: BilinearKernel() : Kernel () {} private: - virtual double GetWidth() const { return 1.0; } - virtual double Calculate (double x) const + virtual double GetWidth() const SAL_OVERRIDE { return 1.0; } + virtual double Calculate (double x) const SAL_OVERRIDE { if (x < 0.0) { @@ -277,8 +277,8 @@ class BoxKernel : public Kernel { public: BoxKernel() : Kernel () {} private: - virtual double GetWidth() const { return 0.5; } - virtual double Calculate (double x) const + virtual double GetWidth() const SAL_OVERRIDE { return 0.5; } + virtual double Calculate (double x) const SAL_OVERRIDE { if (-0.5 <= x && x < 0.5) return 1.0; diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 4575cee5e803..1c1dc6cafa59 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -64,8 +64,8 @@ public: ButtonDialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); ~ButtonDialog(); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void Click(); diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index a27a1840b580..9abba3e9d812 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -86,7 +86,7 @@ public: void SetFocusRect( const Rectangle& rFocusRect ); bool IsSmallSymbol() const; void SetSmallSymbol(bool bSmall = true); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; @@ -139,28 +139,28 @@ public: protected: explicit PushButton( WindowType nType ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; virtual const Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const; + GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: explicit PushButton( Window* pParent, WinBits nStyle = 0 ); explicit PushButton( Window* pParent, const ResId& ); virtual ~PushButton(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void KeyUp( const KeyEvent& rKEvt ); - 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 GetFocus(); - virtual void LoseFocus(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyUp( const KeyEvent& rKEvt ) 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 GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Toggle(); @@ -187,11 +187,11 @@ public: TriState GetSavedValue() const { return meSaveValue; } Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } const Link& GetToggleHdl() const { return maToggleHdl; } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; inline void PushButton::Check( bool bCheck ) @@ -223,7 +223,7 @@ public: explicit OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON ); explicit OKButton( Window* pParent, const ResId& ); - virtual void Click(); + virtual void Click() SAL_OVERRIDE; }; @@ -245,7 +245,7 @@ public: explicit CancelButton( Window* pParent, WinBits nStyle = 0 ); explicit CancelButton( Window* pParent, const ResId& ); - virtual void Click(); + virtual void Click() SAL_OVERRIDE; }; class VCL_DLLPUBLIC CloseButton : public CancelButton @@ -274,7 +274,7 @@ public: explicit HelpButton( Window* pParent, WinBits nStyle = 0 ); explicit HelpButton( Window* pParent, const ResId& ); - virtual void Click(); + virtual void Click() SAL_OVERRIDE; }; @@ -327,11 +327,11 @@ public: SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); protected: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; virtual const Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const; + GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; inline void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; } inline const Rectangle& GetMouseRect( ) const { return maMouseRect; } @@ -347,18 +347,18 @@ public: explicit RadioButton( Window* pParent, const ResId& ); virtual ~RadioButton(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void KeyUp( const KeyEvent& rKEvt ); - 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 GetFocus(); - virtual void LoseFocus(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyUp( const KeyEvent& rKEvt ) 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 GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void Toggle(); @@ -380,7 +380,7 @@ public: static Image GetRadioImage( const AllSettings& rSettings, sal_uInt16 nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } const Link& GetToggleHdl() const { return maToggleHdl; } @@ -400,7 +400,7 @@ public: */ std::vector<RadioButton*> GetRadioButtonGroup(bool bIncludeThis = true) const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; /* * Group this RadioButton with another @@ -447,9 +447,9 @@ protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - virtual void FillLayoutData() const; - virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const; - virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + virtual void FillLayoutData() const SAL_OVERRIDE; + virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual void ImplDrawCheckBoxState(); SAL_DLLPRIVATE const Rectangle& GetStateRect() const { return maStateRect; } @@ -462,18 +462,18 @@ public: explicit CheckBox( Window* pParent, WinBits nStyle = 0 ); explicit CheckBox( Window* pParent, const ResId& ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void KeyUp( const KeyEvent& rKEvt ); - 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 GetFocus(); - virtual void LoseFocus(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyUp( const KeyEvent& rKEvt ) 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 GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void Toggle(); @@ -492,14 +492,14 @@ public: static Image GetCheckImage( const AllSettings& rSettings, sal_uInt16 nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } const Link& GetToggleHdl() const { return maToggleHdl; } bool IsLegacyNoTextAlign() { return mbLegacyNoTextAlign; } void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; inline void CheckBox::Check( bool bCheck ) @@ -558,11 +558,11 @@ public: class VCL_DLLPUBLIC DisclosureButton : public CheckBox { protected: - SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(); + SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState() SAL_OVERRIDE; public: explicit DisclosureButton( Window* pParent, WinBits nStyle = 0 ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_BUTTON_HXX diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 2fa396cfaf57..51770b2b5e73 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -88,29 +88,29 @@ protected: explicit ComboBox( WindowType nType ); bool IsDropDownBox() const { return mpFloatWin ? true : false; } - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; public: explicit ComboBox( Window* pParent, WinBits nStyle = 0 ); explicit ComboBox( Window* pParent, const ResId& ); virtual ~ComboBox(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Select(); virtual void DoubleClick(); - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual const Wallpaper& GetDisplayBackground() const; + virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; - virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) + virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE { Edit::SetPosSizePixel( rNewPos, rNewSize ); } void SetDropDownSizePixel( const Size& rNewSize ) { if( IsDropDownBox() ) setPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); } @@ -126,8 +126,8 @@ public: void EnableDDAutoWidth( bool b ); - 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; virtual sal_Int32 InsertEntry(const OUString& rStr, sal_Int32 nPos = COMBOBOX_APPEND); void InsertEntryWithImage( const OUString& rStr, const Image& rImage, sal_Int32 nPos = COMBOBOX_APPEND ); @@ -169,8 +169,8 @@ public: void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - Size CalcMinimumSize() const; - virtual Size GetOptimalSize() const; + Size CalcMinimumSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; Size CalcAdjustedSize( const Size& rPrefSize ) const; Size CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; @@ -219,7 +219,7 @@ public: sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; #endif // _COMBOBOX_HXX diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx index 93fee293eb11..ae0c0e28e25c 100644 --- a/include/vcl/configsettings.hxx +++ b/include/vcl/configsettings.hxx @@ -42,7 +42,7 @@ namespace vcl boost::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE; void getValues(); SettingsConfigItem(); @@ -54,7 +54,7 @@ namespace vcl const OUString& getValue( const OUString& rGroup, const OUString& rKey ) const; void setValue( const OUString& rGroup, const OUString& rKey, const OUString& rValue ); - virtual void Commit(); + virtual void Commit() SAL_OVERRIDE; }; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 6c00e460d814..4c707327ede2 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -129,19 +129,19 @@ public: explicit Control( Window* pParent, const ResId& ); virtual ~Control(); - virtual void EnableRTL ( bool bEnable = true ); + virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // invalidates layout data - virtual void SetText( const OUString& rStr ); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; // gets the displayed text - virtual OUString GetDisplayText() const; + virtual OUString GetDisplayText() const SAL_OVERRIDE; // returns the bounding box for the character at index nIndex (in control coordinates) Rectangle GetCharacterBounds( long nIndex ) const; // returns the character index for corresponding to rPoint (in control coordinates) @@ -175,7 +175,7 @@ public: void SetLayoutDataParent( const Control* pParent ) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; /** sets a reference device used for rendering control text @see DrawControlText diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 53e88f4ee4e3..e98ec6dad008 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -83,7 +83,7 @@ public: protected: explicit Dialog( WindowType nType ); explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; protected: friend class VclBuilder; @@ -95,27 +95,27 @@ public: explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const; - virtual void Resize(); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; bool isLayoutEnabled() const; void setOptimalLayoutSize(); bool isCalculatingInitialLayoutSize() const { return mbIsCalculatingInitialLayoutSize; } - virtual void queue_resize(); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual void queue_resize() SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; VclButtonBox* get_action_area(); VclBox* get_content_area(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; virtual short Execute(); bool IsInExecute() const { return mbInExecute; } - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; // Dialog::Execute replacement API diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index c1924caa3108..a1dbf14014f5 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -109,29 +109,29 @@ public: ~DragAndDropWrapper(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::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; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::lang::XEventListener - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::datatransfer::dnd::XDragGestureListener - void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::datatransfer::dnd::XDragSourceListener - void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::datatransfer::dnd::XDropTargetListener - void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; }} // namespace vcl::unohelper diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index 6d88ca02d06f..0208557ca0e5 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -43,10 +43,10 @@ public: WindowAlign GetAlign() const; bool IsHorizontal() const; - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void StateChanged( StateChangedType nType ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; }; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 21d7fd4822bb..0f7199d60542 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -295,10 +295,10 @@ public: virtual void PopupModeEnd(); virtual void Resizing( Size& rSize ); virtual bool Close(); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetPin( bool bPin ); bool IsPinned() const; @@ -333,13 +333,13 @@ public: virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, - sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); + sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; void SetPosSizePixel( const Point& rNewPos, - const Size& rNewSize ) + const Size& rNewSize ) SAL_OVERRIDE { Window::SetPosSizePixel( rNewPos, rNewSize ); } - Point GetPosPixel() const; - Size GetSizePixel() const; - void SetOutputSizePixel( const Size& rNewSize ); + Point GetPosPixel() const SAL_OVERRIDE; + Size GetSizePixel() const SAL_OVERRIDE; + void SetOutputSizePixel( const Size& rNewSize ) SAL_OVERRIDE; Size GetOutputSizePixel() const; }; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 2e22e25d9a2d..8c06faa72ee9 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -135,15 +135,15 @@ protected: using vcl::unohelper::DragAndDropClient::dragEnter; using vcl::unohelper::DragAndDropClient::dragExit; using vcl::unohelper::DragAndDropClient::dragOver; - virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; Edit( WindowType nType ); public: @@ -154,19 +154,19 @@ public: Edit( Window* pParent, const ResId& rResId ); virtual ~Edit(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual Window* GetPreferredKeyInputWindow(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual void Modify(); virtual void UpdateData(); @@ -209,9 +209,9 @@ public: virtual void Paste(); void Undo(); - virtual void SetText( const OUString& rStr ); + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); - virtual OUString GetText() const; + virtual OUString GetText() const SAL_OVERRIDE; virtual void SetPlaceholderText( const OUString& rStr ); virtual OUString GetPlaceholderText() const; @@ -232,7 +232,7 @@ public: virtual Size CalcMinimumSize() const; virtual Size CalcMinimumSizeForText(const OUString &rString) const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual Size CalcSize(sal_Int32 nChars) const; virtual sal_Int32 GetMaxVisChars() const; @@ -247,9 +247,9 @@ public: static PopupMenu* CreatePopupMenu(); static void DeletePopupMenu( PopupMenu* pMenu ); - virtual OUString GetSurroundingText() const; - virtual Selection GetSurroundingTextSelection() const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual OUString GetSurroundingText() const SAL_OVERRIDE; + virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; // returns the minimum size a bordered Edit should have given the current // global style settings (needed by sc's inputwin.cxx) diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 435bed63eb32..38d1cc523439 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -121,7 +121,7 @@ protected: public: virtual ~PatternFormatter(); - virtual void Reformat(); + virtual void Reformat() SAL_OVERRIDE; void SetMask(const OString& rEditMask, const OUString& rLiteralMask ); const OString& GetEditMask() const { return m_aEditMask; } @@ -177,7 +177,7 @@ protected: public: virtual ~NumericFormatter(); - virtual void Reformat(); + virtual void Reformat() SAL_OVERRIDE; void SetMin( sal_Int64 nNewMin ); sal_Int64 GetMin() const { return mnMin; } @@ -238,7 +238,7 @@ public: virtual ~MetricFormatter(); virtual void CustomConvert() = 0; - virtual void Reformat(); + virtual void Reformat() SAL_OVERRIDE; virtual void SetUnit( FieldUnit meUnit ); FieldUnit GetUnit() const { return meUnit; } @@ -258,12 +258,12 @@ public: sal_Int64 GetBaseValue( FieldUnit eOutUnit = FUNIT_NONE ) const; virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); - virtual void SetValue( sal_Int64 nValue ); + virtual void SetValue( sal_Int64 nValue ) SAL_OVERRIDE; using NumericFormatter::SetUserValue; void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ); virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; - virtual sal_Int64 GetValue() const; - virtual OUString CreateFieldText( sal_Int64 nValue ) const; + virtual sal_Int64 GetValue() const SAL_OVERRIDE; + virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; using NumericFormatter::GetCorrectedValue; sal_Int64 GetCorrectedValue( FieldUnit eOutUnit ) const; @@ -288,13 +288,13 @@ protected: public: virtual ~CurrencyFormatter(); - virtual void Reformat(); + virtual void Reformat() SAL_OVERRIDE; OUString GetCurrencySymbol() const; - virtual void SetValue( sal_Int64 nNewValue ); - virtual sal_Int64 GetValue() const; - virtual OUString CreateFieldText( sal_Int64 nValue ) const; + virtual void SetValue( sal_Int64 nNewValue ) SAL_OVERRIDE; + virtual sal_Int64 GetValue() const SAL_OVERRIDE; + virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; }; @@ -338,10 +338,10 @@ protected: public: virtual ~DateFormatter(); - virtual void Reformat(); - virtual void ReformatAll(); + virtual void Reformat() SAL_OVERRIDE; + virtual void ReformatAll() SAL_OVERRIDE; - virtual void SetLocale( const ::com::sun::star::lang::Locale& rLocale ); + virtual void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) SAL_OVERRIDE; void SetExtDateFormat( ExtDateFieldFormat eFormat ); @@ -433,8 +433,8 @@ public: virtual ~TimeFormatter(); - virtual void Reformat(); - virtual void ReformatAll(); + virtual void Reformat() SAL_OVERRIDE; + virtual void ReformatAll() SAL_OVERRIDE; void SetMin( const Time& rNewMin ); const Time& GetMin() const { return maMin; } @@ -486,9 +486,9 @@ public: explicit PatternField( Window* pParent, WinBits nWinStyle ); virtual ~PatternField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Modify(); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; }; @@ -506,19 +506,19 @@ public: explicit NumericField( Window* pParent, const ResId& ); virtual ~NumericField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; @@ -536,21 +536,21 @@ public: explicit MetricField( Window* pParent, const ResId& ); virtual ~MetricField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); - virtual void CustomConvert(); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; + virtual void CustomConvert() SAL_OVERRIDE; - virtual void SetUnit( FieldUnit meUnit ); + virtual void SetUnit( FieldUnit meUnit ) SAL_OVERRIDE; void SetFirst( sal_Int64 nNewFirst, FieldUnit eInUnit ); inline void SetFirst(sal_Int64 first) { SetFirst(first, FUNIT_NONE); } @@ -589,7 +589,7 @@ public: MapUnit eInUnit, FieldUnit eOutUnit ) { return ConvertDoubleValue( static_cast<double>(nValue), nDecDigits, eInUnit, eOutUnit ); } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; @@ -603,16 +603,16 @@ public: CurrencyField( Window* pParent, WinBits nWinStyle ); ~CurrencyField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; }; @@ -635,16 +635,16 @@ public: explicit DateField( Window* pParent, const ResId& ); virtual ~DateField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; void SetFirst( const Date& rNewFirst ) { maFirst = rNewFirst; } Date GetFirst() const { return maFirst; } @@ -671,16 +671,16 @@ public: explicit TimeField( Window* pParent, const ResId& ); virtual ~TimeField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; void SetFirst( const Time& rNewFirst ) { maFirst = rNewFirst; } Time GetFirst() const { return maFirst; } @@ -701,12 +701,12 @@ public: PatternBox( Window* pParent, WinBits nWinStyle ); ~PatternBox(); - 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 Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void ReformatAll(); + virtual void ReformatAll() SAL_OVERRIDE; }; @@ -721,15 +721,15 @@ public: explicit NumericBox( Window* pParent, const ResId& ); virtual ~NumericBox(); - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void ReformatAll(); + virtual void ReformatAll() SAL_OVERRIDE; void InsertValue( sal_Int64 nValue, sal_Int32 nPos = COMBOBOX_APPEND ); }; @@ -745,16 +745,16 @@ public: explicit MetricBox( Window* pParent, WinBits nWinStyle ); virtual ~MetricBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void CustomConvert(); - virtual void ReformatAll(); + virtual void CustomConvert() SAL_OVERRIDE; + virtual void ReformatAll() SAL_OVERRIDE; void InsertValue( sal_Int64 nValue, FieldUnit eInUnit = FUNIT_NONE, sal_Int32 nPos = COMBOBOX_APPEND ); @@ -763,8 +763,8 @@ public: FieldUnit eInUnit = FUNIT_NONE ) const; // Needed, because GetValue() with nPos hide these functions - virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; - virtual sal_Int64 GetValue() const; + virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const SAL_OVERRIDE; + virtual sal_Int64 GetValue() const SAL_OVERRIDE; }; @@ -778,15 +778,15 @@ public: explicit CurrencyBox( Window* pParent, WinBits nWinStyle ); virtual ~CurrencyBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void ReformatAll(); + virtual void ReformatAll() SAL_OVERRIDE; - virtual sal_Int64 GetValue() const; + virtual sal_Int64 GetValue() const SAL_OVERRIDE; }; @@ -799,13 +799,13 @@ public: explicit DateBox( Window* pParent, WinBits nWinStyle ); virtual ~DateBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void ReformatAll(); + virtual void ReformatAll() SAL_OVERRIDE; }; @@ -819,13 +819,13 @@ public: explicit TimeBox( Window* pParent, WinBits nWinStyle ); virtual ~TimeBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void Modify(); + virtual void Modify() SAL_OVERRIDE; - virtual void ReformatAll(); + virtual void ReformatAll() SAL_OVERRIDE; }; #endif // INCLUDED_VCL_FIELD_HXX diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index e3193841bf92..9d182ad54f1d 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -50,24 +50,24 @@ private: public: SAL_DLLPRIVATE static sal_uInt16 ImplGetTextStyle( WinBits nWinBits ); protected: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; virtual const Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const; + GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; - virtual Window* getAccessibleRelationLabelFor() const; + virtual Window* getAccessibleRelationLabelFor() const SAL_OVERRIDE; public: explicit FixedText( Window* pParent, WinBits nStyle = 0 ); explicit FixedText( Window* pParent, const ResId& rResId ); virtual ~FixedText(); - 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 StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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 StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void setMaxWidthChars(sal_Int32 nWidth); sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } @@ -76,8 +76,8 @@ public: static Size CalcMinimumTextSize(Control const* pControl, long nMaxWidth = 0x7fffffff); static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth); Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const; - virtual Size GetOptimalSize() const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; void set_mnemonic_widget(Window *pWindow); Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; @@ -87,7 +87,7 @@ class VCL_DLLPUBLIC SelectableFixedText : public Edit public: explicit SelectableFixedText( Window* pParent, WinBits nStyle = 0 ); - virtual void LoseFocus(); + virtual void LoseFocus() SAL_OVERRIDE; }; @@ -105,23 +105,23 @@ private: SAL_DLLPRIVATE void ImplDraw( bool bLayout = false ); protected: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; virtual const Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const; + GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: explicit FixedLine( Window* pParent, WinBits nStyle = WB_HORZ ); explicit FixedLine( Window* pParent, const ResId& ); - 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 StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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 StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; @@ -149,11 +149,11 @@ public: explicit FixedBitmap( Window* pParent, const ResId& ); virtual ~FixedBitmap(); - 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 StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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 StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetBitmap( const Bitmap& rBitmap ); using OutputDevice::GetBitmap; @@ -187,20 +187,20 @@ public: explicit FixedImage( Window* pParent, const ResId& ); virtual ~FixedImage(); - 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 StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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 StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetImage( const Image& rImage ); const Image& GetImage() const { return maImage; } bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; static Image loadThemeImage(const OString &rFileName); }; diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 224c4fecab07..1b8fcd554d32 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -45,19 +45,19 @@ Changes the pointer only over the text. */ - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; /** overwrites Window::MouseButtonUp(). Calls the set link if the mouse is over the text. */ - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; /** overwrites Window::RequestHelp(). Shows tooltip only if the mouse is over the text. */ - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: /** ctors @@ -76,21 +76,21 @@ Changes the color of the text and shows a focus rectangle. */ - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; /** overwrites Window::LoseFocus(). Changes the color of the text and hides the focus rectangle. */ - virtual void LoseFocus(); + virtual void LoseFocus() SAL_OVERRIDE; /** overwrites Window::KeyInput(). KEY_RETURN and KEY_SPACE calls the link handler. */ - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; /** sets m_aClickHdl with rLink. @@ -119,7 +119,7 @@ OUString GetURL() const; /** sets new text and recalculates the text length. */ - virtual void SetText(const OUString& rNewDescription); + virtual void SetText(const OUString& rNewDescription) SAL_OVERRIDE; }; #endif diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 92d1f488e3d7..e58873eb62a3 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -120,9 +120,9 @@ public: explicit FloatingWindow( Window* pParent, const ResId& ); virtual ~FloatingWindow(); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void PopupModeEnd(); diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 34b9ebc66db9..e248efe66b84 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -193,9 +193,9 @@ public: public: - 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; const SvgDataPtr& getSvgData() const; diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 449788a90cbe..7e5e11cb9913 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -39,21 +39,21 @@ private: SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout = false ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; virtual const Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const; + GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: explicit GroupBox( Window* pParent, WinBits nStyle = 0 ); explicit GroupBox( Window* pParent, const ResId& ); - 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 StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + 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 StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_GROUP_HXX diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index 337746f66815..dfd42c16d68f 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -42,11 +42,11 @@ public: void SetScaleMode( const ::sal_Int16 _nMode ); ::sal_Int16 GetScaleMode() const { return mnScaleMode; } - virtual void Resize(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Paint( const Rectangle& rRect ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; protected: void ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) const; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index e876ac6cb888..577b8273e780 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -40,7 +40,7 @@ public: m_bLayoutDirty = true; } - virtual void queue_resize(); + virtual void queue_resize() SAL_OVERRIDE; protected: //these are the two that need to be implemented by //containers, figure out how much space you want... @@ -48,13 +48,13 @@ protected: //..and decide what to do when set to this size virtual void setAllocation(const Size &rAllocation) = 0; - virtual sal_uInt16 getDefaultAccessibleRole() const; + virtual sal_uInt16 getDefaultAccessibleRole() const SAL_OVERRIDE; public: //you don't want to override these - virtual Size GetOptimalSize() const; - virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize); - virtual void SetPosPixel(const Point& rAllocPos); - virtual void SetSizePixel(const Size& rAllocation); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) SAL_OVERRIDE; + virtual void SetPosPixel(const Point& rAllocPos) SAL_OVERRIDE; + virtual void SetSizePixel(const Size& rAllocation) SAL_OVERRIDE; private: bool m_bLayoutDirty; }; @@ -89,14 +89,14 @@ public: { return m_bHomogeneous; } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; protected: - virtual sal_uInt16 getDefaultAccessibleRole() const; + virtual sal_uInt16 getDefaultAccessibleRole() const SAL_OVERRIDE; void accumulateMaxes(const Size &rChildSize, Size &rSize) const; Size finalizeMaxes(const Size &rSize, sal_uInt16 nVisibleChildren) const; - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; virtual long getPrimaryDimension(const Size &rSize) const = 0; virtual void setPrimaryDimension(Size &rSize, long) const = 0; @@ -119,39 +119,39 @@ public: m_bVerticalContainer = true; } protected: - virtual long getPrimaryDimension(const Size &rSize) const + virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getHeight(); } - virtual void setPrimaryDimension(Size &rSize, long nHeight) const + virtual void setPrimaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE { rSize.setHeight(nHeight); } - virtual long getPrimaryCoordinate(const Point &rPos) const + virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getY(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setY(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const + virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getWidth(); } - virtual void setSecondaryDimension(Size &rSize, long nWidth) const + virtual void setSecondaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE { rSize.setWidth(nWidth); } - virtual long getSecondaryCoordinate(const Point &rPos) const + virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getX(); } - virtual void setSecondaryCoordinate(Point &rPos, long nPos) const + virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setX(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const + virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -166,39 +166,39 @@ public: m_bVerticalContainer = false; } protected: - virtual long getPrimaryDimension(const Size &rSize) const + virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getWidth(); } - virtual void setPrimaryDimension(Size &rSize, long nWidth) const + virtual void setPrimaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE { rSize.setWidth(nWidth); } - virtual long getPrimaryCoordinate(const Point &rPos) const + virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getX(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setX(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const + virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getHeight(); } - virtual void setSecondaryDimension(Size &rSize, long nHeight) const + virtual void setSecondaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE { rSize.setHeight(nHeight); } - virtual long getSecondaryCoordinate(const Point &rPos) const + virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getY(); } - virtual void setSecondaryCoordinate(Point &rPos, long nPos) const + virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setY(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const + virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -230,11 +230,11 @@ public: { return m_eLayoutStyle; } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; void sort_native_button_order(); protected: - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; Size addSpacing(const Size &rSize, sal_uInt16 nVisibleChildren) const; private: VclButtonBoxStyle m_eLayoutStyle; @@ -258,39 +258,39 @@ public: m_bVerticalContainer = true; } protected: - virtual long getPrimaryDimension(const Size &rSize) const + virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getHeight(); } - virtual void setPrimaryDimension(Size &rSize, long nHeight) const + virtual void setPrimaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE { rSize.setHeight(nHeight); } - virtual long getPrimaryCoordinate(const Point &rPos) const + virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getY(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setY(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const + virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getWidth(); } - virtual void setSecondaryDimension(Size &rSize, long nWidth) const + virtual void setSecondaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE { rSize.setWidth(nWidth); } - virtual long getSecondaryCoordinate(const Point &rPos) const + virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getX(); } - virtual void setSecondaryCoordinate(Point &rPos, long nPos) const + virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setX(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const + virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -305,39 +305,39 @@ public: m_bVerticalContainer = false; } protected: - virtual long getPrimaryDimension(const Size &rSize) const + virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getWidth(); } - virtual void setPrimaryDimension(Size &rSize, long nWidth) const + virtual void setPrimaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE { rSize.setWidth(nWidth); } - virtual long getPrimaryCoordinate(const Point &rPos) const + virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getX(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setX(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const + virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE { return rSize.getHeight(); } - virtual void setSecondaryDimension(Size &rSize, long nHeight) const + virtual void setSecondaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE { rSize.setHeight(nHeight); } - virtual long getSecondaryCoordinate(const Point &rPos) const + virtual long getSecondaryCoordinate(const Point &rPos) const SAL_OVERRIDE { return rPos.getY(); } - virtual void setSecondaryCoordinate(Point &rPos, long nPos) const + virtual void setSecondaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE { rPos.setY(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const + virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -392,8 +392,8 @@ private: void calcMaxs(const array_type &A, std::vector<Value> &rWidths, std::vector<Value> &rHeights) const; Size calculateRequisitionForSpacings(sal_Int32 nRowSpacing, sal_Int32 nColSpacing) const; - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; public: VclGrid(Window *pParent) : VclContainer(pParent) @@ -433,7 +433,7 @@ public: { return m_nColumnSpacing; } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; VCL_DLLPUBLIC void setGridAttach(Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, @@ -448,8 +448,8 @@ public: } virtual Window *get_child(); virtual const Window *get_child() const; - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; }; class VCL_DLLPUBLIC VclFrame : public VclBin @@ -467,14 +467,14 @@ public: } void set_label(const OUString &rLabel); OUString get_label() const; - virtual Window *get_child(); - virtual const Window *get_child() const; + virtual Window *get_child() SAL_OVERRIDE; + virtual const Window *get_child() const SAL_OVERRIDE; Window *get_label_widget(); const Window *get_label_widget() const; protected: - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); - virtual OUString getDefaultAccessibleName() const; + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual OUString getDefaultAccessibleName() const SAL_OVERRIDE; }; class VCL_DLLPUBLIC VclAlignment : public VclBin @@ -492,10 +492,10 @@ public: , m_fYScale(1.0) { } - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; protected: - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; private: sal_Int32 m_nBottomPadding; sal_Int32 m_nLeftPadding; @@ -518,9 +518,9 @@ public: m_aDisclosureButton.SetToggleHdl(LINK(this, VclExpander, ClickHdl)); m_aDisclosureButton.Show(); } - virtual Window *get_child(); - virtual const Window *get_child() const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual Window *get_child() SAL_OVERRIDE; + virtual const Window *get_child() const SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; bool get_expanded() const { return m_aDisclosureButton.IsChecked(); @@ -537,12 +537,12 @@ public: { return m_aDisclosureButton.GetText(); } - virtual void StateChanged(StateChangedType nType); + virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE; void SetExpandedHdl( const Link& rLink ) { maExpandedHdl = rLink; } const Link& GetExpandedHdl() const { return maExpandedHdl; } protected: - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; private: bool m_bResizeTopLevel; DisclosureButton m_aDisclosureButton; @@ -554,9 +554,9 @@ class VCL_DLLPUBLIC VclScrolledWindow : public VclBin { public: VclScrolledWindow(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); - virtual Window *get_child(); - virtual const Window *get_child() const; - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual Window *get_child() SAL_OVERRIDE; + virtual const Window *get_child() const SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; ScrollBar& getVertScrollBar() { return m_aVScroll; } ScrollBar& getHorzScrollBar() { return m_aHScroll; } Size getVisibleChildSize() const; @@ -564,11 +564,11 @@ public: //to override it void setUserManagedScrolling(bool bUserManagedScrolling) { m_bUserManagedScrolling = bUserManagedScrolling;} protected: - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; DECL_LINK(ScrollBarHdl, void *); void InitScrollBars(const Size &rRequest); - virtual bool Notify(NotifyEvent& rNEvt); + virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; private: bool m_bUserManagedScrolling; ScrollBar m_aVScroll; @@ -598,7 +598,7 @@ private: SetPaintTransparent(true); SetBackground(); } - virtual void Command(const CommandEvent& rCEvt) + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE { GetParent()->Command(rCEvt); } @@ -612,12 +612,12 @@ public: { m_aEventBoxHelper.Show(); } - virtual Window *get_child(); - virtual const Window *get_child() const; - virtual Size calculateRequisition() const; - virtual void setAllocation(const Size &rAllocation); + virtual Window *get_child() SAL_OVERRIDE; + virtual const Window *get_child() const SAL_OVERRIDE; + virtual Size calculateRequisition() const SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; - virtual void Command(const CommandEvent& rCEvt); + virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; }; enum VclSizeGroupMode @@ -717,8 +717,8 @@ public: WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); MessageDialog(Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); MessageDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription); - virtual bool set_property(const OString &rKey, const OString &rValue); - virtual short Execute(); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual short Execute() SAL_OVERRIDE; ///Emitted when an action widget is clicked virtual void response(short nResponseId); OUString get_primary_text() const; diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index 94814afe0563..0f0197ee94fa 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -238,7 +238,7 @@ namespace vcl class DeleteOnDeinit : public DeleteOnDeinitBase { T* m_pT; - virtual void doCleanup() { delete m_pT; m_pT = NULL; } + virtual void doCleanup() SAL_OVERRIDE { delete m_pT; m_pT = NULL; } public: DeleteOnDeinit( T* i_pT ) : m_pT( i_pT ) { addDeinitContainer( this ); } virtual ~DeleteOnDeinit() {} @@ -271,7 +271,7 @@ namespace vcl class DeleteUnoReferenceOnDeinit : public ::vcl::DeleteOnDeinitBase { ::com::sun::star::uno::Reference<I> m_xI; - virtual void doCleanup() { set(NULL); } + virtual void doCleanup() SAL_OVERRIDE { set(NULL); } public: DeleteUnoReferenceOnDeinit(const ::com::sun::star::uno::Reference<I>& r_xI ) : m_xI( r_xI ) { addDeinitContainer( this ); } diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 7a912388e4b8..c307fa071c87 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -51,8 +51,8 @@ protected: public: ~LongCurrencyFormatter(); - virtual void Reformat(); - virtual void ReformatAll(); + virtual void Reformat() SAL_OVERRIDE; + virtual void ReformatAll() SAL_OVERRIDE; void SetUseThousandSep( bool b ); bool IsUseThousandSep() const { return mbThousandSep; } @@ -92,14 +92,14 @@ public: LongCurrencyField( Window* pParent, WinBits nWinStyle ); ~LongCurrencyField(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void Modify(); - void Up(); - void Down(); - void First(); - void Last(); + void Modify() SAL_OVERRIDE; + void Up() SAL_OVERRIDE; + void Down() SAL_OVERRIDE; + void First() SAL_OVERRIDE; + void Last() SAL_OVERRIDE; void SetFirst( BigInt nNewFirst ) { mnFirst = nNewFirst; } BigInt GetFirst() const { return mnFirst; } @@ -119,11 +119,11 @@ public: LongCurrencyBox( Window* pParent, WinBits nWinStyle ); ~LongCurrencyBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void Modify(); - void ReformatAll(); + void Modify() SAL_OVERRIDE; + void ReformatAll() SAL_OVERRIDE; BigInt GetValue() const { return LongCurrencyFormatter::GetValue(); } diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index a6564f9fd546..791f9a360019 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -75,31 +75,31 @@ protected: protected: explicit ListBox( WindowType nType ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; public: explicit ListBox( Window* pParent, WinBits nStyle = WB_BORDER ); explicit ListBox( Window* pParent, const ResId& ); virtual ~ListBox(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - virtual void Resize(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Select(); virtual void DoubleClick(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual Window* GetPreferredKeyInputWindow(); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; - virtual const Wallpaper& GetDisplayBackground() const; + virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; virtual void setPosSizePixel( long nX, long nY, - long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) + long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE { Control::SetPosSizePixel( rNewPos, rNewSize ); } void SetDropDownSizePixel( const Size& rNewSize ) { if( IsDropDownBox() ) setPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); } @@ -194,7 +194,7 @@ public: Size CalcSubEditSize() const; //size of area inside lstbox, i.e. no scrollbar/dropdown Size CalcMinimumSize() const; //size of lstbox area, i.e. including scrollbar/dropdown - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; Size CalcAdjustedSize( const Size& rPrefSize ) const; Size CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; @@ -230,7 +230,7 @@ public: sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; void EnableQuickSelection( const bool& b ); }; diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index bce98e96f1f7..f62c3cbdcb48 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -62,10 +62,10 @@ public: explicit MenuButton( Window* pParent, const ResId& ); virtual ~MenuButton(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; virtual void Select(); void SetMenuMode( sal_uInt16 nMode ); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 1720b4148d27..183aca952a6a 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -118,10 +118,10 @@ struct ImplMetaWriteData protected: \ virtual ~Meta##Name##Action(); \ public: \ - virtual void Execute( OutputDevice* pOut ); \ - virtual MetaAction* Clone(); \ - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); \ - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); + virtual void Execute( OutputDevice* pOut ) SAL_OVERRIDE; \ + virtual MetaAction* Clone() SAL_OVERRIDE; \ + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; \ + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; #define IMPL_META_ACTION( Name, nType ) \ Meta##Name##Action::Meta##Name##Action() : \ @@ -169,15 +169,15 @@ private: Point maPt; Color maColor; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Pixel, META_PIXEL_ACTION ) MetaPixelAction( const Point& rPt, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetPoint() const { return maPt; } const Color& GetColor() const { return maColor; } @@ -188,15 +188,15 @@ class VCL_DLLPUBLIC MetaPointAction : public MetaAction private: Point maPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Point, META_POINT_ACTION ) explicit MetaPointAction( const Point& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetPoint() const { return maPt; } }; @@ -209,7 +209,7 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Line, META_LINE_ACTION ) @@ -218,8 +218,8 @@ public: MetaLineAction( const Point& rStart, const Point& rEnd, const LineInfo& rLineInfo ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetStartPoint() const { return maStartPt; } const Point& GetEndPoint() const { return maEndPt; } @@ -232,14 +232,14 @@ private: Rectangle maRect; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Rect, META_RECT_ACTION ) explicit MetaRectAction( const Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } }; @@ -252,7 +252,7 @@ private: sal_uInt32 mnHorzRound; sal_uInt32 mnVertRound; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION ) @@ -260,8 +260,8 @@ public: MetaRoundRectAction( const Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } sal_uInt32 GetHorzRound() const { return mnHorzRound; } @@ -274,15 +274,15 @@ private: Rectangle maRect; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) explicit MetaEllipseAction( const Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } }; @@ -295,7 +295,7 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Arc, META_ARC_ACTION ) @@ -303,8 +303,8 @@ public: MetaArcAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } @@ -319,7 +319,7 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Pie, META_PIE_ACTION ) @@ -327,8 +327,8 @@ public: MetaPieAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } @@ -343,7 +343,7 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Chord, META_CHORD_ACTION ) @@ -351,8 +351,8 @@ public: MetaChordAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } @@ -366,7 +366,7 @@ private: LineInfo maLineInfo; Polygon maPoly; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) @@ -374,8 +374,8 @@ public: explicit MetaPolyLineAction( const Polygon& ); explicit MetaPolyLineAction( const Polygon&, const LineInfo& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Polygon& GetPolygon() const { return maPoly; } const LineInfo& GetLineInfo() const { return maLineInfo; } @@ -387,15 +387,15 @@ private: Polygon maPoly; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Polygon, META_POLYGON_ACTION ) explicit MetaPolygonAction( const Polygon& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Polygon& GetPolygon() const { return maPoly; } }; @@ -406,15 +406,15 @@ private: PolyPolygon maPolyPoly; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) explicit MetaPolyPolygonAction( const PolyPolygon& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } }; @@ -428,7 +428,7 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Text, META_TEXT_ACTION ) @@ -436,8 +436,8 @@ public: MetaTextAction( const Point& rPt, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetPoint() const { return maPt; } const OUString& GetText() const { return maStr; } @@ -455,7 +455,7 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; protected: virtual ~MetaTextArrayAction(); @@ -467,15 +467,15 @@ public: const sal_Int32* pDXAry, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Execute( OutputDevice* pOut ); + virtual void Execute( OutputDevice* pOut ) SAL_OVERRIDE; - virtual MetaAction* Clone(); + virtual MetaAction* Clone() SAL_OVERRIDE; - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; const Point& GetPoint() const { return maStartPt; } const OUString& GetText() const { return maStr; } @@ -494,7 +494,7 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) @@ -503,8 +503,8 @@ public: const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetPoint() const { return maPt; } const OUString& GetText() const { return maStr; } @@ -521,7 +521,7 @@ private: OUString maStr; sal_uInt16 mnStyle; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) @@ -529,8 +529,8 @@ public: MetaTextRectAction( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const OUString& GetText() const { return maStr; } @@ -547,7 +547,7 @@ private: FontUnderline meUnderline; FontUnderline meOverline; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextLine, META_TEXTLINE_ACTION ) @@ -556,8 +556,8 @@ public: FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Point& GetStartPoint() const { return maPos; } long GetWidth() const { return mnWidth; } @@ -573,15 +573,15 @@ private: Bitmap maBmp; Point maPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Bmp, META_BMP_ACTION ) MetaBmpAction( const Point& rPt, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Point& GetPoint() const { return maPt; } @@ -595,7 +595,7 @@ private: Point maPt; Size maSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( BmpScale, META_BMPSCALE_ACTION ) @@ -603,8 +603,8 @@ public: MetaBmpScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Point& GetPoint() const { return maPt; } @@ -621,7 +621,7 @@ private: Point maSrcPt; Size maSrcSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION ) @@ -630,8 +630,8 @@ public: const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Point& GetDestPoint() const { return maDstPt; } @@ -647,15 +647,15 @@ private: BitmapEx maBmpEx; Point maPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( BmpEx, META_BMPEX_ACTION ) MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const BitmapEx& GetBitmapEx() const { return maBmpEx; } const Point& GetPoint() const { return maPt; } @@ -669,7 +669,7 @@ private: Point maPt; Size maSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION ) @@ -677,8 +677,8 @@ public: MetaBmpExScaleAction( const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx ) ; - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const BitmapEx& GetBitmapEx() const { return maBmpEx; } const Point& GetPoint() const { return maPt; } @@ -695,7 +695,7 @@ private: Point maSrcPt; Size maSrcSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION ) @@ -704,8 +704,8 @@ public: const Point& rSrcPt, const Size& rSrcSz, const BitmapEx& rBmpEx ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const BitmapEx& GetBitmapEx() const { return maBmpEx; } const Point& GetDestPoint() const { return maDstPt; } @@ -722,7 +722,7 @@ private: Color maColor; Point maPt; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Mask, META_MASK_ACTION ) @@ -731,8 +731,8 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Color& GetColor() const { return maColor; } @@ -748,7 +748,7 @@ private: Point maPt; Size maSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( MaskScale, META_MASKSCALE_ACTION ) @@ -757,8 +757,8 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Color& GetColor() const { return maColor; } @@ -777,7 +777,7 @@ private: Point maSrcPt; Size maSrcSz; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION ) @@ -787,8 +787,8 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Bitmap& GetBitmap() const { return maBmp; } const Color& GetColor() const { return maColor; } @@ -805,15 +805,15 @@ private: Rectangle maRect; Gradient maGradient; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Gradient, META_GRADIENT_ACTION ) MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const Gradient& GetGradient() const { return maGradient; } @@ -826,15 +826,15 @@ private: PolyPolygon maPolyPoly; Gradient maGradient; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( GradientEx, META_GRADIENTEX_ACTION ) MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } const Gradient& GetGradient() const { return maGradient; } @@ -847,15 +847,15 @@ private: PolyPolygon maPolyPoly; Hatch maHatch; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Hatch, META_HATCH_ACTION ) MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } const Hatch& GetHatch() const { return maHatch; } @@ -868,7 +868,7 @@ private: Rectangle maRect; Wallpaper maWallpaper; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION ) @@ -876,8 +876,8 @@ public: MetaWallpaperAction( const Rectangle& rRect, const Wallpaper& rPaper ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } const Wallpaper& GetWallpaper() const { return maWallpaper; } @@ -890,15 +890,15 @@ private: Region maRegion; bool mbClip; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) MetaClipRegionAction( const Region& rRegion, bool bClip ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Region& GetRegion() const { return maRegion; } bool IsClipping() const { return mbClip; } @@ -910,15 +910,15 @@ private: Rectangle maRect; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) explicit MetaISectRectClipRegionAction( const Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Rectangle& GetRect() const { return maRect; } }; @@ -929,15 +929,15 @@ private: Region maRegion; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) explicit MetaISectRegionClipRegionAction( const Region& ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Region& GetRegion() const { return maRegion; } }; @@ -949,14 +949,14 @@ private: long mnHorzMove; long mnVertMove; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION ) MetaMoveClipRegionAction( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; long GetHorzMove() const { return mnHorzMove; } long GetVertMove() const { return mnVertMove; } @@ -969,7 +969,7 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) @@ -987,7 +987,7 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) @@ -1004,7 +1004,7 @@ private: Color maColor; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) @@ -1021,7 +1021,7 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) @@ -1039,7 +1039,7 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) @@ -1057,7 +1057,7 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) @@ -1074,7 +1074,7 @@ private: TextAlign maAlign; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) @@ -1090,14 +1090,14 @@ private: MapMode maMapMode; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( MapMode, META_MAPMODE_ACTION ) explicit MetaMapModeAction( const MapMode& ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const MapMode& GetMapMode() const { return maMapMode; } }; @@ -1108,14 +1108,14 @@ private: Font maFont; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Font, META_FONT_ACTION ) explicit MetaFontAction( const Font& ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const Font& GetFont() const { return maFont; } }; @@ -1126,7 +1126,7 @@ private: sal_uInt16 mnFlags; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Push, META_PUSH_ACTION ) @@ -1149,7 +1149,7 @@ private: RasterOp meRasterOp; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) @@ -1166,15 +1166,15 @@ private: PolyPolygon maPolyPoly; sal_uInt16 mnTransPercent; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } sal_uInt16 GetTransparence() const { return mnTransPercent; } @@ -1189,7 +1189,7 @@ private: Size maSize; Gradient maGradient; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION ) @@ -1197,8 +1197,8 @@ public: MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const GDIMetaFile& GetGDIMetaFile() const { return maMtf; } const Point& GetPoint() const { return maPoint; } @@ -1215,7 +1215,7 @@ private: Point maPoint; Size maSize; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( EPS, META_EPS_ACTION ) @@ -1223,8 +1223,8 @@ public: MetaEPSAction( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, const GDIMetaFile& rSubst ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; const GfxLink& GetLink() const { return maGfxLink; } const GDIMetaFile& GetSubstitute() const { return maSubst; } @@ -1239,7 +1239,7 @@ private: Point maRefPoint; bool mbSet; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) @@ -1260,7 +1260,7 @@ private: sal_uInt8* mpData; SAL_DLLPRIVATE void ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize ); - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; protected: virtual ~MetaCommentAction(); @@ -1270,13 +1270,13 @@ public: explicit MetaCommentAction( const MetaCommentAction& rAct ); explicit MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - virtual void Execute( OutputDevice* pOut ); - virtual MetaAction* Clone(); - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); + virtual void Execute( OutputDevice* pOut ) SAL_OVERRIDE; + virtual MetaAction* Clone() SAL_OVERRIDE; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; const OString& GetComment() const { return maComment; } sal_Int32 GetValue() const { return mnValue; } @@ -1289,7 +1289,7 @@ class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction private: sal_uInt32 mnLayoutMode; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) @@ -1304,7 +1304,7 @@ class VCL_DLLPUBLIC MetaTextLanguageAction : public MetaAction private: LanguageType meTextLanguage; - virtual bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: DECL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index ae2482804bff..12293fec20e3 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -52,7 +52,7 @@ public: explicit MoreButton( Window* pParent, WinBits nStyle = 0 ); virtual ~MoreButton(); - void Click(); + void Click() SAL_OVERRIDE; void SetDelta( sal_uLong nNewDelta ) { mnDelta = nNewDelta; } sal_uLong GetDelta() const { return mnDelta; } @@ -64,8 +64,8 @@ public: void SetState( bool bNewState = true ); bool GetState() const { return mbState; } - void SetText( const OUString& rNewText ); - OUString GetText() const; + void SetText( const OUString& rNewText ) SAL_OVERRIDE; + OUString GetText() const SAL_OVERRIDE; }; inline void MoreButton::SetState( bool bNewState ) diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index 93a296494452..336671fe0234 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -54,7 +54,7 @@ public: MessBox( Window* pParent, const ResId& rResId ); ~MessBox(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void SetMessText( const OUString& rText ) { maMessText = rText; } const OUString& GetMessText() const { return maMessText; } @@ -67,7 +67,7 @@ public: void SetCheckBoxState( bool bCheck ); bool GetCheckBoxState() const; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; class VCL_DLLPUBLIC InfoBox : public MessBox diff --git a/include/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx index 7f6b5fa11820..356257f6a899 100644 --- a/include/vcl/oldprintadaptor.hxx +++ b/include/vcl/oldprintadaptor.hxx @@ -35,9 +35,9 @@ namespace vcl void StartPage(); void EndPage(); - virtual int getPageCount() const; - virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const; - virtual void printPage( int i_nPage ) const; + virtual int getPageCount() const SAL_OVERRIDE; + virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const SAL_OVERRIDE; + virtual void printPage( int i_nPage ) const SAL_OVERRIDE; }; } diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 81e5be62ac33..71afd654ea6f 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -327,7 +327,7 @@ public: Dest( -1 ), Submit( false ), SubmitGet( false ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new PushButtonWidget( *this ); } @@ -344,7 +344,7 @@ public: ButtonIsLeft( true ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new CheckBoxWidget( *this ); } @@ -364,7 +364,7 @@ public: ButtonIsLeft( true ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new RadioButtonWidget( *this ); } @@ -393,7 +393,7 @@ public: MaxLen( 0 ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new EditWidget( *this ); } @@ -417,7 +417,7 @@ public: MultiSelect( false ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new ListBoxWidget( *this ); } @@ -435,7 +435,7 @@ public: Sort( false ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new ComboBoxWidget( *this ); } @@ -457,7 +457,7 @@ public: SigHidden( true ) {} - virtual AnyWidget* Clone() const + virtual AnyWidget* Clone() const SAL_OVERRIDE { return new SignatureWidget( *this ); } diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 7fc653a7d507..0cf1006aaaf8 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -75,11 +75,11 @@ public: ProgressBar( Window* pParent, const ResId& rResId ); ~ProgressBar(); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual Size GetOptimalSize() const; + 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 Size GetOptimalSize() const SAL_OVERRIDE; void SetValue( sal_uInt16 nNewPercent ); sal_uInt16 GetValue() const { return mnPercent; } diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index e92786cb30b8..d3e075fed57c 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -247,9 +247,9 @@ private: bool mbUserSetupResult; Link maErrorHdl; - bool ImplInitGraphics() const; - void ImplReleaseGraphics( bool bRelease = true ); - void ImplReleaseFonts(); + bool ImplInitGraphics() const SAL_OVERRIDE; + void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; + void ImplReleaseFonts() SAL_OVERRIDE; SAL_DLLPRIVATE void ImplInitData(); SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow ); @@ -273,8 +273,8 @@ public: SAL_DLLPRIVATE void ImplEndPage(); protected: - long ImplGetGradientStepCount( long nMinRect ); - void ScaleBitmap ( Bitmap&, SalTwoRect& ) { }; + long ImplGetGradientStepCount( long nMinRect ) SAL_OVERRIDE; + void ScaleBitmap ( Bitmap&, SalTwoRect& ) SAL_OVERRIDE { }; public: void DrawGradientEx( OutputDevice* pOut, const Rectangle& rRect, const Gradient& rGradient ); @@ -285,15 +285,15 @@ protected: bool IsQueuePrinter() const { return mbIsQueuePrinter; } virtual void ImplPrintMask ( const Bitmap& rMask, const Color& rMaskColor, const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPtPixel, const Size& rSrcSizePixel ); + const Point& rSrcPtPixel, const Size& rSrcSizePixel ) SAL_OVERRIDE; bool DrawTransformBitmapExDirect( const basegfx::B2DHomMatrix& aFullTransform, - const BitmapEx& rBitmapEx); + const BitmapEx& rBitmapEx) SAL_OVERRIDE; bool TransformReduceBitmapExTargetRange( const basegfx::B2DHomMatrix& aFullTransform, basegfx::B2DRange &aVisibleRange, - double &fMaximumArea); + double &fMaximumArea) SAL_OVERRIDE; void DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, @@ -396,16 +396,16 @@ public: static void PrintJob( const boost::shared_ptr<vcl::PrinterController>& i_pController, const JobSetup& i_rInitSetup ); - virtual bool HasMirroredGraphics() const; + virtual bool HasMirroredGraphics() const SAL_OVERRIDE; virtual void DrawOutDev( const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPt, const Size& rSrcSize ); + const Point& rSrcPt, const Size& rSrcSize ) SAL_OVERRIDE; virtual void DrawOutDev( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPt, const Size& rSrcSize, - const OutputDevice& rOutDev ); + const OutputDevice& rOutDev ) SAL_OVERRIDE; virtual void CopyArea( const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize, - sal_uInt16 nFlags = 0 ); + sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; // implementation detail of PrintJob being asynchronous diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 6f540c74f31e..eb2d7238b8b3 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -326,7 +326,7 @@ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue mnThumbState = 0; mnPage1State = 0; mnPage2State = 0; }; virtual ~ScrollbarValue(); - virtual ScrollbarValue* clone() const; + virtual ScrollbarValue* clone() const SAL_OVERRIDE; }; class VCL_DLLPUBLIC SliderValue : public ImplControlValue @@ -343,7 +343,7 @@ class VCL_DLLPUBLIC SliderValue : public ImplControlValue , mnMin( 0 ), mnMax( 0 ), mnCur( 0 ), mnThumbState( 0 ) {} virtual ~SliderValue(); - virtual SliderValue* clone() const; + virtual SliderValue* clone() const SAL_OVERRIDE; }; /* TabitemValue: @@ -369,7 +369,7 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue mnAlignment = 0; }; virtual ~TabitemValue(); - virtual TabitemValue* clone() const; + virtual TabitemValue* clone() const SAL_OVERRIDE; bool isLeftAligned() const { return (mnAlignment & TABITEM_LEFTALIGNED) != 0; } bool isRightAligned() const { return (mnAlignment & TABITEM_RIGHTALIGNED) != 0; } @@ -401,7 +401,7 @@ class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue mnUpperState = mnLowerState = 0; }; virtual ~SpinbuttonValue(); - virtual SpinbuttonValue* clone() const; + virtual SpinbuttonValue* clone() const SAL_OVERRIDE; }; /* Toolbarvalue: @@ -414,7 +414,7 @@ public: ToolbarValue() : ImplControlValue( CTRL_TOOLBAR, BUTTONVALUE_DONTKNOW, 0 ) { mbIsTopDockingArea = false; } virtual ~ToolbarValue(); - virtual ToolbarValue* clone() const; + virtual ToolbarValue* clone() const SAL_OVERRIDE; Rectangle maGripRect; bool mbIsTopDockingArea; // indicates that this is the top aligned dockingarea // adjacent to the menubar @@ -430,7 +430,7 @@ public: MenubarValue() : ImplControlValue( CTRL_MENUBAR, BUTTONVALUE_DONTKNOW, 0 ) { maTopDockingAreaHeight=0; } virtual ~MenubarValue(); - virtual MenubarValue* clone() const; + virtual MenubarValue* clone() const SAL_OVERRIDE; int maTopDockingAreaHeight; }; @@ -449,7 +449,7 @@ public: , maItemRect( i_rItemRect ) {} virtual ~MenupopupValue(); - virtual MenupopupValue* clone() const; + virtual MenupopupValue* clone() const SAL_OVERRIDE; Rectangle maItemRect; }; @@ -464,7 +464,7 @@ public: : ImplControlValue( CTRL_PUSHBUTTON, BUTTONVALUE_DONTKNOW, 0 ) , mbBevelButton( false ), mbSingleLine( true ) {} virtual ~PushButtonValue(); - virtual PushButtonValue* clone() const; + virtual PushButtonValue* clone() const SAL_OVERRIDE; bool mbBevelButton:1; bool mbSingleLine:1; diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index f9b1e5df66e0..c1e55644160a 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -94,17 +94,17 @@ public: explicit ScrollBar( Window* pParent, const ResId& ); virtual ~ScrollBar(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - 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 StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void 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 StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; using Window::Scroll; virtual void Scroll(); @@ -140,7 +140,7 @@ public: void SetEndScrollHdl( const Link& rLink ) { maEndScrollHdl = rLink; } const Link& GetEndScrollHdl() const { return maEndScrollHdl; } - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; @@ -157,8 +157,8 @@ private: public: explicit ScrollBarBox( Window* pParent, WinBits nStyle = 0 ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_SCRBAR_HXX diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index ca11facf2b1e..92b2a56f1f94 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -74,15 +74,15 @@ private: public: Slider( Window* pParent, WinBits nStyle = WB_HORZ ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) 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 RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Slide(); virtual void EndSlide(); diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 206a5c3ab9f9..5ba88e9cd19b 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -62,16 +62,16 @@ public: virtual void Up(); virtual void Down(); - 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 MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void GetFocus(); - virtual void LoseFocus(); + 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 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 StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; void SetRangeMin( long nNewRange ); long GetRangeMin() const { return mnMinRange; } @@ -83,7 +83,7 @@ public: long GetValue() const { return mnValue; } void SetValueStep( long nNewStep ) { mnValueStep = nNewStep; } long GetValueStep() const { return mnValueStep; } - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } const Link& GetUpHdl() const { return maUpHdlLink; } diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 47441800e0d9..2d09032d4e2e 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -61,12 +61,12 @@ private: protected: explicit SpinField( WindowType nTyp ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; void EndDropDown(); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const SAL_OVERRIDE; Rectangle * ImplFindPartRect( const Point& rPt ); public: @@ -81,15 +81,15 @@ public: virtual void First(); virtual void Last(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - 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 StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + 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 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 StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } const Link& GetUpHdl() const { return maUpHdlLink; } @@ -100,10 +100,10 @@ public: void SetLastHdl( const Link& rLink ) { maLastHdlLink = rLink; } const Link& GetLastHdl() const { return maLastHdlLink; } - virtual Size CalcMinimumSize() const; - virtual Size CalcMinimumSizeForText(const OUString &rString) const; - virtual Size GetOptimalSize() const; - virtual Size CalcSize(sal_Int32 nChars) const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; + virtual Size CalcMinimumSizeForText(const OUString &rString) const SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size CalcSize(sal_Int32 nChars) const SAL_OVERRIDE; }; #endif // INCLUDED_VCL_SPINFLD_HXX diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index ab60906564bd..65cc90ec17e9 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -71,17 +71,17 @@ public: virtual void Split(); virtual void Splitting( Point& rSplitPos ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rPaintRect ); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rPaintRect ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void StartDrag(); diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index a2d715006c16..35948731ba3c 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -135,16 +135,16 @@ public: virtual void FadeIn(); virtual void FadeOut(); - 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 Move(); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + 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 Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void InsertItem( sal_uInt16 nId, Window* pWindow, long nSize, sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 830c0ac951ab..fb51b0e72e12 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -114,13 +114,13 @@ public: WinBits nWinStyle = WB_BORDER | WB_RIGHT ); ~StatusBar(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Move(); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void Click(); virtual void DoubleClick(); @@ -180,7 +180,7 @@ public: void EndProgressMode(); bool IsProgressMode() const { return mbProgressMode; } - void SetText( const OUString& rText ); + void SetText( const OUString& rText ) SAL_OVERRIDE; void SetHelpText( const OUString& rText ) { Window::SetHelpText( rText ); } diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 50bdd55b0c4a..32a6f92147d0 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -175,8 +175,8 @@ protected: public: ~SystemWindow(); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool Close(); virtual void TitleButtonClick( sal_uInt16 nButton ); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index ba483b82e622..d062a16810ac 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -75,9 +75,9 @@ protected: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - virtual void FillLayoutData() const; - virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const; - virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const; + virtual void FillLayoutData() const SAL_OVERRIDE; + virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); public: @@ -86,23 +86,23 @@ public: TabControl( Window* pParent, const ResId& rResId ); ~TabControl(); - virtual void MouseButtonDown( const MouseEvent& 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 bool Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& 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 bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void ActivatePage(); virtual bool DeactivatePage(); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetTabPageSizePixel( const Size& rSize ); Size GetTabPageSizePixel() const; @@ -181,9 +181,9 @@ public: // returns the rectangle of the tab for page nPageId Rectangle GetTabBounds( sal_uInt16 nPageId ) const; - virtual void SetPosPixel(const Point& rPos); - virtual void SetSizePixel(const Size& rNewSize); - virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize); + virtual void SetPosPixel(const Point& rPos) SAL_OVERRIDE; + virtual void SetSizePixel(const Size& rNewSize) SAL_OVERRIDE; + virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) SAL_OVERRIDE; Size calculateRequisition() const; void setAllocation(const Size &rAllocation); @@ -193,7 +193,7 @@ public: mbLayoutDirty = true; } - virtual void queue_resize(); + virtual void queue_resize() SAL_OVERRIDE; }; #endif // INCLUDED_VCL_TABCTRL_HXX diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index 096d5053e66b..ecce55a00d7f 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -44,7 +44,7 @@ public: TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); ~TabDialog(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void AdjustLayout(); diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index e37469e1d68e..a8ac279af746 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -44,20 +44,20 @@ public: explicit TabPage( Window* pParent, const ResId& rResId ); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); + 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 StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void ActivatePage(); virtual void DeactivatePage(); //To-Do, consider inheriting from VclContainer - virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize); - virtual void SetPosPixel(const Point& rNewPos); - virtual void SetSizePixel(const Size& rNewSize); - virtual Size GetOptimalSize() const; + virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) SAL_OVERRIDE; + virtual void SetPosPixel(const Point& rNewPos) SAL_OVERRIDE; + virtual void SetSizePixel(const Size& rNewSize) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; #endif // INCLUDED_VCL_TABPAGE_HXX diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index fe3a4a34810f..935504125316 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -89,12 +89,12 @@ protected: VirtualDevice* GetVirtualDevice(); // DragAndDropClient - virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; using DragAndDropClient::dragEnter; using DragAndDropClient::dragExit; diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 9433e394df39..2b375bc444ac 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -79,7 +79,7 @@ private: explicit GenericSolarThreadExecutor( FuncT const& func ) : m_exc(), m_func(func), m_result() {} - virtual long doIt() + virtual long doIt() SAL_OVERRIDE { try { m_result.reset( m_func() ); @@ -115,7 +115,7 @@ private: explicit GenericSolarThreadExecutor( FuncT const& func ) : m_exc(), m_func(func) {} - virtual long doIt() + virtual long doIt() SAL_OVERRIDE { try { m_func(); diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index 80c9d7dd764a..e5ec8236f3c8 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -71,7 +71,7 @@ public: protected: // Window overridables - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; private: SAL_DLLPRIVATE void initImages(); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 3013f4abe78c..2bc306a0a881 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -291,37 +291,37 @@ public: virtual void Click(); virtual void DoubleClick(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; virtual void Highlight(); virtual void Select(); virtual void Customize( const ToolBoxCustomizeEvent& rCEvt ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Move(); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void KeyInput( const KeyEvent& rKEvt ); - - virtual bool PrepareToggleFloatingMode(); - virtual void ToggleFloatingMode(); - virtual void StartDocking(); - virtual bool Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ); - virtual void Resizing( Size& rSize ); - virtual Size GetOptimalSize() const; + 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& rTEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + + virtual bool PrepareToggleFloatingMode() SAL_OVERRIDE; + virtual void ToggleFloatingMode() SAL_OVERRIDE; + virtual void StartDocking() SAL_OVERRIDE; + virtual bool Docking( const Point& rPos, Rectangle& rRect ) SAL_OVERRIDE; + virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void InsertItem( const ResId& rResId, sal_uInt16 nPos = TOOLBOX_APPEND ); @@ -559,7 +559,7 @@ public: // accessibility helpers // gets the displayed text - OUString GetDisplayText() const; + OUString GetDisplayText() const SAL_OVERRIDE; // returns the bounding box for the character at index nIndex // where nIndex is relative to the starting index of the item // with id nItemId (in coordinates of the displaying window) diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index be0d3bd0024e..86dcbd0efa5b 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -73,9 +73,9 @@ public: const Color& GetColor() const { return maColor; } - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; }; @@ -89,9 +89,9 @@ public: TextAttribFontWeight( const TextAttribFontWeight& rAttr ); ~TextAttribFontWeight(); - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; inline FontWeight getFontWeight() const { return meWeight; } }; @@ -117,9 +117,9 @@ public: void SetColor( const Color& rColor ) { maColor = rColor; } const Color& GetColor() const { return maColor; } - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; }; class VCL_DLLPUBLIC TextAttribProtect : public TextAttrib @@ -129,9 +129,9 @@ public: TextAttribProtect( const TextAttribProtect& rAttr ); ~TextAttribProtect(); - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual bool operator==( const TextAttrib& rAttr ) const; + virtual void SetFont( Font& rFont ) const SAL_OVERRIDE; + virtual TextAttrib* Clone() const SAL_OVERRIDE; + virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; }; diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx index 4e2067f9cc4f..e835bbde95f0 100644 --- a/include/vcl/unohelp2.hxx +++ b/include/vcl/unohelp2.hxx @@ -46,14 +46,14 @@ namespace vcl { namespace unohelper { OUString& GetString() { return maText; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::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; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::datatransfer::XTransferable - ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// copies a given string to a given clipboard static void CopyStringTo( diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 97c77c91dde3..b29436f55fc3 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -45,10 +45,10 @@ private: protected: DECL_LINK( ImpUpdateDataHdl, void* ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; using Control::ImplInitSettings; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); WinBits ImplInitStyle( WinBits nStyle ); @@ -65,42 +65,42 @@ public: void SelectionChanged(); void CaretChanged(); - virtual void Modify(); - virtual void UpdateData(); + virtual void Modify() SAL_OVERRIDE; + virtual void UpdateData() SAL_OVERRIDE; - virtual void SetModifyFlag(); - virtual void ClearModifyFlag(); + virtual void SetModifyFlag() SAL_OVERRIDE; + virtual void ClearModifyFlag() SAL_OVERRIDE; virtual bool IsModified() const SAL_OVERRIDE; - virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ); - virtual void DisableUpdateData() { delete pUpdateDataTimer; pUpdateDataTimer = NULL; } + virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ) SAL_OVERRIDE; + virtual void DisableUpdateData() SAL_OVERRIDE { delete pUpdateDataTimer; pUpdateDataTimer = NULL; } - virtual void SetReadOnly( bool bReadOnly = true ); - virtual bool IsReadOnly() const; + virtual void SetReadOnly( bool bReadOnly = true ) SAL_OVERRIDE; + virtual bool IsReadOnly() const SAL_OVERRIDE; void EnableFocusSelectionHide( bool bHide ); - virtual void SetMaxTextLen(sal_Int32 nMaxLen = 0); - virtual sal_Int32 GetMaxTextLen() const; + virtual void SetMaxTextLen(sal_Int32 nMaxLen = 0) SAL_OVERRIDE; + virtual sal_Int32 GetMaxTextLen() const SAL_OVERRIDE; void SetMaxTextWidth( sal_uLong nMaxWidth ); - virtual void SetSelection( const Selection& rSelection ); - virtual const Selection& GetSelection() const; + virtual void SetSelection( const Selection& rSelection ) SAL_OVERRIDE; + virtual const Selection& GetSelection() const SAL_OVERRIDE; - virtual void ReplaceSelected( const OUString& rStr ); - virtual void DeleteSelected(); - virtual OUString GetSelected() const; + virtual void ReplaceSelected( const OUString& rStr ) SAL_OVERRIDE; + virtual void DeleteSelected() SAL_OVERRIDE; + virtual OUString GetSelected() const SAL_OVERRIDE; virtual OUString GetSelected( LineEnd aSeparator ) const; - virtual void Cut(); - virtual void Copy(); - virtual void Paste(); + virtual void Cut() SAL_OVERRIDE; + virtual void Copy() SAL_OVERRIDE; + virtual void Paste() SAL_OVERRIDE; - 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 { SetText( rStr ); SetSelection( rNewSelection ); } - OUString GetText() const; + OUString GetText() const SAL_OVERRIDE; OUString GetText( LineEnd aSeparator ) const; OUString GetTextLines( LineEnd aSeparator ) const; @@ -109,20 +109,20 @@ public: void SaveValue() { aSaveValue = GetText(); } const OUString& GetSavedValue() const { return aSaveValue; } - void SetModifyHdl( const Link& rLink ) { aModifyHdlLink = rLink; } - const Link& GetModifyHdl() const { return aModifyHdlLink; } + void SetModifyHdl( const Link& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; } + const Link& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; } - void SetUpdateDataHdl( const Link& rLink ) { aUpdateDataHdlLink = rLink; } + void SetUpdateDataHdl( const Link& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; } - virtual void Resize(); - virtual void GetFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const SAL_OVERRIDE; Size CalcAdjustedSize( const Size& rPrefSize ) const; Size CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; - 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 SetLeftMargin( sal_uInt16 n ); @@ -130,7 +130,7 @@ public: void EnableCursor( bool bEnable ); - virtual bool set_property(const OString &rKey, const OString &rValue); + virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_VCLMEDIT_HXX diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index f413e4852323..2713567b0608 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -61,8 +61,8 @@ private: SAL_DLLPRIVATE bool ForceZeroExtleadBug() const { return ((meRefDevMode & REFDEV_FORCE_ZERO_EXTLEAD) != 0); } public: - bool ImplInitGraphics() const; - void ImplReleaseGraphics( bool bRelease = true ); + bool ImplInitGraphics() const SAL_OVERRIDE; + void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; public: /** Create a virtual device of size 1x1 @@ -113,7 +113,7 @@ public: virtual ~VirtualDevice(); - virtual void EnableRTL( bool bEnable = true ); + virtual void EnableRTL( bool bEnable = true ) SAL_OVERRIDE; bool SetOutputSizePixel( const Size& rNewSize, bool bErase = true ); bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer ); @@ -134,8 +134,8 @@ public: void SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); - sal_uInt16 GetBitCount() const; - sal_uInt16 GetAlphaBitCount() const; + sal_uInt16 GetBitCount() const SAL_OVERRIDE; + sal_uInt16 GetAlphaBitCount() const SAL_OVERRIDE; private: SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 3a3851ca449d..5751489fe1c7 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -375,8 +375,8 @@ private: friend Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); public: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); - bool ImplInitGraphics() const; - void ImplReleaseGraphics( bool bRelease = true ); + bool ImplInitGraphics() const SAL_OVERRIDE; + void ImplReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; SAL_DLLPRIVATE WinBits ImplInitRes( const ResId& rResId ); SAL_DLLPRIVATE WindowResHeader ImplLoadResHeader( const ResId& rResId ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -579,11 +579,11 @@ protected: virtual sal_uInt16 getDefaultAccessibleRole() const; virtual OUString getDefaultAccessibleName() const; - virtual void CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags); - virtual void ClipToPaintRegion( Rectangle& rDstRect ); + virtual void CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags) SAL_OVERRIDE; + virtual void ClipToPaintRegion( Rectangle& rDstRect ) SAL_OVERRIDE; public: - bool HasMirroredGraphics() const; + bool HasMirroredGraphics() const SAL_OVERRIDE; public: // Single argument ctors shall be explicit. @@ -595,7 +595,7 @@ public: OutputDevice const* GetOutDev() const { return mpOutputDevice; }; OutputDevice* GetOutDev() { return mpOutputDevice; }; - virtual void EnableRTL ( bool bEnable = true ); + virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); @@ -697,7 +697,7 @@ public: void SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical = false ); using OutputDevice::SetSettings; - virtual void SetSettings( const AllSettings& rSettings ); + virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE; virtual void SetSettings( const AllSettings& rSettings, sal_Bool bChild ); void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); void NotifyAllChildren( DataChangedEvent& rDCEvt ); diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index ac4b09bba13e..1c06d52d83bc 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -67,7 +67,7 @@ public: explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version virtual ~WorkWindow(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; void ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScreen ); |