summaryrefslogtreecommitdiff
path: root/vcl/source/edit
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /vcl/source/edit
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'vcl/source/edit')
-rw-r--r--vcl/source/edit/textdat2.hxx14
-rw-r--r--vcl/source/edit/textund2.hxx38
-rw-r--r--vcl/source/edit/textundo.hxx10
-rw-r--r--vcl/source/edit/textview.cxx12
-rw-r--r--vcl/source/edit/vclmedit.cxx20
5 files changed, 47 insertions, 47 deletions
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();