diff options
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/app/dbggui.cxx | 14 | ||||
-rw-r--r-- | vcl/source/app/session.cxx | 12 | ||||
-rw-r--r-- | vcl/source/app/svdata.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 6 | ||||
-rw-r--r-- | vcl/source/components/dtranscomp.cxx | 44 | ||||
-rw-r--r-- | vcl/source/components/fontident.cxx | 10 | ||||
-rw-r--r-- | vcl/source/edit/textdat2.hxx | 14 | ||||
-rw-r--r-- | vcl/source/edit/textund2.hxx | 38 | ||||
-rw-r--r-- | vcl/source/edit/textundo.hxx | 10 | ||||
-rw-r--r-- | vcl/source/edit/textview.cxx | 12 | ||||
-rw-r--r-- | vcl/source/edit/vclmedit.cxx | 20 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 6 | ||||
-rw-r--r-- | vcl/source/filter/sgvmain.hxx | 16 | ||||
-rw-r--r-- | vcl/source/fontsubset/cff.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 12 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl2.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/textlayout.cxx | 8 | ||||
-rw-r--r-- | vcl/source/helper/canvastools.cxx | 22 | ||||
-rw-r--r-- | vcl/source/uipreviewer/previewer.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/dockmgr.cxx | 34 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 16 | ||||
-rw-r--r-- | vcl/source/window/menu.cxx | 48 | ||||
-rw-r--r-- | vcl/source/window/scrwnd.hxx | 6 |
23 files changed, 179 insertions, 179 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 614b6c7bfda4..88489efde49b 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -328,9 +328,9 @@ private: public: DbgWindow(); - virtual bool Close(); - virtual void Resize(); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void InsertLine( const OUString& rLine ); void Update() { WorkWindow::Update(); maLstBox.Update(); } @@ -394,7 +394,7 @@ public: DbgDialog(); DECL_LINK( ClickHdl, Button* ); - void RequestHelp( const HelpEvent& rHEvt ); + void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; static sal_Char aDbgInfoBuf[12288]; @@ -1389,7 +1389,7 @@ class DbgMessageBox : public ErrorBox AddButton(OUString("Copy"), COPY_BUTTON_ID, 0); } - virtual void Click() + virtual void Click() SAL_OVERRIDE { if( GetCurButtonId() == COPY_BUTTON_ID ) vcl::unohelper::TextDataObject::CopyStringTo( m_aMessage, GetClipboard() ); @@ -1412,7 +1412,7 @@ public: } protected: - virtual long doIt(); + virtual long doIt() SAL_OVERRIDE; }; long SolarMessageBoxExecutor::doIt() @@ -1515,7 +1515,7 @@ public: } protected: - virtual long doIt(); + virtual long doIt() SAL_OVERRIDE; }; long SolarWindowPrinter::doIt() diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 478701c98267..cf430b4a08ff 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -76,12 +76,12 @@ class VCLSession: virtual ~VCLSession() {} - virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException, std::exception ); + 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; void callSaveRequested( bool bShutdown, bool bCancelable ); void callShutdownCancelled(); diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 10430142580c..21a3d1a7a4e7 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -244,7 +244,7 @@ public: // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_prevContext; }; diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 9e1aeb8397e0..bccd5f16b72f 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -201,7 +201,7 @@ oslSignalHandler pExceptionHandler = NULL; class DummyApplication : public Application { public: - int Main() { return EXIT_SUCCESS; }; + int Main() SAL_OVERRIDE { return EXIT_SUCCESS; }; }; class DesktopEnvironmentContext: public cppu::WeakImplHelper1< com::sun::star::uno::XCurrentContext > @@ -212,7 +212,7 @@ public: // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext; @@ -325,7 +325,7 @@ namespace */ class VCLUnoWrapperDeleter : public cppu::WeakImplHelper1<com::sun::star::lang::XEventListener> { - virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; }; void diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index a4d615424827..c584aad08b31 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -78,9 +78,9 @@ public: * XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ); + 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; static OUString getImplementationName_static(); static Sequence< OUString > getSupportedServiceNames_static(); @@ -90,33 +90,33 @@ public: */ virtual Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_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); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getName() - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; /* * XClipboardEx */ virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; /* * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeClipboardListener( const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; }; GenericClipboard::~GenericClipboard() @@ -221,8 +221,8 @@ public: /* * XSingleServiceFactory */ - virtual Reference< XInterface > SAL_CALL createInstance() throw(std::exception); - virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception); + 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; }; @@ -290,17 +290,17 @@ public: virtual ~GenericDragSource(); // XDragSource - virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception); - virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception); + 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 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); + ) throw(std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ); + virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; static Sequence< OUString > getSupportedServiceNames_static() { @@ -403,15 +403,15 @@ public: virtual ~GenericDropTarget(); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ); + virtual void SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ) SAL_OVERRIDE; // XDropTarget - virtual void SAL_CALL addDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception); - virtual void SAL_CALL removeDropTargetListener( const Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception); - virtual sal_Bool SAL_CALL isActive() throw(std::exception); - virtual void SAL_CALL setActive( sal_Bool active ) throw(std::exception); - virtual sal_Int8 SAL_CALL getDefaultActions() throw(std::exception); - virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception); + 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; static Sequence< OUString > getSupportedServiceNames_static() { diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index d6133ea65d57..7eb2f1f86ff2 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -55,15 +55,15 @@ FontIdentificator() {} // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); + 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; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException, std::exception); + virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; // XMaterialHolder - virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception); + virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index 9308728bb6f6..ccff6a6ca52a 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -251,17 +251,17 @@ private: public: TextSelFunctionSet( TextView* pView ); - virtual void BeginDrag(); + virtual void BeginDrag() SAL_OVERRIDE; - virtual void CreateAnchor(); + virtual void CreateAnchor() SAL_OVERRIDE; - virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ); + virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) SAL_OVERRIDE; - virtual bool IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(); + virtual bool IsSelectionAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; + virtual void DeselectAll() SAL_OVERRIDE; - virtual void DeselectAtPoint( const Point& ); - virtual void DestroyAnchor(); + virtual void DeselectAtPoint( const Point& ) SAL_OVERRIDE; + virtual void DestroyAnchor() SAL_OVERRIDE; }; diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index f8382db56904..2980641c28bf 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -35,10 +35,10 @@ public: TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uLong nPara ); ~TextUndoDelPara(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; @@ -53,10 +53,10 @@ public: TextUndoConnectParas( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nSepPos ); ~TextUndoConnectParas(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; @@ -71,10 +71,10 @@ public: TextUndoSplitPara( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nSepPos ); ~TextUndoSplitPara(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; @@ -88,12 +88,12 @@ public: TYPEINFO_OVERRIDE(); TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual bool Merge( SfxUndoAction *pNextAction ); + virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; @@ -107,10 +107,10 @@ public: TYPEINFO_OVERRIDE(); TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; @@ -124,10 +124,10 @@ public: TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel ); ~TextUndoSetAttribs(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment () const; + virtual OUString GetComment () const SAL_OVERRIDE; }; #endif // INCLUDED_VCL_SOURCE_EDIT_TEXTUND2_HXX diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx index c1385686163b..f5eacc78addf 100644 --- a/vcl/source/edit/textundo.hxx +++ b/vcl/source/edit/textundo.hxx @@ -44,9 +44,9 @@ public: ~TextUndoManager(); using SfxUndoManager::Undo; - virtual bool Undo(); + virtual bool Undo() SAL_OVERRIDE; using SfxUndoManager::Redo; - virtual bool Redo(); + virtual bool Redo() SAL_OVERRIDE; }; @@ -70,10 +70,10 @@ public: TextEngine* GetTextEngine() const { return mpTextEngine; } - virtual void Undo() = 0; - virtual void Redo() = 0; + virtual void Undo() SAL_OVERRIDE = 0; + virtual void Redo() SAL_OVERRIDE = 0; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; #endif // INCLUDED_VCL_SOURCE_EDIT_TEXTUNDO_HXX diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 9caeba98aa5a..fd3dbfbdac2f 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -75,14 +75,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); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // ::com::sun::star::datatransfer::XTransferable - ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText ) diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 29c432aed51a..6d5a91164ee8 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -55,18 +55,18 @@ public: ExtTextEngine* GetTextEngine() const { return mpExtTextEngine; } ExtTextView* GetTextView() const { return mpExtTextView; } - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void 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 ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; bool IsAutoFocusHide() const { return mbFocusSelectionHide; } void SetAutoFocusHide( bool bAutoHide ) { mbFocusSelectionHide = bAutoHide; } @@ -95,7 +95,7 @@ private: mutable Selection maSelection; protected: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void ImpUpdateSrollBarVis( WinBits nWinStyle ); void ImpInitScrollBars(); void ImpSetScrollBarRanges(); diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index a033e9b063bc..4605abdd890e 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -97,12 +97,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) + throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_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) + throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { mrStm.Flush(); } - virtual void SAL_CALL closeOutput() throw(std::exception) {} + virtual void SAL_CALL closeOutput() throw(std::exception) SAL_OVERRIDE {} public: diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index ae0d35d735ad..94e0470b1eb8 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -140,7 +140,7 @@ public: sal_uInt8 Layer; friend SvStream& ReadObjkType(SvStream& rIStream, ObjkType& rObjk); friend bool ObjOverSeek(SvStream& rInp, ObjkType& rObjk); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define StrkSize 38 @@ -152,7 +152,7 @@ public: PointType Pos1; // start point PointType Pos2; // end point friend SvStream& ReadStrkType(SvStream& rIStream, StrkType& rStrk); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define RectSize 52 @@ -168,7 +168,7 @@ public: sal_uInt16 DrehWink; // 315...<45 sal_uInt16 Slant; // >270...<90 friend SvStream& ReadRectType(SvStream& rIStream, RectType& rRect); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define PolySize 44 @@ -183,7 +183,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); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define PolyClosBit 0x01 // kinds of Poly: 0: polyLine 1: polygon @@ -199,7 +199,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); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; // kinds of Spline: see Poly @@ -216,7 +216,7 @@ public: sal_uInt16 StartWink; // and not for full circles sal_uInt16 RelWink; // and full ellipses friend SvStream& ReadCircType(SvStream& rIStream, CircType& rCirc); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define CircFull 0x00 /* kinds of circle: 0: full circle */ #define CircSect 0x01 /* 1: circle sector */ @@ -241,7 +241,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); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; }; #define TextOutlBit 0x01 /* 1=Sourcecode for outliner (ignored byDrawObjekt()) */ #define TextFitSBit 0x02 /* Bit1: 1=Text-Fit2Size, also outliner (2.0) */ @@ -271,7 +271,7 @@ public: sal_uInt8 GrfFlg; // (SD20) 0=nSGF 1=Pcx 2=HPGL 4=Raw $FF=Undef (to fix DrawBmp) INetURLObject aFltPath; // for GraphicFilter friend SvStream& ReadBmapType(SvStream& rIStream, BmapType& rBmap); - virtual void Draw(OutputDevice& rOut); + virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE; void SetPaths( const INetURLObject rFltPath ); }; diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index c4b50b157acd..83f68152e798 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -348,7 +348,7 @@ public: void initialCffRead( void); bool emitAsType1( class Type1Emitter&, const sal_GlyphId* pGlyphIds, const U8* pEncoding, - GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ); + GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ) SAL_OVERRIDE; // used by charstring converter void setCharStringType( int); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 29353a11aeca..b37c880cffa9 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2209,9 +2209,9 @@ public: ImplPdfBuiltinFontData( const PDFWriterImpl::BuiltinFont& ); const PDFWriterImpl::BuiltinFont* GetBuiltinFont() const { return &mrBuiltin; } - virtual PhysicalFontFace* Clone() const { return new ImplPdfBuiltinFontData(*this); } - virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const; - virtual sal_IntPtr GetFontId() const { return reinterpret_cast<sal_IntPtr>(&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<sal_IntPtr>(&mrBuiltin); } }; inline const ImplPdfBuiltinFontData* GetPdfFontData( const PhysicalFontFace* pFontData ) @@ -6821,9 +6821,9 @@ class PDFStreamIf : 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); - virtual void SAL_CALL flush() throw(std::exception); - virtual void SAL_CALL closeOutput() throw(std::exception); + 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; }; } diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 357cee4bef2f..d64d68a59a4d 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1112,7 +1112,7 @@ public: } // XMaterialHolder - virtual uno::Any SAL_CALL getMaterial() throw(std::exception) + virtual uno::Any SAL_CALL getMaterial() throw(std::exception) SAL_OVERRIDE { return uno::makeAny( sal_Int64(maID) ); } diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 05b44b2dd939..b54a0421bfd7 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; - virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector* _pVector, OUString* _pDisplayText ); - virtual bool GetCaretPositions( const OUString& _rText, sal_Int32* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const; + 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, sal_Int32* _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; + virtual bool DecomposeTextRectAction() const SAL_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 2ad6a542c611..c35548823895 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -428,25 +428,25 @@ namespace vcl private: uno::Sequence< sal_Int8 > m_aComponentTags; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_aComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) SAL_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) + uno::RuntimeException, std::exception) SAL_OVERRIDE { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -454,7 +454,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) + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -471,7 +471,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) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -488,7 +488,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) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -505,7 +505,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) + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -522,7 +522,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) + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -539,7 +539,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) + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_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 923c79dfb946..346f4d3ccc0b 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(); - virtual int Main(); + virtual void Init() SAL_OVERRIDE; + virtual int Main() SAL_OVERRIDE; }; using namespace com::sun::star; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 4e62e93907cf..f3f2f42db8a4 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -59,17 +59,17 @@ public: ImplDockingWindowWrapper* pDockingWin ); ~ImplDockFloatWin2(); - virtual void Move(); - virtual void Resize(); - virtual void TitleButtonClick( sal_uInt16 nButton ); - virtual void Pin(); - virtual void Roll(); - virtual void PopupModeEnd(); - virtual void Resizing( Size& rSize ); - virtual bool Close(); + virtual void Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void TitleButtonClick( sal_uInt16 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 setPosSizePixel( long nX, long nY, long nWidth, long nHeight, - sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); + sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; sal_uLong GetLastTicks() const { return mnLastTicks; } }; @@ -498,14 +498,14 @@ public: ImplPopupFloatWin( Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ); ~ImplPopupFloatWin(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Resize(); - virtual Window* GetPreferredKeyInputWindow(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual void Paint( 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 Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; Rectangle GetDragRect() const; Point GetToolboxPosition() const; diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index c8d0cb7f83a6..dabd203107f3 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -74,14 +74,14 @@ public: DockingWindow* pDockingWin ); ~ImplDockFloatWin(); - virtual void Move(); - virtual void Resize(); - virtual void TitleButtonClick( sal_uInt16 nButton ); - virtual void Pin(); - virtual void Roll(); - virtual void PopupModeEnd(); - virtual void Resizing( Size& rSize ); - virtual bool Close(); + virtual void Move() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void TitleButtonClick( sal_uInt16 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; sal_uLong GetLastTicks() const { return mnLastTicks; } }; diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 65193d1d8584..2bd976881439 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -514,8 +514,8 @@ private: DECL_LINK(AutoScroll, void *); DECL_LINK( ShowHideListener, VclWindowEvent* ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; protected: Region ImplCalcClipRegion( bool bIncludeLogo = true ) const; void ImplInitClipRegion(); @@ -534,14 +534,14 @@ public: void doShutdown(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void Resize(); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; } sal_uLong GetFocusId() const { return nSaveFocusId; } @@ -565,7 +565,7 @@ public: void SetPosInParent( sal_uInt16 nPos ) { nPosInParent = nPos; } sal_uInt16 GetPosInParent() const { return nPosInParent; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; // To get the transparent mouse-over look, the closer is actually a toolbox @@ -580,7 +580,7 @@ public: DecoToolBox( Window* pParent, WinBits nStyle = 0 ); void ImplInit(); - void DataChanged( const DataChangedEvent& rDCEvt ); + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetImages( long nMaxHeight = 0, bool bForce = false ); @@ -730,10 +730,10 @@ private: DECL_LINK( ToolboxEventHdl, VclWindowEvent* ); DECL_LINK( ShowHideListener, VclWindowEvent* ); - void StateChanged( StateChangedType nType ); - void DataChanged( const DataChangedEvent& rDCEvt ); - void LoseFocus(); - void GetFocus(); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + void LoseFocus() SAL_OVERRIDE; + void GetFocus() SAL_OVERRIDE; public: MenuBarWindow( Window* pParent ); @@ -741,13 +741,13 @@ public: void ShowButtons( bool bClose, bool bFloat, bool bHide ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); + 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( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; } sal_uLong GetFocusId() const { return nSaveFocusId; } @@ -757,7 +757,7 @@ public: PopupMenu* GetActivePopup() const { return pActivePopup; } void PopupClosed( Menu* pMenu ); sal_uInt16 GetHighlightedItem() const { return nHighlightedItem; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void SetAutoPopup( bool bAuto ) { mbAutoPopup = bAuto; } void ImplLayoutChanged(); diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index bd6ee20204f0..b7c6503f3dae 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -60,9 +60,9 @@ private: protected: - virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: |