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 --- sc/source/ui/inc/undobase.hxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'sc/source/ui/inc/undobase.hxx') diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 7d6326e55bf5..d092d1f5f2ed 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -45,7 +45,7 @@ public: ScSimpleUndo( ScDocShell* pDocSh ); virtual ~ScSimpleUndo(); - virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; + virtual bool Merge( SfxUndoAction *pNextAction ) override; protected: ScDocShell* pDocShell; @@ -178,16 +178,16 @@ public: SfxUndoAction* GetWrappedUndo() { return pWrappedUndo; } void ForgetWrappedUndo(); - virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction) SAL_OVERRIDE; + virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction) override; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; - virtual OUString GetComment() const SAL_OVERRIDE; - virtual OUString GetRepeatComment(SfxRepeatTarget&) const SAL_OVERRIDE; - virtual sal_uInt16 GetId() const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual void Repeat(SfxRepeatTarget& rTarget) override; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const override; + virtual bool Merge( SfxUndoAction *pNextAction ) override; + virtual OUString GetComment() const override; + virtual OUString GetRepeatComment(SfxRepeatTarget&) const override; + virtual sal_uInt16 GetId() const override; }; #endif -- cgit