diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /include/vcl | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/vcl')
60 files changed, 1078 insertions, 1078 deletions
diff --git a/include/vcl/BitmapFilterStackBlur.hxx b/include/vcl/BitmapFilterStackBlur.hxx index 9b400c812c11..68fa107957e4 100644 --- a/include/vcl/BitmapFilterStackBlur.hxx +++ b/include/vcl/BitmapFilterStackBlur.hxx @@ -24,7 +24,7 @@ public: BitmapFilterStackBlur(sal_Int32 nRadius, bool bExtend = true); virtual ~BitmapFilterStackBlur(); - virtual bool filter(Bitmap& rBitmap) SAL_OVERRIDE; + virtual bool filter(Bitmap& rBitmap) override; bool filter(BitmapEx& rBitmap); }; diff --git a/include/vcl/bitmapscalesuper.hxx b/include/vcl/bitmapscalesuper.hxx index e7fffead8469..599b1b91d140 100644 --- a/include/vcl/bitmapscalesuper.hxx +++ b/include/vcl/bitmapscalesuper.hxx @@ -28,7 +28,7 @@ public: BitmapScaleSuper(const double& rScaleX, const double& rScaleY); virtual ~BitmapScaleSuper(); - virtual bool filter(Bitmap& rBitmap) SAL_OVERRIDE; + virtual bool filter(Bitmap& rBitmap) override; private: double mrScaleX; diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 692c611c5869..a414c8949de7 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -52,10 +52,10 @@ class VCL_DLLPUBLIC ButtonDialog : public Dialog public: ButtonDialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); virtual ~ButtonDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nStateChange ) override; void Click(); diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index ea1af74d6157..7e3cf2f315e0 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -65,7 +65,7 @@ protected: public: virtual ~Button(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual void Click(); @@ -89,7 +89,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) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; protected: @@ -150,27 +150,27 @@ public: protected: explicit PushButton( WindowType nType ); - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; virtual const vcl::Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; public: explicit PushButton( vcl::Window* pParent, WinBits nStyle = 0 ); explicit PushButton( vcl::Window* pParent, const ResId& ); - 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( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void 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 MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void KeyUp( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void Toggle(); @@ -195,10 +195,10 @@ public: bool IsValueChangedFromSaved() const { return meSaveValue != GetState(); } Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; - virtual void ShowFocus(const Rectangle& rRect) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; + virtual void ShowFocus(const Rectangle& rRect) override; }; inline void PushButton::Check( bool bCheck ) @@ -224,7 +224,7 @@ private: public: explicit OKButton( vcl::Window* pParent, WinBits nStyle = WB_DEFBUTTON ); - virtual void Click() SAL_OVERRIDE; + virtual void Click() override; }; class VCL_DLLPUBLIC CancelButton : public PushButton @@ -240,7 +240,7 @@ private: public: explicit CancelButton( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void Click() SAL_OVERRIDE; + virtual void Click() override; }; class VCL_DLLPUBLIC CloseButton : public CancelButton @@ -267,7 +267,7 @@ private: public: explicit HelpButton( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void Click() SAL_OVERRIDE; + virtual void Click() override; }; @@ -316,11 +316,11 @@ public: SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); protected: - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; virtual const vcl::Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; inline void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; } inline void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; } @@ -333,20 +333,20 @@ public: explicit RadioButton( vcl::Window* pParent, WinBits nWinStyle = 0 ); explicit RadioButton( vcl::Window* pParent, const ResId& ); virtual ~RadioButton(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void 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 dispose() override; + + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void KeyUp( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void Toggle(); @@ -369,7 +369,7 @@ public: static Image GetRadioImage( const AllSettings& rSettings, DrawButtonFlags nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; void SetToggleHdl( const Link<RadioButton&,void>& rLink ) { maToggleHdl = rLink; } @@ -388,13 +388,13 @@ public: */ std::vector<VclPtr<RadioButton> > GetRadioButtonGroup(bool bIncludeThis = true) const; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; /* * Group this RadioButton with another */ void group(RadioButton &rOther); - virtual void ShowFocus(const Rectangle& rRect) SAL_OVERRIDE; + virtual void ShowFocus(const Rectangle& rRect) override; }; @@ -434,9 +434,9 @@ protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - virtual void FillLayoutData() const SAL_OVERRIDE; - virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; - virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + virtual void FillLayoutData() const override; + virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const override; + virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE const Rectangle& GetStateRect() const { return maStateRect; } @@ -449,18 +449,18 @@ public: explicit CheckBox( vcl::Window* pParent, WinBits nStyle = 0 ); explicit CheckBox( vcl::Window* pParent, const ResId& ); - 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( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void 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 MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void KeyUp( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void Toggle(); @@ -480,13 +480,13 @@ public: static Image GetCheckImage( const AllSettings& rSettings, DrawButtonFlags nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; void SetToggleHdl( const Link<CheckBox&,void>& rLink ) { maToggleHdl = rLink; } void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; } - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; - virtual void ShowFocus(const Rectangle& rRect) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; + virtual void ShowFocus(const Rectangle& rRect) override; }; inline void CheckBox::Check( bool bCheck ) @@ -539,11 +539,11 @@ public: class VCL_DLLPUBLIC DisclosureButton : public CheckBox { protected: - SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) override; public: explicit DisclosureButton( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; }; #endif // INCLUDED_VCL_BUTTON_HXX diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 76526240d77c..46dfe347716d 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -47,31 +47,31 @@ protected: protected: bool IsDropDownBox() const; - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; public: explicit ComboBox( vcl::Window* pParent, WinBits nStyle = 0 ); explicit ComboBox( vcl::Window* pParent, const ResId& ); virtual ~ComboBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags 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 Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Select(); virtual void DoubleClick(); - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; + virtual const Wallpaper& GetDisplayBackground() const override; - virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) SAL_OVERRIDE; - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE + virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override { Edit::SetPosSizePixel( rNewPos, rNewSize ); } Rectangle GetDropDownPosSizePixel() const; @@ -85,8 +85,8 @@ public: void EnableDDAutoWidth( bool b ); - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) override; virtual sal_Int32 InsertEntry(const OUString& rStr, sal_Int32 nPos = COMBOBOX_APPEND); sal_Int32 InsertEntryWithImage( const OUString& rStr, const Image& rImage, sal_Int32 nPos = COMBOBOX_APPEND ); @@ -128,8 +128,8 @@ public: void SetDoubleClickHdl(const Link<>& rLink); const Link<>& GetDoubleClickHdl() const; - Size CalcMinimumSize() const SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + Size CalcMinimumSize() const override; + virtual Size GetOptimalSize() const 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; @@ -178,7 +178,7 @@ public: void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; }; #endif // _COMBOBOX_HXX diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx index f797898d88ff..c91354ae72b9 100644 --- a/include/vcl/configsettings.hxx +++ b/include/vcl/configsettings.hxx @@ -39,12 +39,12 @@ namespace vcl private: std::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) override; void getValues(); SettingsConfigItem(); - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: virtual ~SettingsConfigItem(); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 7fe2411d6b21..3ede0ebb4271 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -97,7 +97,7 @@ protected: void ImplInitSettings( const bool _bFont, const bool _bForeground ); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: SAL_DLLPRIVATE void ImplClearLayoutData() const; @@ -125,20 +125,20 @@ public: explicit Control( vcl::Window* pParent, WinBits nWinStyle = 0 ); explicit Control( vcl::Window* pParent, const ResId& ); virtual ~Control(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; + virtual void EnableRTL ( bool bEnable = true ) override; - 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 GetFocus() override; + virtual void LoseFocus() override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void Resize() override; // invalidates layout data - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; // gets the displayed text - virtual OUString GetDisplayText() const SAL_OVERRIDE; + virtual OUString GetDisplayText() const 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) @@ -171,7 +171,7 @@ public: void SetLayoutDataParent( const Control* pParent ) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; /** sets a reference device used for rendering control text @see DrawControlText diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx index 6dc3dbffc5ab..8cde5ef3b4a1 100644 --- a/include/vcl/debugevent.hxx +++ b/include/vcl/debugevent.hxx @@ -26,7 +26,7 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer { static void InjectMenuEvent(); static void InjectEvent(); static void InjectKeyNavEdit(); - virtual void Invoke() SAL_OVERRIDE; + virtual void Invoke() override; public: static DebugEventInjector *getCreate(); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 1ab08d2fb10f..6875366d8a50 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -53,7 +53,7 @@ private: SAL_DLLPRIVATE void ImplInitDialogData(); SAL_DLLPRIVATE void ImplInitSettings(); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; SAL_DLLPRIVATE Dialog (const Dialog &) = delete; SAL_DLLPRIVATE Dialog & operator= (const Dialog &) = delete; @@ -66,13 +66,13 @@ protected: public: SAL_DLLPRIVATE bool IsInClose() const { return mbInClose; } - virtual void doDeferredInit(WinBits nBits) SAL_OVERRIDE; + virtual void doDeferredInit(WinBits nBits) override; protected: explicit Dialog( WindowType nType ); explicit Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, WindowType nType, InitFlag eFlag = InitFlag::Default ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void settingOptimalLayoutSize(Window *pBox) SAL_OVERRIDE; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void settingOptimalLayoutSize(Window *pBox) override; protected: friend class VclBuilder; @@ -83,18 +83,18 @@ public: explicit Dialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG, InitFlag eFlag = InitFlag::Default ); explicit Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; + virtual bool set_property(const OString &rKey, const OString &rValue) override; VclButtonBox* get_action_area() { return mpActionArea; } VclBox* get_content_area() { return mpContentArea; } - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; virtual short Execute(); bool IsInExecute() const { return mbInExecute; } diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index f7762d831c71..4e5036652a41 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -94,29 +94,29 @@ public: virtual ~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) SAL_OVERRIDE; - void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } - void SAL_CALL release() throw() SAL_OVERRIDE { 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) override; + void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } + void SAL_CALL release() throw() 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) SAL_OVERRIDE; + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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; + void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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; + void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; }} // namespace vcl::unohelper diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index f7cf79fda498..1d6c446cb23b 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -37,17 +37,17 @@ private: public: explicit DockingAreaWindow( vcl::Window* pParent ); virtual ~DockingAreaWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetAlign( WindowAlign eNewAlign ); WindowAlign GetAlign() const; bool IsHorizontal() const; - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, 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; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; }; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index b9b51e977082..cf44a66b1a36 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -294,7 +294,7 @@ public: DockingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~DockingWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual void StartDocking(); virtual bool Docking( const Point& rPos, Rectangle& rRect ); @@ -304,10 +304,10 @@ public: virtual void Resizing( Size& rSize ); virtual bool Close(); - 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; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void RollDown(); bool IsRollUp() const; @@ -334,19 +334,19 @@ public: virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, - PosSizeFlags nFlags = PosSizeFlags::All ) SAL_OVERRIDE; + PosSizeFlags nFlags = PosSizeFlags::All ) override; void SetPosSizePixel( const Point& rNewPos, - const Size& rNewSize ) SAL_OVERRIDE + const Size& rNewSize ) override { Window::SetPosSizePixel( rNewPos, rNewSize ); } - Point GetPosPixel() const SAL_OVERRIDE; - Size GetSizePixel() const SAL_OVERRIDE; - void SetOutputSizePixel( const Size& rNewSize ) SAL_OVERRIDE; + Point GetPosPixel() const override; + Size GetSizePixel() const override; + void SetOutputSizePixel( const Size& rNewSize ) override; Size GetOutputSizePixel() const; - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; + virtual Size GetOptimalSize() const override; + virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; }; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 17a8a2134052..7a6023684860 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -156,22 +156,22 @@ protected: using vcl::unohelper::DragAndDropClient::dragExit; using vcl::unohelper::DragAndDropClient::dragOver; virtual void dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& dge) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void dragDropEnd(const css::datatransfer::dnd::DragSourceDropEvent& dsde) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void dragEnter(const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void dragExit(const css::datatransfer::dnd::DropTargetEvent& dte) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; protected: Edit(WindowType nType); - virtual void FillLayoutData() const SAL_OVERRIDE; - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void FillLayoutData() const override; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: // public because needed in button.cxx SAL_DLLPRIVATE bool ImplUseNativeBorder(vcl::RenderContext& rRenderContext, WinBits nStyle); @@ -179,21 +179,21 @@ public: Edit( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); Edit( vcl::Window* pParent, const ResId& rResId ); virtual ~Edit(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags 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 vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual void dispose() override; + + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual vcl::Window* GetPreferredKeyInputWindow() override; virtual void Modify(); virtual void UpdateData(); @@ -235,9 +235,9 @@ public: virtual void Paste(); void Undo(); - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); - virtual OUString GetText() const SAL_OVERRIDE; + virtual OUString GetText() const override; void SetPlaceholderText( const OUString& rStr ); OUString GetPlaceholderText() const; @@ -259,7 +259,7 @@ public: virtual Size CalcMinimumSize() const; virtual Size CalcMinimumSizeForText(const OUString &rString) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; virtual Size CalcSize(sal_Int32 nChars) const; sal_Int32 GetMaxVisChars() const; @@ -274,9 +274,9 @@ public: static PopupMenu* CreatePopupMenu(); static void DeletePopupMenu( PopupMenu* pMenu ); - virtual OUString GetSurroundingText() const SAL_OVERRIDE; - virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual OUString GetSurroundingText() const override; + virtual Selection GetSurroundingTextSelection() const override; + virtual bool set_property(const OString &rKey, const OString &rValue) override; void SetTextFilter(TextFilter* pFilter) { mpFilterText = pFilter; } diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 593be423ce29..58ec9040db6b 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -117,7 +117,7 @@ protected: public: virtual ~PatternFormatter(); - virtual void Reformat() SAL_OVERRIDE; + virtual void Reformat() override; void SetMask(const OString& rEditMask, const OUString& rLiteralMask ); const OString& GetEditMask() const { return m_aEditMask; } @@ -172,7 +172,7 @@ protected: public: virtual ~NumericFormatter(); - virtual void Reformat() SAL_OVERRIDE; + virtual void Reformat() override; void SetMin( sal_Int64 nNewMin ); sal_Int64 GetMin() const { return mnMin; } @@ -234,7 +234,7 @@ public: virtual ~MetricFormatter(); virtual void CustomConvert() = 0; - virtual void Reformat() SAL_OVERRIDE; + virtual void Reformat() override; virtual void SetUnit( FieldUnit meUnit ); FieldUnit GetUnit() const { return meUnit; } @@ -254,12 +254,12 @@ public: sal_Int64 GetBaseValue( FieldUnit eOutUnit = FUNIT_NONE ) const; virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); - virtual void SetValue( sal_Int64 nValue ) SAL_OVERRIDE; + virtual void SetValue( sal_Int64 nValue ) override; using NumericFormatter::SetUserValue; void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ); virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; - virtual sal_Int64 GetValue() const SAL_OVERRIDE; - virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; + virtual sal_Int64 GetValue() const override; + virtual OUString CreateFieldText( sal_Int64 nValue ) const override; sal_Int64 GetCorrectedValue( FieldUnit eOutUnit ) const; void SetCustomConvertHdl( const Link<MetricFormatter&,void>& rLink ) { maCustomConvertLink = rLink; } @@ -282,13 +282,13 @@ protected: public: virtual ~CurrencyFormatter(); - virtual void Reformat() SAL_OVERRIDE; + virtual void Reformat() override; OUString GetCurrencySymbol() 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; + virtual void SetValue( sal_Int64 nNewValue ) override; + virtual sal_Int64 GetValue() const override; + virtual OUString CreateFieldText( sal_Int64 nValue ) const override; }; @@ -330,10 +330,10 @@ protected: public: virtual ~DateFormatter(); - virtual void Reformat() SAL_OVERRIDE; - virtual void ReformatAll() SAL_OVERRIDE; + virtual void Reformat() override; + virtual void ReformatAll() override; - virtual void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) SAL_OVERRIDE; + virtual void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) override; void SetExtDateFormat( ExtDateFieldFormat eFormat ); @@ -422,8 +422,8 @@ public: virtual ~TimeFormatter(); - virtual void Reformat() SAL_OVERRIDE; - virtual void ReformatAll() SAL_OVERRIDE; + virtual void Reformat() override; + virtual void ReformatAll() override; void SetMin( const tools::Time& rNewMin ); const tools::Time& GetMin() const { return maMin; } @@ -473,10 +473,10 @@ class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter public: explicit PatternField( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Modify() SAL_OVERRIDE; - virtual void dispose() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void Modify() override; + virtual void dispose() override; }; @@ -493,20 +493,20 @@ public: explicit NumericField( vcl::Window* pParent, WinBits nWinStyle ); explicit NumericField( vcl::Window* pParent, const ResId& ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual Size CalcMinimumSize() const SAL_OVERRIDE; + virtual Size CalcMinimumSize() const override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - 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; - virtual void dispose() SAL_OVERRIDE; + virtual void Up() override; + virtual void Down() override; + virtual void First() override; + virtual void Last() override; + virtual bool set_property(const OString &rKey, const OString &rValue) override; + virtual void dispose() override; }; @@ -523,21 +523,21 @@ public: explicit MetricField( vcl::Window* pParent, WinBits nWinStyle ); explicit MetricField( vcl::Window* pParent, const ResId& ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual Size CalcMinimumSize() const SAL_OVERRIDE; + virtual Size CalcMinimumSize() const override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - 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 Up() override; + virtual void Down() override; + virtual void First() override; + virtual void Last() override; + virtual void CustomConvert() override; - virtual void SetUnit( FieldUnit meUnit ) SAL_OVERRIDE; + virtual void SetUnit( FieldUnit meUnit ) override; void SetFirst( sal_Int64 nNewFirst, FieldUnit eInUnit ); inline void SetFirst(sal_Int64 first) { SetFirst(first, FUNIT_NONE); } @@ -576,8 +576,8 @@ public: MapUnit eInUnit, FieldUnit eOutUnit ) { return ConvertDoubleValue( static_cast<double>(nValue), nDecDigits, eInUnit, eOutUnit ); } - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; - virtual void dispose() SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; + virtual void dispose() override; }; @@ -590,17 +590,17 @@ class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter public: CurrencyField( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - virtual void Up() SAL_OVERRIDE; - virtual void Down() SAL_OVERRIDE; - virtual void First() SAL_OVERRIDE; - virtual void Last() SAL_OVERRIDE; - virtual void dispose() SAL_OVERRIDE; + virtual void Up() override; + virtual void Down() override; + virtual void First() override; + virtual void Last() override; + virtual void dispose() override; }; @@ -620,22 +620,22 @@ protected: public: explicit DateField( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - virtual void Up() SAL_OVERRIDE; - virtual void Down() SAL_OVERRIDE; - virtual void First() SAL_OVERRIDE; - virtual void Last() SAL_OVERRIDE; + virtual void Up() override; + virtual void Down() override; + virtual void First() override; + virtual void Last() override; void SetFirst( const Date& rNewFirst ) { maFirst = rNewFirst; } Date GetFirst() const { return maFirst; } void SetLast( const Date& rNewLast ) { maLast = rNewLast; } Date GetLast() const { return maLast; } - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; @@ -654,16 +654,16 @@ protected: public: explicit TimeField( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - virtual void Up() SAL_OVERRIDE; - virtual void Down() SAL_OVERRIDE; - virtual void First() SAL_OVERRIDE; - virtual void Last() SAL_OVERRIDE; + virtual void Up() override; + virtual void Down() override; + virtual void First() override; + virtual void Last() override; void SetFirst( const tools::Time& rNewFirst ) { maFirst = rNewFirst; } tools::Time GetFirst() const { return maFirst; } @@ -671,7 +671,7 @@ public: tools::Time GetLast() const { return maLast; } void SetExtFormat( ExtTimeFieldFormat eFormat ); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; @@ -684,13 +684,13 @@ class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter public: PatternBox( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - virtual void ReformatAll() SAL_OVERRIDE; - virtual void dispose() SAL_OVERRIDE; + virtual void ReformatAll() override; + virtual void dispose() override; }; @@ -703,18 +703,18 @@ class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter public: explicit NumericBox( vcl::Window* pParent, WinBits nWinStyle ); - virtual Size CalcMinimumSize() const SAL_OVERRIDE; + virtual Size CalcMinimumSize() const override; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - virtual void ReformatAll() SAL_OVERRIDE; + virtual void ReformatAll() override; void InsertValue( sal_Int64 nValue, sal_Int32 nPos = COMBOBOX_APPEND ); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; @@ -727,16 +727,16 @@ class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter public: explicit MetricBox( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual Size CalcMinimumSize() const SAL_OVERRIDE; + virtual Size CalcMinimumSize() const override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - virtual void CustomConvert() SAL_OVERRIDE; - virtual void ReformatAll() SAL_OVERRIDE; + virtual void CustomConvert() override; + virtual void ReformatAll() override; void InsertValue( sal_Int64 nValue, FieldUnit eInUnit = FUNIT_NONE, sal_Int32 nPos = COMBOBOX_APPEND ); @@ -745,10 +745,10 @@ public: FieldUnit eInUnit = FUNIT_NONE ) const; // Needed, because GetValue() with nPos hide these functions - virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const SAL_OVERRIDE; - virtual sal_Int64 GetValue() const SAL_OVERRIDE; + virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const override; + virtual sal_Int64 GetValue() const override; - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; @@ -761,16 +761,16 @@ class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter public: explicit CurrencyBox( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - virtual void ReformatAll() SAL_OVERRIDE; + virtual void ReformatAll() override; - virtual sal_Int64 GetValue() const SAL_OVERRIDE; - virtual void dispose() SAL_OVERRIDE; + virtual sal_Int64 GetValue() const override; + virtual void dispose() override; }; @@ -782,14 +782,14 @@ class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter public: explicit DateBox( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - virtual void ReformatAll() SAL_OVERRIDE; - virtual void dispose() SAL_OVERRIDE; + virtual void ReformatAll() override; + virtual void dispose() override; }; @@ -802,14 +802,14 @@ class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter public: explicit TimeBox( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void Modify() SAL_OVERRIDE; + virtual void Modify() override; - virtual void ReformatAll() SAL_OVERRIDE; - virtual void dispose() SAL_OVERRIDE; + virtual void ReformatAll() override; + virtual void dispose() override; }; #endif // INCLUDED_VCL_FIELD_HXX diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index f24a0d5432c0..3c9e3a35446b 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -49,35 +49,35 @@ private: public: SAL_DLLPRIVATE static DrawTextFlags ImplGetTextStyle( WinBits nWinBits ); protected: - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; virtual const vcl::Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; - virtual vcl::Window* getAccessibleRelationLabelFor() const SAL_OVERRIDE; + virtual vcl::Window* getAccessibleRelationLabelFor() const override; public: explicit FixedText( vcl::Window* pParent, WinBits nStyle = 0 ); explicit FixedText( vcl::Window* pParent, const ResId& rResId ); virtual ~FixedText(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void setMaxWidthChars(sal_Int32 nWidth); void setMinWidthChars(sal_Int32 nWidth); 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 SAL_OVERRIDE; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; + virtual bool set_property(const OString &rKey, const OString &rValue) override; void set_mnemonic_widget(vcl::Window *pWindow); vcl::Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; @@ -87,8 +87,8 @@ class VCL_DLLPUBLIC SelectableFixedText : public Edit public: explicit SelectableFixedText( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void LoseFocus() SAL_OVERRIDE; - virtual void ApplySettings(vcl::RenderContext&) SAL_OVERRIDE; + virtual void LoseFocus() override; + virtual void ApplySettings(vcl::RenderContext&) override; }; @@ -105,25 +105,25 @@ private: SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout = false); protected: - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; virtual const vcl::Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; public: explicit FixedLine( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); explicit FixedLine( vcl::Window* pParent, const ResId& ); - virtual void ApplySettings(vcl::RenderContext&) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext&) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; }; // - FixedBitmap - @@ -142,13 +142,13 @@ private: public: explicit FixedBitmap( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void ApplySettings(vcl::RenderContext&) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext&) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void SetBitmap( const Bitmap& rBitmap ); using OutputDevice::GetBitmap; @@ -179,21 +179,21 @@ public: explicit FixedImage( vcl::Window* pParent, WinBits nStyle = 0 ); explicit FixedImage( vcl::Window* pParent, const ResId& ); - virtual void ApplySettings(vcl::RenderContext&) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext&) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual Size GetOptimalSize() const override; void SetImage( const Image& rImage ); const Image& GetImage() const { return maImage; } bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const { return maImage;} - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; static Image loadThemeImage(const OString &rFileName); }; diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 9accb2853344..98d4de7c00af 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -45,19 +45,19 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText Changes the pointer only over the text. */ - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; /** overwrites Window::MouseButtonUp(). Calls the set link if the mouse is over the text. */ - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; /** overwrites Window::RequestHelp(). Shows tooltip only if the mouse is over the text. */ - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; public: /** ctors @@ -70,21 +70,21 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText Changes the color of the text and shows a focus rectangle. */ - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; /** overwrites Window::LoseFocus(). Changes the color of the text and hides the focus rectangle. */ - virtual void LoseFocus() SAL_OVERRIDE; + virtual void LoseFocus() override; /** overwrites Window::KeyInput(). KEY_RETURN and KEY_SPACE calls the link handler. */ - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; /** sets m_aClickHdl with rLink. @@ -106,7 +106,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText const OUString& GetURL() const { return m_sURL;} /** sets new text and recalculates the text length. */ - virtual void SetText(const OUString& rNewDescription) SAL_OVERRIDE; + virtual void SetText(const OUString& rNewDescription) override; }; #endif diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 2ce1a6b2ec67..d999e650a46f 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -113,7 +113,7 @@ private: SAL_DLLPRIVATE void ImplCallPopupModeEnd(); DECL_DLLPRIVATE_LINK_TYPED( ImplEndPopupModeHdl, void*, void ); - virtual void setPosSizeOnContainee(Size aSize, Window &rBox) SAL_OVERRIDE; + virtual void setPosSizeOnContainee(Size aSize, Window &rBox) override; FloatingWindow (const FloatingWindow &) = delete; FloatingWindow & operator= (const FloatingWindow &) = delete; @@ -123,7 +123,7 @@ protected: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( vcl::Window* pReference, const Point& rPos, HitTest& rHitTest ); @@ -137,18 +137,18 @@ public: SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags nFlags = FloatWinPopupEndFlags::NONE, sal_uLong nFocusId = 0 ); SAL_DLLPRIVATE Rectangle& ImplGetItemEdgeClipRect(); SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } - virtual void doDeferredInit(WinBits nBits) SAL_OVERRIDE; + virtual void doDeferredInit(WinBits nBits) override; public: explicit FloatingWindow(vcl::Window* pParent, WinBits nStyle = WB_STDFLOATWIN); explicit FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~FloatingWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() 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 Notify( NotifyEvent& rNEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void PopupModeEnd(); diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index cacf2d3a6767..a781cf96d6d2 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -39,20 +39,20 @@ private: SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout = false ); - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; virtual const vcl::Font& - GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& - GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; public: explicit GroupBox( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; #endif // INCLUDED_VCL_GROUP_HXX diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx index df868f16fd59..8347e9d9baf7 100644 --- a/include/vcl/idle.hxx +++ b/include/vcl/idle.hxx @@ -32,15 +32,15 @@ public: Idle( const sal_Char *pDebugName = NULL ); Idle( const Idle& rIdle ); - virtual void Start() SAL_OVERRIDE; + virtual void Start() override; /// Make it possible to associate a callback with this idle handler /// of course, you can also sub-class and override 'Invoke' void SetIdleHdl( const Link<Idle *, void>& rLink ) { maIdleHdl = rLink; } const Link<Idle *, void>& GetIdleHdl() const { return maIdleHdl; } - virtual void Invoke() SAL_OVERRIDE; - virtual bool ReadyForSchedule( bool bTimer ) const SAL_OVERRIDE; - virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) const SAL_OVERRIDE; + virtual void Invoke() override; + virtual bool ReadyForSchedule( bool bTimer ) const override; + virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) const override; Idle& operator=( const Idle& rIdle ); }; diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index 6f7121f7a638..cdfd9498916f 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -41,11 +41,11 @@ public: void SetScaleMode( const ::sal_Int16 _nMode ); ::sal_Int16 GetScaleMode() const { return mnScaleMode; } - virtual void Resize() SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void Resize() override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; protected: void ImplDraw( OutputDevice& rDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize ) const; diff --git a/include/vcl/introwin.hxx b/include/vcl/introwin.hxx index 8576ecda3e81..e6a48ea6472e 100644 --- a/include/vcl/introwin.hxx +++ b/include/vcl/introwin.hxx @@ -32,7 +32,7 @@ private: public: IntroWindow(); virtual ~IntroWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 6ae3692fad15..994b1e87fdc1 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -40,7 +40,7 @@ public: m_bLayoutDirty = true; } - virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE; + virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) 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 SAL_OVERRIDE; + virtual sal_uInt16 getDefaultAccessibleRole() const override; public: //you don't want to override these - 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; + virtual Size GetOptimalSize() const override; + virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) override; + virtual void SetPosPixel(const Point& rAllocPos) override; + virtual void SetSizePixel(const Size& rAllocation) override; private: bool m_bLayoutDirty; }; @@ -85,14 +85,14 @@ public: { m_bHomogeneous = bHomogeneous; } - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; protected: - virtual sal_uInt16 getDefaultAccessibleRole() const SAL_OVERRIDE; + virtual sal_uInt16 getDefaultAccessibleRole() const override; void accumulateMaxes(const Size &rChildSize, Size &rSize) const; Size finalizeMaxes(const Size &rSize, sal_uInt16 nVisibleChildren) const; - virtual Size calculateRequisition() const SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual Size calculateRequisition() const override; + virtual void setAllocation(const Size &rAllocation) override; virtual long getPrimaryDimension(const Size &rSize) const = 0; virtual void setPrimaryDimension(Size &rSize, long) const = 0; @@ -113,31 +113,31 @@ public: m_bVerticalContainer = true; } protected: - virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE + virtual long getPrimaryDimension(const Size &rSize) const override { return rSize.getHeight(); } - virtual void setPrimaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE + virtual void setPrimaryDimension(Size &rSize, long nHeight) const override { rSize.setHeight(nHeight); } - virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE + virtual long getPrimaryCoordinate(const Point &rPos) const override { return rPos.getY(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const override { rPos.setY(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE + virtual long getSecondaryDimension(const Size &rSize) const override { return rSize.getWidth(); } - virtual void setSecondaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE + virtual void setSecondaryDimension(Size &rSize, long nWidth) const override { rSize.setWidth(nWidth); } - virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const override { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -152,31 +152,31 @@ public: m_bVerticalContainer = false; } protected: - virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE + virtual long getPrimaryDimension(const Size &rSize) const override { return rSize.getWidth(); } - virtual void setPrimaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE + virtual void setPrimaryDimension(Size &rSize, long nWidth) const override { rSize.setWidth(nWidth); } - virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE + virtual long getPrimaryCoordinate(const Point &rPos) const override { return rPos.getX(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const override { rPos.setX(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE + virtual long getSecondaryDimension(const Size &rSize) const override { return rSize.getHeight(); } - virtual void setSecondaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE + virtual void setSecondaryDimension(Size &rSize, long nHeight) const override { rSize.setHeight(nHeight); } - virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const override { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -204,11 +204,11 @@ public: { m_eLayoutStyle = eStyle; } - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; void sort_native_button_order(); protected: - virtual Size calculateRequisition() const SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual Size calculateRequisition() const override; + virtual void setAllocation(const Size &rAllocation) override; Size addSpacing(const Size &rSize, sal_uInt16 nVisibleChildren) const; private: VclButtonBoxStyle m_eLayoutStyle; @@ -232,31 +232,31 @@ public: m_bVerticalContainer = true; } protected: - virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE + virtual long getPrimaryDimension(const Size &rSize) const override { return rSize.getHeight(); } - virtual void setPrimaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE + virtual void setPrimaryDimension(Size &rSize, long nHeight) const override { rSize.setHeight(nHeight); } - virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE + virtual long getPrimaryCoordinate(const Point &rPos) const override { return rPos.getY(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const override { rPos.setY(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE + virtual long getSecondaryDimension(const Size &rSize) const override { return rSize.getWidth(); } - virtual void setSecondaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE + virtual void setSecondaryDimension(Size &rSize, long nWidth) const override { rSize.setWidth(nWidth); } - virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const override { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -271,31 +271,31 @@ public: m_bVerticalContainer = false; } protected: - virtual long getPrimaryDimension(const Size &rSize) const SAL_OVERRIDE + virtual long getPrimaryDimension(const Size &rSize) const override { return rSize.getWidth(); } - virtual void setPrimaryDimension(Size &rSize, long nWidth) const SAL_OVERRIDE + virtual void setPrimaryDimension(Size &rSize, long nWidth) const override { rSize.setWidth(nWidth); } - virtual long getPrimaryCoordinate(const Point &rPos) const SAL_OVERRIDE + virtual long getPrimaryCoordinate(const Point &rPos) const override { return rPos.getX(); } - virtual void setPrimaryCoordinate(Point &rPos, long nPos) const SAL_OVERRIDE + virtual void setPrimaryCoordinate(Point &rPos, long nPos) const override { rPos.setX(nPos); } - virtual long getSecondaryDimension(const Size &rSize) const SAL_OVERRIDE + virtual long getSecondaryDimension(const Size &rSize) const override { return rSize.getHeight(); } - virtual void setSecondaryDimension(Size &rSize, long nHeight) const SAL_OVERRIDE + virtual void setSecondaryDimension(Size &rSize, long nHeight) const override { rSize.setHeight(nHeight); } - virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const override { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -319,8 +319,8 @@ public: private: Size calculateRequisitionForSpacings(sal_Int32 nRowSpacing, sal_Int32 nColSpacing) const; - virtual Size calculateRequisition() const SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual Size calculateRequisition() const override; + virtual void setAllocation(const Size &rAllocation) override; public: VclGrid(vcl::Window *pParent) : VclContainer(pParent) @@ -360,7 +360,7 @@ public: { return m_nColumnSpacing; } - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; }; class VCL_DLLPUBLIC VclBin : public VclContainer @@ -372,8 +372,8 @@ public: } virtual vcl::Window *get_child(); virtual const vcl::Window *get_child() const; - virtual Size calculateRequisition() const SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual Size calculateRequisition() const override; + virtual void setAllocation(const Size &rAllocation) override; }; class VCL_DLLPUBLIC VclFrame : public VclBin @@ -391,17 +391,17 @@ public: { } virtual ~VclFrame(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void set_label(const OUString &rLabel); OUString get_label() const; - virtual vcl::Window *get_child() SAL_OVERRIDE; - virtual const vcl::Window *get_child() const SAL_OVERRIDE; + virtual vcl::Window *get_child() override; + virtual const vcl::Window *get_child() const override; vcl::Window *get_label_widget(); const vcl::Window *get_label_widget() const; protected: - virtual Size calculateRequisition() const SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; - virtual OUString getDefaultAccessibleName() const SAL_OVERRIDE; + virtual Size calculateRequisition() const override; + virtual void setAllocation(const Size &rAllocation) override; + virtual OUString getDefaultAccessibleName() const override; }; class VCL_DLLPUBLIC VclAlignment : public VclBin @@ -419,10 +419,10 @@ public: , m_fYScale(1.0) { } - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; protected: - virtual Size calculateRequisition() const SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual Size calculateRequisition() const override; + virtual void setAllocation(const Size &rAllocation) override; private: sal_Int32 m_nBottomPadding; sal_Int32 m_nLeftPadding; @@ -446,10 +446,10 @@ public: m_pDisclosureButton->Show(); } virtual ~VclExpander() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE; - virtual vcl::Window *get_child() SAL_OVERRIDE; - virtual const vcl::Window *get_child() const SAL_OVERRIDE; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual void dispose() override; + virtual vcl::Window *get_child() override; + virtual const vcl::Window *get_child() const override; + virtual bool set_property(const OString &rKey, const OString &rValue) override; bool get_expanded() const { return m_pDisclosureButton->IsChecked(); @@ -462,11 +462,11 @@ public: { m_pDisclosureButton->SetText(rLabel); } - virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE; + virtual void StateChanged(StateChangedType nType) override; void SetExpandedHdl( const Link<VclExpander&,void>& rLink ) { maExpandedHdl = rLink; } protected: - virtual Size calculateRequisition() const SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual Size calculateRequisition() const override; + virtual void setAllocation(const Size &rAllocation) override; private: bool m_bResizeTopLevel; VclPtr<DisclosureButton> m_pDisclosureButton; @@ -479,10 +479,10 @@ class VCL_DLLPUBLIC VclScrolledWindow : public VclBin public: VclScrolledWindow(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); virtual ~VclScrolledWindow() { disposeOnce(); } - virtual void dispose() SAL_OVERRIDE; - virtual vcl::Window *get_child() SAL_OVERRIDE; - virtual const vcl::Window *get_child() const SAL_OVERRIDE; - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual void dispose() override; + virtual vcl::Window *get_child() override; + virtual const vcl::Window *get_child() const override; + virtual bool set_property(const OString &rKey, const OString &rValue) override; ScrollBar& getVertScrollBar() { return *m_pVScroll; } ScrollBar& getHorzScrollBar() { return *m_pHScroll; } Size getVisibleChildSize() const; @@ -490,11 +490,11 @@ public: //to override it void setUserManagedScrolling(bool bUserManagedScrolling) { m_bUserManagedScrolling = bUserManagedScrolling;} protected: - virtual Size calculateRequisition() const SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual Size calculateRequisition() const override; + virtual void setAllocation(const Size &rAllocation) override; DECL_LINK_TYPED(ScrollBarHdl, ScrollBar*, void); void InitScrollBars(const Size &rRequest); - virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; + virtual bool Notify(NotifyEvent& rNEvt) override; private: bool m_bUserManagedScrolling; VclPtr<ScrollBar> m_pVScroll; @@ -510,7 +510,7 @@ public: { } protected: - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual void setAllocation(const Size &rAllocation) override; }; //Enforces that its children are always the same size as itself. @@ -535,7 +535,7 @@ private: SetPaintTransparent(true); SetBackground(); } - virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE + virtual void Command(const CommandEvent& rCEvt) override { GetParent()->Command(rCEvt); } @@ -543,7 +543,7 @@ private: VclPtr<EventBoxHelper> m_aEventBoxHelper; protected: - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual ~VclEventBox(); public: VclEventBox(vcl::Window* pParent) @@ -552,12 +552,12 @@ public: { m_aEventBoxHelper->Show(); } - virtual vcl::Window *get_child() SAL_OVERRIDE; - virtual const vcl::Window *get_child() const SAL_OVERRIDE; - virtual Size calculateRequisition() const SAL_OVERRIDE; - virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; + virtual vcl::Window *get_child() override; + virtual const vcl::Window *get_child() const override; + virtual Size calculateRequisition() const override; + virtual void setAllocation(const Size &rAllocation) override; - virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rCEvt) override; }; enum VclSizeGroupMode @@ -659,8 +659,8 @@ public: VclButtonsType eButtonsType = VCL_BUTTONS_OK, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; - virtual short Execute() SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; + virtual short Execute() override; ///Emitted when an action widget is clicked virtual void response(short nResponseId); OUString get_primary_text() const; @@ -668,7 +668,7 @@ public: void set_primary_text(const OUString &rPrimaryString); void set_secondary_text(const OUString &rSecondaryString); virtual ~MessageDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static void SetMessagesWidths(vcl::Window *pParent, VclMultiLineEdit *pPrimaryMessage, VclMultiLineEdit *pSecondaryMessage); diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index 2b746a8bcbce..b5dfe23ca569 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -239,7 +239,7 @@ namespace vcl class DeleteOnDeinit : public DeleteOnDeinitBase { T* m_pT; - virtual void doCleanup() SAL_OVERRIDE { delete m_pT; m_pT = NULL; } + virtual void doCleanup() override { delete m_pT; m_pT = NULL; } public: DeleteOnDeinit( T* i_pT ) : m_pT( i_pT ) { addDeinitContainer( this ); } virtual ~DeleteOnDeinit() {} @@ -272,7 +272,7 @@ namespace vcl class DeleteUnoReferenceOnDeinit : public vcl::DeleteOnDeinitBase { ::com::sun::star::uno::Reference<I> m_xI; - virtual void doCleanup() SAL_OVERRIDE { set(NULL); } + virtual void doCleanup() 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 2a00c995eedb..ad92f1a7c2be 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -51,8 +51,8 @@ protected: public: virtual ~LongCurrencyFormatter(); - virtual void Reformat() SAL_OVERRIDE; - virtual void ReformatAll() SAL_OVERRIDE; + virtual void Reformat() override; + virtual void ReformatAll() override; void SetUseThousandSep( bool b ); bool IsUseThousandSep() const { return mbThousandSep; } @@ -88,14 +88,14 @@ private: public: LongCurrencyField( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; - void Modify() SAL_OVERRIDE; - void Up() SAL_OVERRIDE; - void Down() SAL_OVERRIDE; - void First() SAL_OVERRIDE; - void Last() SAL_OVERRIDE; + void Modify() override; + void Up() override; + void Down() override; + void First() override; + void Last() override; void SetFirst(const BigInt& rNewFirst ) { mnFirst = rNewFirst; } BigInt GetFirst() const { return mnFirst; } @@ -114,11 +114,11 @@ class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormat public: LongCurrencyBox( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; - void Modify() SAL_OVERRIDE; - void ReformatAll() SAL_OVERRIDE; + void Modify() override; + void ReformatAll() override; }; #endif // INCLUDED_VCL_LONGCURR_HXX diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index acc824958acd..ec52b9d385a0 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -77,33 +77,33 @@ protected: protected: explicit ListBox( WindowType nType ); - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; public: explicit ListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); explicit ListBox( vcl::Window* pParent, const ResId& ); virtual ~ListBox(); - virtual void dispose() SAL_OVERRIDE; - - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags 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 dispose() override; + + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Select(); virtual void DoubleClick(); - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual vcl::Window* GetPreferredKeyInputWindow() override; - virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; + virtual const Wallpaper& GetDisplayBackground() const override; virtual void setPosSizePixel( long nX, long nY, - long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) SAL_OVERRIDE; - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE + long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override { Control::SetPosSizePixel( rNewPos, rNewSize ); } Rectangle GetDropDownPosSizePixel() const; @@ -198,7 +198,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 SAL_OVERRIDE; + virtual Size GetOptimalSize() const 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; @@ -233,7 +233,7 @@ public: void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; void EnableQuickSelection( const bool& b ); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index b61c4a87b96e..6acc9b3a5925 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -440,16 +440,16 @@ public: MenuBar& operator =( const MenuBar& rMenu ); - virtual bool IsMenuBar() const SAL_OVERRIDE { return true; } + virtual bool IsMenuBar() const override { return true; } /// Close the 'pStartedFrom' menu window. - virtual void ClosePopup(Menu* pMenu) SAL_OVERRIDE; + virtual void ClosePopup(Menu* pMenu) override; /// Deactivate the MenuBarWindow. - virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId) SAL_OVERRIDE; + virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId) override; /// Forward the KeyInput call to the MenuBar. - virtual void MenuBarKeyInput(const KeyEvent& rEvent) SAL_OVERRIDE; + virtual void MenuBarKeyInput(const KeyEvent& rEvent) override; void ShowCloseButton( bool bShow = true ); bool HasCloseButton() const { return mbCloseBtnVisible; } @@ -457,7 +457,7 @@ public: bool HasHideButton() const { return mbHideBtnVisible; } void ShowButtons( bool bClose, bool bFloat, bool bHide ); - virtual void SelectItem(sal_uInt16 nId) SAL_OVERRIDE; + virtual void SelectItem(sal_uInt16 nId) override; bool HandleMenuActivateEvent(Menu *pMenu) const; bool HandleMenuDeActivateEvent(Menu *pMenu) const; bool HandleMenuHighlightEvent(Menu *pMenu, sal_uInt16 nEventId) const; @@ -524,10 +524,10 @@ public: explicit PopupMenu( const ResId& ); virtual ~PopupMenu(); - virtual bool IsMenuBar() const SAL_OVERRIDE { return false; } + virtual bool IsMenuBar() const override { return false; } /// Close the 'pStartedFrom' menu window. - virtual void ClosePopup(Menu* pMenu) SAL_OVERRIDE; + virtual void ClosePopup(Menu* pMenu) override; void SetText( const OUString& rTitle ) { @@ -539,7 +539,7 @@ public: // Fuer das TestTool void EndExecute( sal_uInt16 nSelect = 0 ); - virtual void SelectItem(sal_uInt16 nId) SAL_OVERRIDE; + virtual void SelectItem(sal_uInt16 nId) override; void SetSelectedEntry( sal_uInt16 nId ); // for use by native submenu only static bool IsInExecute(); diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index d2672eb9bc47..ce97a9e92e9f 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -57,12 +57,12 @@ protected: public: explicit MenuButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~MenuButton(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() override; virtual void Select(); void ExecuteMenu(); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 84ac05cef8b7..71c7daf5c93e 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -102,15 +102,15 @@ public: protected: virtual ~MetaPixelAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaPixelAction( const Point& rPt, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetPoint() const { return maPt; } const Color& GetColor() const { return maColor; } @@ -126,15 +126,15 @@ public: protected: virtual ~MetaPointAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaPointAction( const Point& ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetPoint() const { return maPt; } }; @@ -152,17 +152,17 @@ public: protected: virtual ~MetaLineAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaLineAction( const Point& rStart, const Point& rEnd ); MetaLineAction( const Point& rStart, const Point& rEnd, const LineInfo& rLineInfo ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetStartPoint() const { return maStartPt; } const Point& GetEndPoint() const { return maEndPt; } @@ -180,15 +180,15 @@ public: protected: virtual ~MetaRectAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaRectAction( const Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Rectangle& GetRect() const { return maRect; } }; @@ -206,16 +206,16 @@ public: protected: virtual ~MetaRoundRectAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaRoundRectAction( const Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Rectangle& GetRect() const { return maRect; } sal_uInt32 GetHorzRound() const { return mnHorzRound; } @@ -233,15 +233,15 @@ public: protected: virtual ~MetaEllipseAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaEllipseAction( const Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Rectangle& GetRect() const { return maRect; } }; @@ -259,16 +259,16 @@ public: protected: virtual ~MetaArcAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaArcAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } @@ -288,16 +288,16 @@ public: protected: virtual ~MetaPieAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaPieAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } @@ -317,16 +317,16 @@ public: protected: virtual ~MetaChordAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaChordAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Rectangle& GetRect() const { return maRect; } const Point& GetStartPoint() const { return maStartPt; } @@ -345,16 +345,16 @@ public: protected: virtual ~MetaPolyLineAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaPolyLineAction( const tools::Polygon& ); explicit MetaPolyLineAction( const tools::Polygon&, const LineInfo& ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Polygon& GetPolygon() const { return maPoly; } const LineInfo& GetLineInfo() const { return maLineInfo; } @@ -371,15 +371,15 @@ public: protected: virtual ~MetaPolygonAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaPolygonAction( const tools::Polygon& ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const tools::Polygon& GetPolygon() const { return maPoly; } }; @@ -395,15 +395,15 @@ public: protected: virtual ~MetaPolyPolygonAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaPolyPolygonAction( const tools::PolyPolygon& ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } }; @@ -422,16 +422,16 @@ public: protected: virtual ~MetaTextAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaTextAction( const Point& rPt, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetPoint() const { return maPt; } const OUString& GetText() const { return maStr; } @@ -459,15 +459,15 @@ public: const long* pDXAry, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Execute( OutputDevice* pOut ) SAL_OVERRIDE; + virtual void Execute( OutputDevice* pOut ) override; - virtual MetaAction* Clone() SAL_OVERRIDE; + virtual MetaAction* Clone() override; - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; const Point& GetPoint() const { return maStartPt; } const OUString& GetText() const { return maStr; } @@ -491,17 +491,17 @@ public: protected: virtual ~MetaStretchTextAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetPoint() const { return maPt; } const OUString& GetText() const { return maStr; } @@ -523,16 +523,16 @@ public: protected: virtual ~MetaTextRectAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaTextRectAction( const Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Rectangle& GetRect() const { return maRect; } const OUString& GetText() const { return maStr; } @@ -554,17 +554,17 @@ public: protected: virtual ~MetaTextLineAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaTextLineAction( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Point& GetStartPoint() const { return maPos; } long GetWidth() const { return mnWidth; } @@ -585,15 +585,15 @@ public: protected: virtual ~MetaBmpAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaBmpAction( const Point& rPt, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } const Point& GetPoint() const { return maPt; } @@ -612,16 +612,16 @@ public: protected: virtual ~MetaBmpScaleAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaBmpScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } const Point& GetPoint() const { return maPt; } @@ -643,17 +643,17 @@ public: protected: virtual ~MetaBmpScalePartAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaBmpScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } const Point& GetDestPoint() const { return maDstPt; } @@ -674,15 +674,15 @@ public: protected: virtual ~MetaBmpExAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const BitmapEx& GetBitmapEx() const { return maBmpEx; } const Point& GetPoint() const { return maPt; } @@ -701,16 +701,16 @@ public: protected: virtual ~MetaBmpExScaleAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaBmpExScaleAction( const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx ) ; - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const BitmapEx& GetBitmapEx() const { return maBmpEx; } const Point& GetPoint() const { return maPt; } @@ -732,17 +732,17 @@ public: protected: virtual ~MetaBmpExScalePartAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaBmpExScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const BitmapEx& rBmpEx ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const BitmapEx& GetBitmapEx() const { return maBmpEx; } const Point& GetDestPoint() const { return maDstPt; } @@ -764,17 +764,17 @@ public: protected: virtual ~MetaMaskAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaMaskAction( const Point& rPt, const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } const Color& GetColor() const { return maColor; } @@ -795,17 +795,17 @@ public: protected: virtual ~MetaMaskScaleAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaMaskScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } const Color& GetColor() const { return maColor; } @@ -829,18 +829,18 @@ public: protected: virtual ~MetaMaskScalePartAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaMaskScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Bitmap& GetBitmap() const { return maBmp; } const Color& GetColor() const { return maColor; } @@ -862,15 +862,15 @@ public: protected: virtual ~MetaGradientAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Rectangle& GetRect() const { return maRect; } const Gradient& GetGradient() const { return maGradient; } @@ -888,15 +888,15 @@ public: protected: virtual ~MetaGradientExAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaGradientExAction( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } const Gradient& GetGradient() const { return maGradient; } @@ -914,15 +914,15 @@ public: protected: virtual ~MetaHatchAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaHatchAction( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } const Hatch& GetHatch() const { return maHatch; } @@ -940,16 +940,16 @@ public: protected: virtual ~MetaWallpaperAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaWallpaperAction( const Rectangle& rRect, const Wallpaper& rPaper ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Rectangle& GetRect() const { return maRect; } const Wallpaper& GetWallpaper() const { return maWallpaper; } @@ -967,15 +967,15 @@ public: protected: virtual ~MetaClipRegionAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaClipRegionAction( const vcl::Region& rRegion, bool bClip ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const vcl::Region& GetRegion() const { return maRegion; } bool IsClipping() const { return mbClip; } @@ -992,15 +992,15 @@ public: protected: virtual ~MetaISectRectClipRegionAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaISectRectClipRegionAction( const Rectangle& ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const Rectangle& GetRect() const { return maRect; } }; @@ -1016,15 +1016,15 @@ public: protected: virtual ~MetaISectRegionClipRegionAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaISectRegionClipRegionAction( const vcl::Region& ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const vcl::Region& GetRegion() const { return maRegion; } }; @@ -1041,14 +1041,14 @@ public: protected: virtual ~MetaMoveClipRegionAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaMoveClipRegionAction( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) override; long GetHorzMove() const { return mnHorzMove; } long GetVertMove() const { return mnVertMove; } @@ -1066,10 +1066,10 @@ public: protected: virtual ~MetaLineColorAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaLineColorAction( const Color& rColor, bool bSet ); @@ -1089,10 +1089,10 @@ public: protected: virtual ~MetaFillColorAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaFillColorAction( const Color& rColor, bool bSet ); @@ -1111,10 +1111,10 @@ public: protected: virtual ~MetaTextColorAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaTextColorAction( const Color& ); @@ -1133,10 +1133,10 @@ public: protected: virtual ~MetaTextFillColorAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaTextFillColorAction( const Color& rColor, bool bSet ); @@ -1156,10 +1156,10 @@ public: protected: virtual ~MetaTextLineColorAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaTextLineColorAction( const Color& rColor, bool bSet ); @@ -1179,10 +1179,10 @@ public: protected: virtual ~MetaOverlineColorAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaOverlineColorAction( const Color& rColor, bool bSet ); @@ -1201,10 +1201,10 @@ public: protected: virtual ~MetaTextAlignAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaTextAlignAction( TextAlign eAlign ); @@ -1222,14 +1222,14 @@ public: protected: virtual ~MetaMapModeAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaMapModeAction( const MapMode& ); - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) override; const MapMode& GetMapMode() const { return maMapMode; } }; @@ -1245,14 +1245,14 @@ public: protected: virtual ~MetaFontAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaFontAction( const vcl::Font& ); - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Scale( double fScaleX, double fScaleY ) override; const vcl::Font& GetFont() const { return maFont; } }; @@ -1268,10 +1268,10 @@ public: protected: virtual ~MetaPushAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaPushAction( PushFlags nFlags ); @@ -1286,10 +1286,10 @@ public: protected: virtual ~MetaPopAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; }; class VCL_DLLPUBLIC MetaRasterOpAction : public MetaAction @@ -1303,10 +1303,10 @@ public: protected: virtual ~MetaRasterOpAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaRasterOpAction( RasterOp eRasterOp ); @@ -1325,15 +1325,15 @@ public: protected: virtual ~MetaTransparentAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaTransparentAction( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const tools::PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } sal_uInt16 GetTransparence() const { return mnTransPercent; } @@ -1353,16 +1353,16 @@ public: protected: virtual ~MetaFloatTransparentAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const GDIMetaFile& GetGDIMetaFile() const { return maMtf; } const Point& GetPoint() const { return maPoint; } @@ -1384,16 +1384,16 @@ public: protected: virtual ~MetaEPSAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaEPSAction( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, const GDIMetaFile& rSubst ); - virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; const GfxLink& GetLink() const { return maGfxLink; } const GDIMetaFile& GetSubstitute() const { return maSubst; } @@ -1413,10 +1413,10 @@ public: protected: virtual ~MetaRefPointAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; MetaRefPointAction( const Point& rRefPoint, bool bSet ); @@ -1443,13 +1443,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 ) SAL_OVERRIDE; - virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; + virtual void Move( long nHorzMove, long nVertMove ) override; + virtual void Scale( double fScaleX, double fScaleY ) override; - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; const OString& GetComment() const { return maComment; } sal_Int32 GetValue() const { return mnValue; } @@ -1468,10 +1468,10 @@ public: protected: virtual ~MetaLayoutModeAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaLayoutModeAction( ComplexTextLayoutMode nLayoutMode ); @@ -1489,10 +1489,10 @@ public: protected: virtual ~MetaTextLanguageAction(); public: - 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; + virtual void Execute( OutputDevice* pOut ) override; + virtual MetaAction* Clone() override; + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) override; + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) override; explicit MetaTextLanguageAction( LanguageType ); diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index e03f9d4956de..bc627a4c559a 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -50,14 +50,14 @@ protected: public: explicit MoreButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~MoreButton(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - void Click() SAL_OVERRIDE; + void Click() override; using PushButton::SetState; - void SetText( const OUString& rNewText ) SAL_OVERRIDE; - OUString GetText() const SAL_OVERRIDE; + void SetText( const OUString& rNewText ) override; + OUString GetText() const override; }; #endif // INCLUDED_VCL_MOREBTN_HXX diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index 63eae2670470..5ac566f435d9 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -49,9 +49,9 @@ public: MessBox( vcl::Window* pParent, WinBits nStyle, const OUString& rTitle, const OUString& rMessage ); virtual ~MessBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; void SetMessText( const OUString& rText ) { maMessText = rText; } const OUString& GetMessText() const { return maMessText; } @@ -62,7 +62,7 @@ public: void SetCheckBoxState( bool bCheck ); bool GetCheckBoxState() const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; }; class VCL_DLLPUBLIC InfoBox : public MessBox diff --git a/include/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx index 987b58ff3aa3..927deb3a8ee7 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 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; + virtual int getPageCount() const override; + virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const override; + virtual void printPage( int i_nPage ) const override; }; } diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx index b20ba446c925..6b2e58dd5c40 100644 --- a/include/vcl/openglwin.hxx +++ b/include/vcl/openglwin.hxx @@ -35,18 +35,18 @@ class VCL_DLLPUBLIC OpenGLWindow : public vcl::Window public: OpenGLWindow(vcl::Window* pParent); virtual ~OpenGLWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; OpenGLContext& getContext(); void setRenderer(IRenderer* pRenderer); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) 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 Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; private: std::unique_ptr<OpenGLWindowImpl> mxImpl; diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index e0816d32f9e7..592c4239e7de 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -332,7 +332,7 @@ public: Dest( -1 ), Submit( false ), SubmitGet( false ) {} - virtual AnyWidget* Clone() const SAL_OVERRIDE + virtual AnyWidget* Clone() const override { return new PushButtonWidget( *this ); } @@ -349,7 +349,7 @@ public: ButtonIsLeft( true ) {} - virtual AnyWidget* Clone() const SAL_OVERRIDE + virtual AnyWidget* Clone() const override { return new CheckBoxWidget( *this ); } @@ -369,7 +369,7 @@ public: ButtonIsLeft( true ) {} - virtual AnyWidget* Clone() const SAL_OVERRIDE + virtual AnyWidget* Clone() const override { return new RadioButtonWidget( *this ); } @@ -398,7 +398,7 @@ public: MaxLen( 0 ) {} - virtual AnyWidget* Clone() const SAL_OVERRIDE + virtual AnyWidget* Clone() const override { return new EditWidget( *this ); } @@ -422,7 +422,7 @@ public: MultiSelect( false ) {} - virtual AnyWidget* Clone() const SAL_OVERRIDE + virtual AnyWidget* Clone() const override { return new ListBoxWidget( *this ); } @@ -440,7 +440,7 @@ public: Sort( false ) {} - virtual AnyWidget* Clone() const SAL_OVERRIDE + virtual AnyWidget* Clone() const override { return new ComboBoxWidget( *this ); } @@ -462,7 +462,7 @@ public: SigHidden( true ) {} - virtual AnyWidget* Clone() const SAL_OVERRIDE + virtual AnyWidget* Clone() const override { return new SignatureWidget( *this ); } diff --git a/include/vcl/popupmenuwindow.hxx b/include/vcl/popupmenuwindow.hxx index 13d699f69542..bcff61640767 100644 --- a/include/vcl/popupmenuwindow.hxx +++ b/include/vcl/popupmenuwindow.hxx @@ -30,7 +30,7 @@ private: public: PopupMenuFloatingWindow( vcl::Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) ); virtual ~PopupMenuFloatingWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; sal_uInt16 GetMenuStackLevel() const; void SetMenuStackLevel( sal_uInt16 nLevel ); diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 56cbbe627f62..13eac89d1686 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -74,11 +74,11 @@ private: public: ProgressBar( vcl::Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual Size GetOptimalSize() const override; void SetValue( sal_uInt16 nNewPercent ); }; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 9d5fafb5efb9..199d298a020b 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -244,43 +244,43 @@ public: SAL_DLLPRIVATE void ImplEndPage(); protected: - virtual bool AcquireGraphics() const SAL_OVERRIDE; - virtual void ReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; - virtual void ImplReleaseFonts() SAL_OVERRIDE; + virtual bool AcquireGraphics() const override; + virtual void ReleaseGraphics( bool bRelease = true ) override; + virtual void ImplReleaseFonts() override; - virtual long GetGradientStepCount( long nMinRect ) SAL_OVERRIDE; - virtual bool UsePolyPolygonForComplexGradient() SAL_OVERRIDE; - virtual void ClipAndDrawGradientMetafile ( const Gradient &rGradient, const tools::PolyPolygon &rPolyPoly ) SAL_OVERRIDE; + virtual long GetGradientStepCount( long nMinRect ) override; + virtual bool UsePolyPolygonForComplexGradient() override; + virtual void ClipAndDrawGradientMetafile ( const Gradient &rGradient, const tools::PolyPolygon &rPolyPoly ) override; - void ScaleBitmap ( Bitmap&, SalTwoRect& ) SAL_OVERRIDE { }; + void ScaleBitmap ( Bitmap&, SalTwoRect& ) override { }; public: void DrawGradientEx( OutputDevice* pOut, const Rectangle& rRect, const Gradient& rGradient ); - virtual Bitmap GetBitmap( const Point& rSrcPt, const Size& rSize ) const SAL_OVERRIDE; + virtual Bitmap GetBitmap( const Point& rSrcPt, const Size& rSize ) const override; protected: virtual void DrawDeviceMask ( const Bitmap& rMask, const Color& rMaskColor, const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPtPixel, const Size& rSrcSizePixel ) SAL_OVERRIDE; + const Point& rSrcPtPixel, const Size& rSrcSizePixel ) override; bool DrawTransformBitmapExDirect( const basegfx::B2DHomMatrix& aFullTransform, - const BitmapEx& rBitmapEx) SAL_OVERRIDE; + const BitmapEx& rBitmapEx) override; bool TransformAndReduceBitmapExToTargetRange( const basegfx::B2DHomMatrix& aFullTransform, basegfx::B2DRange &aVisibleRange, - double &fMaximumArea) SAL_OVERRIDE; + double &fMaximumArea) override; void DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, - BitmapEx& rBitmapEx ) SAL_OVERRIDE; + BitmapEx& rBitmapEx ) override; - virtual void EmulateDrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) SAL_OVERRIDE; + virtual void EmulateDrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) override; - virtual void InitFont() const SAL_OVERRIDE; - virtual void SetFontOrientation( ImplFontEntry* const pFontEntry ) const SAL_OVERRIDE; + virtual void InitFont() const override; + virtual void SetFontOrientation( ImplFontEntry* const pFontEntry ) const override; public: Printer(); @@ -288,7 +288,7 @@ public: Printer( const QueueInfo& rQueueInfo ); Printer( const OUString& rPrinterName ); virtual ~Printer(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static const std::vector< OUString >& GetPrinterQueues(); static const QueueInfo* GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate ); @@ -369,20 +369,20 @@ public: static void PrintJob( const std::shared_ptr<vcl::PrinterController>& i_pController, const JobSetup& i_rInitSetup ); - virtual bool HasMirroredGraphics() const SAL_OVERRIDE; + virtual bool HasMirroredGraphics() const override; virtual void DrawOutDev( const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPt, const Size& rSrcSize ) SAL_OVERRIDE; + const Point& rSrcPt, const Size& rSrcSize ) override; virtual void DrawOutDev( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPt, const Size& rSrcSize, - const OutputDevice& rOutDev ) SAL_OVERRIDE; + const OutputDevice& rOutDev ) override; virtual void CopyArea( const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize, - bool bWindowInvalidate = false ) SAL_OVERRIDE; + bool bWindowInvalidate = false ) override; - virtual void DrawImage( const Point&, const Image&, DrawImageFlags ) SAL_OVERRIDE; + virtual void DrawImage( const Point&, const Image&, DrawImageFlags ) override; virtual void DrawImage( const Point&, const Size&, - const Image&, DrawImageFlags ) SAL_OVERRIDE; + const Image&, DrawImageFlags ) override; // These 3 together are more modular PrintJob(), allowing printing more documents as one print job diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 292691ba79d2..9de3ae9aa78a 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -397,7 +397,7 @@ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue mnThumbState = ControlState::NONE; mnPage1State = ControlState::NONE; mnPage2State = ControlState::NONE; }; virtual ~ScrollbarValue(); - virtual ScrollbarValue* clone() const SAL_OVERRIDE; + virtual ScrollbarValue* clone() const override; }; class VCL_DLLPUBLIC SliderValue : public ImplControlValue @@ -414,7 +414,7 @@ class VCL_DLLPUBLIC SliderValue : public ImplControlValue , mnMin( 0 ), mnMax( 0 ), mnCur( 0 ), mnThumbState( ControlState::NONE ) {} virtual ~SliderValue(); - virtual SliderValue* clone() const SAL_OVERRIDE; + virtual SliderValue* clone() const override; }; /* TabitemValue: @@ -449,7 +449,7 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue { } virtual ~TabitemValue(); - virtual TabitemValue* clone() const SAL_OVERRIDE; + virtual TabitemValue* clone() const override; bool isLeftAligned() const { return bool(mnAlignment & TabitemFlags::LeftAligned); } bool isRightAligned() const { return bool(mnAlignment & TabitemFlags::RightAligned); } @@ -486,7 +486,7 @@ class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue } virtual ~SpinbuttonValue(); - virtual SpinbuttonValue* clone() const SAL_OVERRIDE; + virtual SpinbuttonValue* clone() const override; }; /* Toolbarvalue: @@ -499,7 +499,7 @@ public: ToolbarValue() : ImplControlValue( CTRL_TOOLBAR, BUTTONVALUE_DONTKNOW, 0 ) { mbIsTopDockingArea = false; } virtual ~ToolbarValue(); - virtual ToolbarValue* clone() const SAL_OVERRIDE; + virtual ToolbarValue* clone() const override; Rectangle maGripRect; bool mbIsTopDockingArea; // indicates that this is the top aligned dockingarea // adjacent to the menubar @@ -515,7 +515,7 @@ public: MenubarValue() : ImplControlValue( CTRL_MENUBAR, BUTTONVALUE_DONTKNOW, 0 ) { maTopDockingAreaHeight=0; } virtual ~MenubarValue(); - virtual MenubarValue* clone() const SAL_OVERRIDE; + virtual MenubarValue* clone() const override; int maTopDockingAreaHeight; }; @@ -534,7 +534,7 @@ public: , maItemRect( i_rItemRect ) {} virtual ~MenupopupValue(); - virtual MenupopupValue* clone() const SAL_OVERRIDE; + virtual MenupopupValue* clone() const override; Rectangle maItemRect; }; @@ -549,7 +549,7 @@ public: : ImplControlValue( CTRL_PUSHBUTTON, BUTTONVALUE_DONTKNOW, 0 ) , mbBevelButton( false ), mbSingleLine( true ) {} virtual ~PushButtonValue(); - virtual PushButtonValue* clone() const SAL_OVERRIDE; + virtual PushButtonValue* clone() const override; bool mbBevelButton:1; bool mbSingleLine:1; diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index f125740521bb..99b547baf1d8 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -90,20 +90,20 @@ private: public: explicit ScrollBar( vcl::Window* pParent, WinBits nStyle = WB_VERT ); virtual ~ScrollBar(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Tracking(const TrackingEvent& rTEvt) SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Draw(OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void 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; - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void dispose() override; + + virtual void MouseButtonDown(const MouseEvent& rMEvt) override; + virtual void Tracking(const TrackingEvent& rTEvt) override; + virtual void KeyInput(const KeyEvent& rKEvt) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Draw(OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags) override; + virtual void Resize() override; + virtual void StateChanged(StateChangedType nType) override; + virtual void DataChanged(const DataChangedEvent& rDCEvt) override; + virtual bool PreNotify(NotifyEvent& rNEvt) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; using Window::Scroll; void Scroll(); @@ -137,7 +137,7 @@ public: void SetEndScrollHdl( const Link<ScrollBar*,void>& rLink ) { maEndScrollHdl = rLink; } const Link<ScrollBar*,void>& GetEndScrollHdl() const { return maEndScrollHdl; } - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; }; @@ -150,13 +150,13 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: explicit ScrollBarBox( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; #endif // INCLUDED_VCL_SCRBAR_HXX diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index 9423936f60ae..320deb35d193 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -82,16 +82,16 @@ private: public: Slider( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); virtual ~Slider(); - virtual void dispose() SAL_OVERRIDE; - 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(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void dispose() override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Resize() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void Slide(); void EndSlide(); diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 944a23b04250..6f55421e7c00 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -59,16 +59,16 @@ public: void Up(); void Down(); - virtual void Resize() SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void 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; + virtual void Resize() override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; void SetRangeMin( long nNewRange ); long GetRangeMin() const { return mnMinRange; } @@ -79,7 +79,7 @@ public: long GetValue() const { return mnValue; } void SetValueStep( long nNewStep ) { mnValueStep = nNewStep; } long GetValueStep() const { return mnValueStep; } - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; private: // moves the focus to the upper or lower rect. Return sal_True if the focus rect actually changed. diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index d3787eccecf8..516ffeef32c9 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -58,19 +58,19 @@ private: protected: explicit SpinField( WindowType nTyp ); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; void EndDropDown(); - virtual void FillLayoutData() const SAL_OVERRIDE; + virtual void FillLayoutData() const override; Rectangle * ImplFindPartRect( const Point& rPt ); public: explicit SpinField( vcl::Window* pParent, WinBits nWinStyle = 0 ); explicit SpinField( vcl::Window* pParent, const ResId& ); virtual ~SpinField(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual bool ShowDropDown( bool bShow ); @@ -79,15 +79,15 @@ public: virtual void First(); virtual void Last(); - 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( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void SetUpHdl( const Link<>& rLink ) { maUpHdlLink = rLink; } void SetDownHdl( const Link<>& rLink ) { maDownHdlLink = rLink; } @@ -95,10 +95,10 @@ public: void SetFirstHdl( const Link<>& rLink ) { maFirstHdlLink = rLink; } void SetLastHdl( const Link<>& rLink ) { maLastHdlLink = rLink; } - 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; + virtual Size CalcMinimumSize() const override; + virtual Size CalcMinimumSizeForText(const OUString &rString) const override; + virtual Size GetOptimalSize() const override; + virtual Size CalcSize(sal_Int32 nChars) const override; }; #endif // INCLUDED_VCL_SPINFLD_HXX diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 7ef3eba0273d..f1e96a6651a7 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -63,24 +63,24 @@ protected: public: explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL ); virtual ~Splitter(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void StartSplit(); void EndSplit(); void Split(); virtual void Splitting( Point& rSplitPos ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rPaintRect ) SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rPaintRect ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void StartDrag(); diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 2e9066be7b89..7bbe0837f42e 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -125,7 +125,7 @@ private: public: SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SplitWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual void StartSplit(); virtual void Split(); @@ -134,16 +134,16 @@ public: virtual void FadeIn(); virtual void FadeOut(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void 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; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Move() override; + virtual void Resize() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; void InsertItem( sal_uInt16 nId, vcl::Window* pWindow, long nSize, sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nIntoSetId = 0, diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 33670651c0a6..571e8d05b50c 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -111,23 +111,23 @@ private: SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisiblePos() const; protected: - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: StatusBar( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER | WB_RIGHT ); virtual ~StatusBar(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void AdjustItemWidthsForHiDPI(bool bAdjustHiDPI); - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, 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 MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Move() override; + virtual void Resize() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void Click(); void DoubleClick(); @@ -187,7 +187,7 @@ public: void EndProgressMode(); bool IsProgressMode() const { return mbProgressMode; } - void SetText( const OUString& rText ) SAL_OVERRIDE; + void SetText( const OUString& rText ) override; Size CalcWindowSizePixel() const; diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx index ec72bf5ecb7c..a0f80ab7a85a 100644 --- a/include/vcl/syschild.hxx +++ b/include/vcl/syschild.hxx @@ -42,7 +42,7 @@ public: // create a SystemChildWindow using the given SystemWindowData explicit SystemChildWindow( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = true ); virtual ~SystemChildWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; const SystemEnvData* GetSystemData() const; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 1a8f3bd8f402..d31f68eb7561 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -186,19 +186,19 @@ protected: SAL_DLLPRIVATE void DoInitialLayout(); public: virtual ~SystemWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual bool Close(); virtual void TitleButtonClick( TitleButton nButton ); virtual void Pin(); virtual void Roll(); virtual void Resizing( Size& rSize ); - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE; + virtual void Resize() override; + virtual Size GetOptimalSize() const override; + virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; bool isLayoutEnabled() const; void setOptimalLayoutSize(); bool isCalculatingInitialLayoutSize() const { return mbIsCalculatingInitialLayoutSize; } @@ -240,8 +240,8 @@ public: TaskPaneList* GetTaskPaneList(); void GetWindowStateData( WindowStateData& rData ) const; - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; /** Returns the screen number the window is on diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 05d1053f4ed7..b69c8ad2cc3e 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -85,34 +85,34 @@ protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - virtual void FillLayoutData() const SAL_OVERRIDE; - virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; - virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; + virtual void FillLayoutData() const override; + virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const override; + virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); public: TabControl( vcl::Window* pParent, WinBits nStyle = WB_STDTABCONTROL ); virtual ~TabControl(); - virtual void dispose() SAL_OVERRIDE; - - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual 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 dispose() override; + + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual void ActivatePage(); virtual bool DeactivatePage(); - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; void SetTabPageSizePixel( const Size& rSize ); Size GetTabPageSizePixel() const; @@ -177,9 +177,9 @@ public: // returns the rectangle of the tab for page nPageId Rectangle GetTabBounds( sal_uInt16 nPageId ) const; - 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; + virtual void SetPosPixel(const Point& rPos) override; + virtual void SetSizePixel(const Size& rNewSize) override; + virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) override; Size calculateRequisition() const; void setAllocation(const Size &rAllocation); @@ -189,7 +189,7 @@ public: mbLayoutDirty = true; } - virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE; + virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; }; #endif // INCLUDED_VCL_TABCTRL_HXX diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index 8a1a94fc9bff..000358e747fa 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -42,9 +42,9 @@ public: WinBits nStyle = WB_STDTABDIALOG ); TabDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ); virtual ~TabDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; } vcl::Window* GetViewWindow() const { return mpViewWindow; } diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index 6a022f858dff..ff04ade6181c 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -42,13 +42,13 @@ public: explicit TabPage( vcl::Window* pParent, WinBits nStyle = 0 ); explicit TabPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~TabPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void ActivatePage(); virtual void DeactivatePage(); @@ -56,10 +56,10 @@ public: OString GetConfigId() const; //To-Do, consider inheriting from VclContainer - 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; + virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize) override; + virtual void SetPosPixel(const Point& rNewPos) override; + virtual void SetSizePixel(const Size& rNewSize) override; + virtual Size GetOptimalSize() const override; }; #endif // INCLUDED_VCL_TABPAGE_HXX diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 39b32cf3510b..65146d1dc410 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -84,12 +84,12 @@ protected: VirtualDevice* GetVirtualDevice(); // DragAndDropClient - 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; + virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; using DragAndDropClient::dragEnter; using DragAndDropClient::dragExit; diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 837d7d2e1136..88a4c7823d08 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() SAL_OVERRIDE + virtual long doIt() 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() SAL_OVERRIDE + virtual long doIt() override { try { m_func(); diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index 910bd54679bd..1701383529fc 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -48,7 +48,7 @@ public: public: Throbber(vcl::Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet = IMAGES_AUTO); virtual ~Throbber(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Properties void setStepTime( sal_Int32 nStepTime ) { mnStepTime = nStepTime; } @@ -71,7 +71,7 @@ public: protected: // Window overridables - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; private: SAL_DLLPRIVATE void initImages(); diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 220036b282a6..5976db92276f 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -30,9 +30,9 @@ protected: sal_uInt64 mnTimeout; bool mbAuto; - virtual void SetDeletionFlags() SAL_OVERRIDE; - virtual bool ReadyForSchedule( bool bTimer ) const SAL_OVERRIDE; - virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) const SAL_OVERRIDE; + virtual void SetDeletionFlags() override; + virtual bool ReadyForSchedule( bool bTimer ) const override; + virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) const override; public: Timer( const sal_Char *pDebugName = NULL ); @@ -44,10 +44,10 @@ public: const Link<Timer *, void>& GetTimeoutHdl() const { return maTimeoutHdl; } void SetTimeout( sal_uInt64 nTimeoutMs ); sal_uInt64 GetTimeout() const { return mnTimeout; } - virtual void Invoke() SAL_OVERRIDE; + virtual void Invoke() override; void Timeout() { Invoke(); } Timer& operator=( const Timer& rTimer ); - virtual void Start() SAL_OVERRIDE; + virtual void Start() override; }; /// An auto-timer is a multi-shot timer re-emitting itself at diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 5b08217e0a5d..dee1d9825ae6 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -268,7 +268,7 @@ public: SAL_DLLPRIVATE ImplToolBoxPrivateData* ImplGetToolBoxPrivateData() const { return mpData; } protected: - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; void SetCurItemId(sal_uInt16 nSet) { mnCurItemId = nSet; @@ -278,39 +278,39 @@ public: ToolBox( vcl::Window* pParent, WinBits nStyle = 0 ); ToolBox( vcl::Window* pParent, const ResId& rResId ); virtual ~ToolBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual void Click(); void DoubleClick(); - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; void Highlight(); virtual void Select(); - 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( vcl::RenderContext& rRenderContext, 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; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Move() override; + virtual void Resize() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + + virtual bool PrepareToggleFloatingMode() override; + virtual void ToggleFloatingMode() override; + virtual void StartDocking() override; + virtual bool Docking( const Point& rPos, Rectangle& rRect ) override; + virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) override; + virtual void Resizing( Size& rSize ) override; + virtual Size GetOptimalSize() const override; void InsertItem( const ResId& rResId, sal_uInt16 nPos = TOOLBOX_APPEND ); @@ -524,7 +524,7 @@ public: // accessibility helpers // gets the displayed text - OUString GetDisplayText() const SAL_OVERRIDE; + OUString GetDisplayText() const 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 fa76a484b9d4..43a6adc9a65d 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -72,9 +72,9 @@ public: const Color& GetColor() const { return maColor; } - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; - virtual TextAttrib* Clone() const SAL_OVERRIDE; - virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; + virtual void SetFont( vcl::Font& rFont ) const override; + virtual TextAttrib* Clone() const override; + virtual bool operator==( const TextAttrib& rAttr ) const override; }; @@ -88,9 +88,9 @@ public: TextAttribFontWeight( const TextAttribFontWeight& rAttr ); virtual ~TextAttribFontWeight(); - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; - virtual TextAttrib* Clone() const SAL_OVERRIDE; - virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; + virtual void SetFont( vcl::Font& rFont ) const override; + virtual TextAttrib* Clone() const override; + virtual bool operator==( const TextAttrib& rAttr ) const override; inline FontWeight getFontWeight() const { return meWeight; } }; @@ -108,9 +108,9 @@ public: virtual ~TextAttribHyperLink(); const OUString& GetURL() const { return maURL; } - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; - virtual TextAttrib* Clone() const SAL_OVERRIDE; - virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; + virtual void SetFont( vcl::Font& rFont ) const override; + virtual TextAttrib* Clone() const override; + virtual bool operator==( const TextAttrib& rAttr ) const override; }; class VCL_DLLPUBLIC TextAttribProtect : public TextAttrib @@ -120,9 +120,9 @@ public: TextAttribProtect( const TextAttribProtect& rAttr ); virtual ~TextAttribProtect(); - virtual void SetFont( vcl::Font& rFont ) const SAL_OVERRIDE; - virtual TextAttrib* Clone() const SAL_OVERRIDE; - virtual bool operator==( const TextAttrib& rAttr ) const SAL_OVERRIDE; + virtual void SetFont( vcl::Font& rFont ) const override; + virtual TextAttrib* Clone() const override; + virtual bool operator==( const TextAttrib& rAttr ) const override; }; diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx index 5563cfd0e9ec..0fd4d2574f55 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) SAL_OVERRIDE; - void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } - void SAL_CALL release() throw() SAL_OVERRIDE { 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) override; + void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } + void SAL_CALL release() throw() 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) 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; + ::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) override; + ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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 5b1ec57dc666..90ddc3a685d0 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -44,10 +44,10 @@ private: protected: DECL_LINK_TYPED( ImpUpdateDataHdl, Timer*, void ); - 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; + void StateChanged( StateChangedType nType ) override; + void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; using Control::ImplInitSettings; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); static WinBits ImplInitStyle( WinBits nStyle ); @@ -56,51 +56,51 @@ protected: ExtTextView* GetTextView() const; ScrollBar* GetVScrollBar() const; - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: VclMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); virtual ~VclMultiLineEdit(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SelectionChanged(); void CaretChanged(); - virtual void Modify() SAL_OVERRIDE; - virtual void UpdateData() SAL_OVERRIDE; + virtual void Modify() override; + virtual void UpdateData() override; - virtual void SetModifyFlag() SAL_OVERRIDE; - virtual void ClearModifyFlag() SAL_OVERRIDE; - virtual bool IsModified() const SAL_OVERRIDE; + virtual void SetModifyFlag() override; + virtual void ClearModifyFlag() override; + virtual bool IsModified() const override; - virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ) SAL_OVERRIDE; - virtual void DisableUpdateData() SAL_OVERRIDE { delete pUpdateDataTimer; pUpdateDataTimer = NULL; } + virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ) override; + virtual void DisableUpdateData() override { delete pUpdateDataTimer; pUpdateDataTimer = NULL; } - virtual void SetReadOnly( bool bReadOnly = true ) SAL_OVERRIDE; - virtual bool IsReadOnly() const SAL_OVERRIDE; + virtual void SetReadOnly( bool bReadOnly = true ) override; + virtual bool IsReadOnly() const override; void EnableFocusSelectionHide( bool bHide ); - virtual void SetMaxTextLen(sal_Int32 nMaxLen = 0) SAL_OVERRIDE; - virtual sal_Int32 GetMaxTextLen() const SAL_OVERRIDE; + virtual void SetMaxTextLen(sal_Int32 nMaxLen = 0) override; + virtual sal_Int32 GetMaxTextLen() const override; void SetMaxTextWidth( sal_uLong nMaxWidth ); - virtual void SetSelection( const Selection& rSelection ) SAL_OVERRIDE; - virtual const Selection& GetSelection() const SAL_OVERRIDE; + virtual void SetSelection( const Selection& rSelection ) override; + virtual const Selection& GetSelection() const override; - virtual void ReplaceSelected( const OUString& rStr ) SAL_OVERRIDE; - virtual void DeleteSelected() SAL_OVERRIDE; - virtual OUString GetSelected() const SAL_OVERRIDE; + virtual void ReplaceSelected( const OUString& rStr ) override; + virtual void DeleteSelected() override; + virtual OUString GetSelected() const override; OUString GetSelected( LineEnd aSeparator ) const; - virtual void Cut() SAL_OVERRIDE; - virtual void Copy() SAL_OVERRIDE; - virtual void Paste() SAL_OVERRIDE; + virtual void Cut() override; + virtual void Copy() override; + virtual void Paste() override; - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) SAL_OVERRIDE + virtual void SetText( const OUString& rStr ) override; + virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) override { SetText( rStr ); SetSelection( rNewSelection ); } - OUString GetText() const SAL_OVERRIDE; + OUString GetText() const 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 ) SAL_OVERRIDE { aModifyHdlLink = rLink; } - const Link<>& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; } + void SetModifyHdl( const Link<>& rLink ) override { aModifyHdlLink = rLink; } + const Link<>& GetModifyHdl() const override { return aModifyHdlLink; } - void SetUpdateDataHdl( const Link<>& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; } + void SetUpdateDataHdl( const Link<>& rLink ) override { aUpdateDataHdlLink = rLink; } - virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void Resize() override; + virtual void GetFocus() override; - virtual Size CalcMinimumSize() const SAL_OVERRIDE; + virtual Size CalcMinimumSize() const 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, DrawFlags nFlags ) SAL_OVERRIDE; + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) 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) SAL_OVERRIDE; + virtual bool set_property(const OString &rKey, const OString &rValue) override; }; #endif // INCLUDED_VCL_VCLMEDIT_HXX diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index e2e555933f49..75748b47a67d 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -66,8 +66,8 @@ private: { return ((meRefDevMode & REFDEV_FORCE_ZERO_EXTLEAD) != 0); } protected: - virtual bool AcquireGraphics() const SAL_OVERRIDE; - virtual void ReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; + virtual bool AcquireGraphics() const override; + virtual void ReleaseGraphics( bool bRelease = true ) override; public: @@ -118,9 +118,9 @@ public: sal_uInt16 nBitCount); virtual ~VirtualDevice(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void EnableRTL( bool bEnable = true ) SAL_OVERRIDE; + virtual void EnableRTL( bool bEnable = true ) override; bool SetOutputSizePixel( const Size& rNewSize, bool bErase = true ); bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, @@ -146,15 +146,15 @@ public: void SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); - virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetBitCount() const override; private: SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); protected: - virtual bool UsePolyPolygonForComplexGradient() SAL_OVERRIDE; + virtual bool UsePolyPolygonForComplexGradient() override; - virtual long GetFontExtLeading() const SAL_OVERRIDE; + virtual long GetFontExtLeading() const override; }; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 341f1c5d7c00..308760b3b357 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -624,7 +624,7 @@ public: protected: /** This is intended to be used to clear any locally held references to other Window-subclass objects */ - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); @@ -789,7 +789,7 @@ private: ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const; public: - virtual vcl::Region GetActiveClipRegion() const SAL_OVERRIDE; + virtual vcl::Region GetActiveClipRegion() const override; protected: // Single argument ctors shall be explicit. @@ -800,27 +800,27 @@ protected: void CallEventListeners( sal_uLong nEvent, void* pData = NULL ); static void FireVclEvent( VclSimpleEvent& rEvent ); - virtual bool AcquireGraphics() const SAL_OVERRIDE; - virtual void ReleaseGraphics( bool bRelease = true ) SAL_OVERRIDE; + virtual bool AcquireGraphics() const override; + virtual void ReleaseGraphics( bool bRelease = true ) override; - virtual void InitClipRegion() SAL_OVERRIDE; + virtual void InitClipRegion() override; // FIXME: this is a hack to workaround missing layout functionality SAL_DLLPRIVATE void ImplAdjustNWFSizes(); - virtual void CopyDeviceArea( SalTwoRect& aPosAry, bool bWindowInvalidate = false) SAL_OVERRIDE; - virtual void ClipToPaintRegion( Rectangle& rDstRect ) SAL_OVERRIDE; - virtual bool UsePolyPolygonForComplexGradient() SAL_OVERRIDE; + virtual void CopyDeviceArea( SalTwoRect& aPosAry, bool bWindowInvalidate = false) override; + virtual void ClipToPaintRegion( Rectangle& rDstRect ) override; + virtual bool UsePolyPolygonForComplexGradient() override; virtual void DrawGradientWallpaper(long nX, long nY, long nWidth, long nHeight, - const Wallpaper& rWallpaper) SAL_OVERRIDE + const Wallpaper& rWallpaper) override { OutputDevice::DrawGradientWallpaper(nX, nY, nWidth, nHeight, rWallpaper); } virtual void ApplySettings(vcl::RenderContext& rRenderContext); public: - bool HasMirroredGraphics() const SAL_OVERRIDE; + bool HasMirroredGraphics() const override; public: // Single argument ctors shall be explicit. @@ -832,7 +832,7 @@ public: ::OutputDevice const* GetOutDev() const; ::OutputDevice* GetOutDev(); - virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; + virtual void EnableRTL ( bool bEnable = true ) override; virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); @@ -843,12 +843,12 @@ public: virtual void PostPaint(vcl::RenderContext& rRenderContext); void Erase(vcl::RenderContext& rRenderContext); - virtual void Erase() SAL_OVERRIDE + virtual void Erase() override { OutputDevice::Erase(); } - virtual void Erase(const Rectangle& rRect) SAL_OVERRIDE + virtual void Erase(const Rectangle& rRect) override { OutputDevice::Erase(rRect); } @@ -956,7 +956,7 @@ public: void SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical = false ); using ::OutputDevice::SetSettings; - virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE; + virtual void SetSettings( const AllSettings& rSettings ) override; void SetSettings( const AllSettings& rSettings, 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 0a8b3cd1249a..0165d32c0d13 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -75,9 +75,9 @@ public: explicit WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version virtual ~WorkWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; void ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScreen ); |