summaryrefslogtreecommitdiff
path: root/vcl/source/edit
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /vcl/source/edit
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
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.cxx22
5 files changed, 48 insertions, 48 deletions
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();