From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- vcl/source/app/session.cxx | 12 +++---- vcl/source/app/svmain.cxx | 4 +-- vcl/source/bitmap/bitmapscalesuper.cxx | 2 +- vcl/source/components/dtranscomp.cxx | 56 ++++++++++++++++---------------- vcl/source/components/fontident.cxx | 10 +++--- vcl/source/edit/textdat2.hxx | 14 ++++---- vcl/source/edit/textund2.hxx | 38 +++++++++++----------- vcl/source/edit/textundo.hxx | 10 +++--- vcl/source/edit/textview.cxx | 12 +++---- vcl/source/edit/vclmedit.cxx | 22 ++++++------- vcl/source/filter/graphicfilter.cxx | 6 ++-- vcl/source/filter/sgvmain.hxx | 14 ++++---- vcl/source/gdi/pdfwriter_impl.cxx | 12 +++---- vcl/source/gdi/pdfwriter_impl2.cxx | 2 +- vcl/source/gdi/textlayout.cxx | 10 +++--- vcl/source/helper/canvastools.cxx | 22 ++++++------- vcl/source/uipreviewer/previewer.cxx | 4 +-- vcl/source/window/dockmgr.cxx | 40 +++++++++++------------ vcl/source/window/dockwin.cxx | 20 ++++++------ vcl/source/window/menubarwindow.hxx | 30 ++++++++--------- vcl/source/window/menufloatingwindow.hxx | 26 +++++++-------- vcl/source/window/scrwnd.hxx | 8 ++--- vcl/source/window/winproc.cxx | 6 ++-- 23 files changed, 190 insertions(+), 190 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 761224663a99..3bf8f0e582c5 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -75,12 +75,12 @@ class VCLSession: virtual ~VCLSession() {} - virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException, std::exception ) override; void callSaveRequested( bool bShutdown, bool bCancelable ); void callShutdownCancelled(); diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index c30c36ec5039..d2fe69a171ee 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -221,7 +221,7 @@ public: // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext; @@ -314,7 +314,7 @@ namespace */ class VCLUnoWrapperDeleter : public cppu::WeakImplHelper { - virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) override; }; void diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx b/vcl/source/bitmap/bitmapscalesuper.cxx index d48db93c1b86..c0b53be8b124 100644 --- a/vcl/source/bitmap/bitmapscalesuper.cxx +++ b/vcl/source/bitmap/bitmapscalesuper.cxx @@ -91,7 +91,7 @@ class ScaleTask : public comphelper::ThreadTask public: explicit ScaleTask( ScaleRangeFn pFn ) : mpFn( pFn ) {} void push( ScaleRangeContext &aRC ) { maStrips.push_back( aRC ); } - virtual void doWork() SAL_OVERRIDE + virtual void doWork() override { std::vector< ScaleRangeContext >::iterator it; for (it = maStrips.begin(); it != maStrips.end(); ++it) diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 312ffa221c36..bbe623aee352 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -74,9 +74,9 @@ public: * XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override; static OUString getImplementationName_static(); static Sequence< OUString > getSupportedServiceNames_static(); @@ -86,33 +86,33 @@ public: */ virtual Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; virtual void SAL_CALL setContents( const Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; virtual OUString SAL_CALL getName() - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; /* * XClipboardEx */ virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; /* * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; virtual void SAL_CALL removeClipboardListener( const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; }; GenericClipboard::~GenericClipboard() @@ -215,8 +215,8 @@ public: /* * XSingleServiceFactory */ - virtual Reference< XInterface > SAL_CALL createInstance() throw(std::exception) SAL_OVERRIDE; - virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception) SAL_OVERRIDE; + virtual Reference< XInterface > SAL_CALL createInstance() throw(std::exception) override; + virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception) override; }; ClipboardFactory::ClipboardFactory() : @@ -277,28 +277,28 @@ public: virtual ~GenericDragSource(); // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) override; + virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) override; virtual void SAL_CALL startDrag( const datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, const Reference< datatransfer::XTransferable >& transferable, const Reference< datatransfer::dnd::XDragSourceListener >& listener - ) throw(std::exception) SAL_OVERRIDE; + ) throw(std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getImplementationName_static(); } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, ServiceName); } css::uno::Sequence SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getSupportedServiceNames_static(); } static Sequence< OUString > getSupportedServiceNames_static() @@ -399,26 +399,26 @@ public: virtual ~GenericDropTarget(); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ) override; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isActive() throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception) SAL_OVERRIDE; - virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; + virtual void SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override; + virtual sal_Bool SAL_CALL isActive() throw(std::exception) override; + virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception) override; + virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception) override; + virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getImplementationName_static(); } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, ServiceName); } css::uno::Sequence SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getSupportedServiceNames_static(); } static Sequence< OUString > getSupportedServiceNames_static() diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index a7e6f3672724..d80dd74f59fa 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -53,15 +53,15 @@ FontIdentificator() {} virtual ~FontIdentificator(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException, std::exception) override; // XMaterialHolder - virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) override; }; diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index 4ae76d289256..ff36df78431f 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -229,17 +229,17 @@ private: public: TextSelFunctionSet( TextView* pView ); - virtual void BeginDrag() SAL_OVERRIDE; + virtual void BeginDrag() override; - virtual void CreateAnchor() SAL_OVERRIDE; + virtual void CreateAnchor() override; - virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) SAL_OVERRIDE; + virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) override; - virtual bool IsSelectionAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; - virtual void DeselectAll() SAL_OVERRIDE; + virtual bool IsSelectionAtPoint( const Point& rPointPixel ) override; + virtual void DeselectAll() override; - virtual void DeselectAtPoint( const Point& ) SAL_OVERRIDE; - virtual void DestroyAnchor() SAL_OVERRIDE; + virtual void DeselectAtPoint( const Point& ) override; + virtual void DestroyAnchor() override; }; class IdleFormatter : public Idle diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index 3b8a10465589..1fc7cfeab2f8 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -34,10 +34,10 @@ public: TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uInt32 nPara ); virtual ~TextUndoDelPara(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual OUString GetComment () const SAL_OVERRIDE; + virtual OUString GetComment () const override; }; class TextUndoConnectParas : public TextUndo @@ -51,10 +51,10 @@ public: TextUndoConnectParas( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nSepPos ); virtual ~TextUndoConnectParas(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual OUString GetComment () const SAL_OVERRIDE; + virtual OUString GetComment () const override; }; class TextUndoSplitPara : public TextUndo @@ -68,10 +68,10 @@ public: TextUndoSplitPara( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nSepPos ); virtual ~TextUndoSplitPara(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual OUString GetComment () const SAL_OVERRIDE; + virtual OUString GetComment () const override; }; class TextUndoInsertChars : public TextUndo @@ -84,12 +84,12 @@ public: TYPEINFO_OVERRIDE(); TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; + virtual bool Merge( SfxUndoAction *pNextAction ) override; - virtual OUString GetComment () const SAL_OVERRIDE; + virtual OUString GetComment () const override; }; class TextUndoRemoveChars : public TextUndo @@ -102,10 +102,10 @@ public: TYPEINFO_OVERRIDE(); TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual OUString GetComment () const SAL_OVERRIDE; + virtual OUString GetComment () const override; }; class TextUndoSetAttribs: public TextUndo @@ -118,10 +118,10 @@ public: TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel ); virtual ~TextUndoSetAttribs(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual OUString GetComment () const SAL_OVERRIDE; + virtual OUString GetComment () const override; }; #endif // INCLUDED_VCL_SOURCE_EDIT_TEXTUND2_HXX diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx index d51465eee90f..1adb531b044d 100644 --- a/vcl/source/edit/textundo.hxx +++ b/vcl/source/edit/textundo.hxx @@ -44,9 +44,9 @@ public: virtual ~TextUndoManager(); using SfxUndoManager::Undo; - virtual bool Undo() SAL_OVERRIDE; + virtual bool Undo() override; using SfxUndoManager::Redo; - virtual bool Redo() SAL_OVERRIDE; + virtual bool Redo() override; }; @@ -70,10 +70,10 @@ public: TextEngine* GetTextEngine() const { return mpTextEngine; } - virtual void Undo() SAL_OVERRIDE = 0; - virtual void Redo() SAL_OVERRIDE = 0; + virtual void Undo() override = 0; + virtual void Redo() override = 0; - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; }; #endif // INCLUDED_VCL_SOURCE_EDIT_TEXTUNDO_HXX diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index e6340ff84021..eef662d8139a 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -76,14 +76,14 @@ public: SvMemoryStream& GetHTMLStream() { return maHTMLStream; } // ::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; }; TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText ) diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index d2fc593594dd..af4eef1a9244 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -48,23 +48,23 @@ private: public: explicit TextWindow( vcl::Window* pParent ); virtual ~TextWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; ExtTextEngine* GetTextEngine() const { return mpExtTextEngine; } ExtTextView* GetTextView() const { return mpExtTextView; } - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvent ) override; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Resize() override; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() override; void SetAutoFocusHide( bool bAutoHide ) { mbFocusSelectionHide = bAutoHide; } @@ -88,7 +88,7 @@ private: mutable Selection maSelection; protected: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void ImpUpdateSrollBarVis( WinBits nWinStyle ); void ImpInitScrollBars(); void ImpSetScrollBarRanges(); diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index e54a1714b6b8..73807d4e9306 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -95,12 +95,12 @@ protected: SvStream& mrStm; virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& rData ) - throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override { mrStm.Write( rData.getConstArray(), rData.getLength() ); } virtual void SAL_CALL flush() - throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override { mrStm.Flush(); } - virtual void SAL_CALL closeOutput() throw(std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL closeOutput() throw(std::exception) override {} public: diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 22ba5aa2f199..9ff404016a5e 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -168,7 +168,7 @@ public: PointType Pos1; // start point PointType Pos2; // end point friend SvStream& ReadStrkType(SvStream& rIStream, StrkType& rStrk); - virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; + virtual void Draw(OutputDevice& rOut) override; }; #define RectSize 52 @@ -184,7 +184,7 @@ public: sal_uInt16 RotationAngle; // 315...<45 sal_uInt16 Slant; // >270...<90 friend SvStream& ReadRectType(SvStream& rIStream, RectType& rRect); - virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; + virtual void Draw(OutputDevice& rOut) override; }; #define PolySize 44 @@ -199,7 +199,7 @@ public: sal_uInt32 SD_EckP; // pointer to corner point (StarDraw) PointType* EckP; // pointer to corner points (StarView (is not read from disk!)) friend SvStream& ReadPolyType(SvStream& rIStream, PolyType& rPoly); - virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; + virtual void Draw(OutputDevice& rOut) override; }; #define PolyClosBit 0x01 // kinds of Poly: 0: polyLine 1: polygon @@ -215,7 +215,7 @@ public: sal_uInt32 SD_EckP; // pointer to corner points (StarDraw) PointType* EckP; // pointer to corner points (StarView (is not read from disk!)) friend SvStream& ReadSplnType(SvStream& rIStream, SplnType& rSpln); - virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; + virtual void Draw(OutputDevice& rOut) override; }; // kinds of Spline: see Poly @@ -232,7 +232,7 @@ public: sal_uInt16 StartAngle; // and not for full circles sal_uInt16 RelAngle; // and full ellipses friend SvStream& ReadCircType(SvStream& rIStream, CircType& rCirc); - virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; + virtual void Draw(OutputDevice& rOut) override; }; #define CircFull 0x00 /* kinds of circle: 0: full circle */ #define CircSect 0x01 /* 1: circle sector */ @@ -257,7 +257,7 @@ public: sal_Int16 FitBreit; // width to format for Fit2Size UCHAR* Buffer; // this variable is not set by reading from disk, but explicit! friend SvStream& ReadTextType(SvStream& rIStream, TextType& rText); - virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; + virtual void Draw(OutputDevice& rOut) override; }; #define TextOutlBit 0x01 /* 1=Sourcecode for outliner (ignored byDrawObjekt()) */ #define TextFitSBit 0x02 /* Bit1: 1=Text-Fit2Size, also outliner (2.0) */ @@ -302,7 +302,7 @@ public: } friend SvStream& ReadBmapType(SvStream& rIStream, BmapType& rBmap); - virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; + virtual void Draw(OutputDevice& rOut) override; }; #define GrupSize 48 diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index dfdbae345636..fd02ded97be3 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2249,9 +2249,9 @@ public: explicit ImplPdfBuiltinFontData( const PDFWriterImpl::BuiltinFont& ); const PDFWriterImpl::BuiltinFont& GetBuiltinFont() const { return mrBuiltin; } - virtual PhysicalFontFace* Clone() const SAL_OVERRIDE { return new ImplPdfBuiltinFontData(*this); } - virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE; - virtual sal_IntPtr GetFontId() const SAL_OVERRIDE { return reinterpret_cast(&mrBuiltin); } + virtual PhysicalFontFace* Clone() const override { return new ImplPdfBuiltinFontData(*this); } + virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const override; + virtual sal_IntPtr GetFontId() const override { return reinterpret_cast(&mrBuiltin); } }; inline const ImplPdfBuiltinFontData* GetPdfFontData( const PhysicalFontFace* pFontData ) @@ -8246,9 +8246,9 @@ class PDFStreamIf : explicit PDFStreamIf( PDFWriterImpl* pWriter ) : m_pWriter( pWriter ), m_bWrite( true ) {} virtual ~PDFStreamIf(); - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush() throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) override; + virtual void SAL_CALL flush() throw(std::exception) override; + virtual void SAL_CALL closeOutput() throw(std::exception) override; }; } diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 3dd7441dee52..836c5d4a20c1 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1105,7 +1105,7 @@ public: } // XMaterialHolder - virtual uno::Any SAL_CALL getMaterial() throw(std::exception) SAL_OVERRIDE + virtual uno::Any SAL_CALL getMaterial() throw(std::exception) override { return uno::makeAny( sal_Int64(maID) ); } diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 25963d5bc948..0f03e6723b45 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -79,11 +79,11 @@ namespace vcl virtual ~ReferenceDeviceTextLayout(); // ITextLayout - virtual long GetTextWidth( const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) const SAL_OVERRIDE; - virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector* _pVector, OUString* _pDisplayText ) SAL_OVERRIDE; - virtual bool GetCaretPositions( const OUString& _rText, long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const SAL_OVERRIDE; - virtual sal_Int32 GetTextBreak(const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength) const SAL_OVERRIDE; - virtual bool DecomposeTextRectAction() const SAL_OVERRIDE; + virtual long GetTextWidth( const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) const override; + virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector* _pVector, OUString* _pDisplayText ) override; + virtual bool GetCaretPositions( const OUString& _rText, long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const override; + virtual sal_Int32 GetTextBreak(const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength) const override; + virtual bool DecomposeTextRectAction() const override; public: // equivalents to the respective OutputDevice methods, which take the reference device into account diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 4c8ee6674727..f632b16900b1 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -422,25 +422,25 @@ namespace vcl private: uno::Sequence< sal_Int8 > m_aComponentTags; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override { return m_aComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::RuntimeException, std::exception) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -448,7 +448,7 @@ namespace vcl convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -465,7 +465,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -482,7 +482,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -499,7 +499,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -516,7 +516,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -533,7 +533,7 @@ namespace vcl } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); diff --git a/vcl/source/uipreviewer/previewer.cxx b/vcl/source/uipreviewer/previewer.cxx index de041495b92c..0650e425598e 100644 --- a/vcl/source/uipreviewer/previewer.cxx +++ b/vcl/source/uipreviewer/previewer.cxx @@ -23,8 +23,8 @@ class UIPreviewApp : public Application { public: - virtual void Init() SAL_OVERRIDE; - virtual int Main() SAL_OVERRIDE; + virtual void Init() override; + virtual int Main() override; }; using namespace com::sun::star; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 4eba0364c448..05a08f599ca7 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -57,16 +57,16 @@ public: ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ); virtual ~ImplDockFloatWin2(); - virtual void dispose() SAL_OVERRIDE; - - virtual void Move() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void TitleButtonClick( TitleButton nButton ) SAL_OVERRIDE; - virtual void Pin() SAL_OVERRIDE; - virtual void Roll() SAL_OVERRIDE; - virtual void PopupModeEnd() SAL_OVERRIDE; - virtual void Resizing( Size& rSize ) SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void dispose() override; + + virtual void Move() override; + virtual void Resize() override; + virtual void TitleButtonClick( TitleButton nButton ) override; + virtual void Pin() override; + virtual void Roll() override; + virtual void PopupModeEnd() override; + virtual void Resizing( Size& rSize ) override; + virtual bool Close() override; }; ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, @@ -479,16 +479,16 @@ private: public: ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ); virtual ~ImplPopupFloatWin(); - virtual void dispose() SAL_OVERRIDE; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual void dispose() override; + + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual void Resize() override; + virtual vcl::Window* GetPreferredKeyInputWindow() override; Rectangle GetDragRect() const; Point GetToolboxPosition() const; diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index eba4cf2e2f21..083fd0e9a4bf 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -73,16 +73,16 @@ public: ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ); virtual ~ImplDockFloatWin(); - virtual void dispose() SAL_OVERRIDE; - - virtual void Move() SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void TitleButtonClick( TitleButton nButton ) SAL_OVERRIDE; - virtual void Pin() SAL_OVERRIDE; - virtual void Roll() SAL_OVERRIDE; - virtual void PopupModeEnd() SAL_OVERRIDE; - virtual void Resizing( Size& rSize ) SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void dispose() override; + + virtual void Move() override; + virtual void Resize() override; + virtual void TitleButtonClick( TitleButton nButton ) override; + virtual void Pin() override; + virtual void Roll() override; + virtual void PopupModeEnd() override; + virtual void Resizing( Size& rSize ) override; + virtual bool Close() override; }; ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index 7621faf92898..01979047fff7 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -46,7 +46,7 @@ public: void ImplInit(); - void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) override; void SetImages( long nMaxHeight = 0, bool bForce = false ); @@ -101,31 +101,31 @@ private: void ImplInitStyleSettings(); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; DECL_LINK_TYPED( CloseHdl, ToolBox*, void ); DECL_LINK_TYPED( ToolboxEventHdl, VclWindowEvent&, void ); DECL_LINK_TYPED( ShowHideListener, VclWindowEvent&, void ); - void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void LoseFocus() SAL_OVERRIDE; - void GetFocus() SAL_OVERRIDE; + void StateChanged( StateChangedType nType ) override; + void DataChanged( const DataChangedEvent& rDCEvt ) override; + void LoseFocus() override; + void GetFocus() override; public: explicit MenuBarWindow( vcl::Window* pParent ); virtual ~MenuBarWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ShowButtons(bool bClose, bool bFloat, bool bHide); - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void KeyInput( const KeyEvent& rKEvent ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Resize() override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; void SetFocusId(sal_uLong nId) { nSaveFocusId = nId; } sal_uLong GetFocusId() const { return nSaveFocusId; } @@ -135,7 +135,7 @@ public: void KillActivePopup(); void PopupClosed(Menu* pMenu); sal_uInt16 GetHighlightedItem() const { return nHighlightedItem; } - virtual css::uno::Reference CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference CreateAccessible() override; void SetAutoPopup(bool bAuto) { mbAutoPopup = bAuto; } void LayoutChanged(); diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx index 2b555aaefc7a..8797d4ba9361 100644 --- a/vcl/source/window/menufloatingwindow.hxx +++ b/vcl/source/window/menufloatingwindow.hxx @@ -63,8 +63,8 @@ private: DECL_LINK_TYPED( AutoScroll, Timer *, void ); DECL_LINK_TYPED( ShowHideListener, VclWindowEvent&, void ); - 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; void InitMenuClipRegion(vcl::RenderContext& rRenderContext); @@ -86,19 +86,19 @@ public: MenuFloatingWindow(Menu* pMenu, vcl::Window* pParent, WinBits nStyle); virtual ~MenuFloatingWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void doShutdown(); - virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void KeyInput(const KeyEvent& rKEvent) SAL_OVERRIDE; - virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) override; + virtual void MouseButtonDown(const MouseEvent& rMEvt) override; + virtual void MouseButtonUp(const MouseEvent& rMEvt) override; + virtual void KeyInput(const KeyEvent& rKEvent) override; + virtual void Command(const CommandEvent& rCEvt) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void RequestHelp( const HelpEvent& rHEvt ) override; + virtual void Resize() override; - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; } sal_uLong GetFocusId() const { return nSaveFocusId; } @@ -120,7 +120,7 @@ public: void SetPosInParent( sal_uInt16 nPos ) { nPosInParent = nPos; } - virtual css::uno::Reference CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference CreateAccessible() override; }; #endif // INCLUDED_VCL_SOURCE_WINDOW_MENUFLOATINGWINDOW_HXX diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index c096509ffcfb..101fd356c7f2 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -63,15 +63,15 @@ private: protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; public: explicit ImplWheelWindow( vcl::Window* pParent ); virtual ~ImplWheelWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void ImplStop(); void ImplSetWheelMode( sal_uLong nWheelMode ); diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index ef92f616b4f3..16696ec38694 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1500,7 +1500,7 @@ public: m_aWheelData = CommandWheelData(rEvt.mnDelta, rEvt.mnNotchDelta, rEvt.mnScrollLines, nMode, nCode, bHorz, bPixel); } - virtual bool CallCommand(vcl::Window *pWindow, const Point &rMousePos) SAL_OVERRIDE + virtual bool CallCommand(vcl::Window *pWindow, const Point &rMousePos) override { return ImplCallWheelCommand(pWindow, rMousePos, &m_aWheelData); } @@ -1569,7 +1569,7 @@ public: { m_aSwipeData = CommandSwipeData(rEvt.mnVelocityX); } - virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) SAL_OVERRIDE + virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) override { return ImplCallCommand(pWindow, CommandEventId::Swipe, &m_aSwipeData); } @@ -1591,7 +1591,7 @@ public: { m_aLongPressData = CommandLongPressData(rEvt.mnX, rEvt.mnY); } - virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) SAL_OVERRIDE + virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) override { return ImplCallCommand(pWindow, CommandEventId::LongPress, &m_aLongPressData); } -- cgit v1.2.3