diff options
Diffstat (limited to 'include/svl/undo.hxx')
| -rw-r--r-- | include/svl/undo.hxx | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index bfb7f617de71..aacc127d13e3 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -145,21 +145,21 @@ public: const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId, SfxUndoArray *pFather ); virtual ~SfxListUndoAction(); - virtual void Undo() SAL_OVERRIDE; - virtual void UndoWithContext( SfxUndoContext& i_context ) SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual void RedoWithContext( SfxUndoContext& i_context ) SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget&) SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget&) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void UndoWithContext( SfxUndoContext& i_context ) override; + virtual void Redo() override; + virtual void RedoWithContext( SfxUndoContext& i_context ) override; + virtual void Repeat(SfxRepeatTarget&) override; + virtual bool CanRepeat(SfxRepeatTarget&) const override; - virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; + virtual bool Merge( SfxUndoAction *pNextAction ) override; - virtual OUString GetComment() const SAL_OVERRIDE; - virtual OUString GetRepeatComment(SfxRepeatTarget&) const SAL_OVERRIDE; - virtual sal_uInt16 GetId() const SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual OUString GetRepeatComment(SfxRepeatTarget&) const override; + virtual sal_uInt16 GetId() const override; void SetComment(const OUString& rComment); - void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; + void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; @@ -318,36 +318,36 @@ public: virtual ~SfxUndoManager(); // IUndoManager overridables - virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ) SAL_OVERRIDE; - virtual size_t GetMaxUndoActionCount() const SAL_OVERRIDE; - virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) SAL_OVERRIDE; - virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; - virtual sal_uInt16 GetUndoActionId() const SAL_OVERRIDE; - virtual OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; - virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const SAL_OVERRIDE; - virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; - virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; - virtual SfxUndoAction* GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; - virtual bool Undo() SAL_OVERRIDE; - virtual bool Redo() SAL_OVERRIDE; - virtual void Clear() SAL_OVERRIDE; - virtual void ClearRedo() SAL_OVERRIDE; - virtual void Reset() SAL_OVERRIDE; - virtual bool IsDoing() const SAL_OVERRIDE; - virtual size_t GetRepeatActionCount() const SAL_OVERRIDE; - virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const SAL_OVERRIDE; - virtual bool Repeat( SfxRepeatTarget &rTarget ) SAL_OVERRIDE; - virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const SAL_OVERRIDE; - virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) SAL_OVERRIDE; - virtual size_t LeaveListAction() SAL_OVERRIDE; - virtual size_t LeaveAndMergeListAction() SAL_OVERRIDE; - virtual bool IsInListAction() const SAL_OVERRIDE; - virtual size_t GetListActionDepth() const SAL_OVERRIDE; - virtual void RemoveLastUndoAction() SAL_OVERRIDE; - virtual void EnableUndo( bool bEnable ) SAL_OVERRIDE; - virtual bool IsUndoEnabled() const SAL_OVERRIDE; - virtual void AddUndoListener( SfxUndoListener& i_listener ) SAL_OVERRIDE; - virtual void RemoveUndoListener( SfxUndoListener& i_listener ) SAL_OVERRIDE; + virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ) override; + virtual size_t GetMaxUndoActionCount() const override; + virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) override; + virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const override; + virtual sal_uInt16 GetUndoActionId() const override; + virtual OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const override; + virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const override; + virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const override; + virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const override; + virtual SfxUndoAction* GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const override; + virtual bool Undo() override; + virtual bool Redo() override; + virtual void Clear() override; + virtual void ClearRedo() override; + virtual void Reset() override; + virtual bool IsDoing() const override; + virtual size_t GetRepeatActionCount() const override; + virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const override; + virtual bool Repeat( SfxRepeatTarget &rTarget ) override; + virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const override; + virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) override; + virtual size_t LeaveListAction() override; + virtual size_t LeaveAndMergeListAction() override; + virtual bool IsInListAction() const override; + virtual size_t GetListActionDepth() const override; + virtual void RemoveLastUndoAction() override; + virtual void EnableUndo( bool bEnable ) override; + virtual bool IsUndoEnabled() const override; + virtual void AddUndoListener( SfxUndoListener& i_listener ) override; + virtual void RemoveUndoListener( SfxUndoListener& i_listener ) override; /** marks the current top-level element of the Undo stack, and returns a unique ID for it */ @@ -428,15 +428,15 @@ public: SfxLinkUndoAction(::svl::IUndoManager *pManager); virtual ~SfxLinkUndoAction(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; - virtual bool CanRepeat(SfxRepeatTarget& r) const SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; + virtual bool CanRepeat(SfxRepeatTarget& r) const override; - virtual void Repeat(SfxRepeatTarget&r) SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget&r) override; - virtual OUString GetComment() const SAL_OVERRIDE; - virtual OUString GetRepeatComment(SfxRepeatTarget&r) const SAL_OVERRIDE; - virtual sal_uInt16 GetId() const SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual OUString GetRepeatComment(SfxRepeatTarget&r) const override; + virtual sal_uInt16 GetId() const override; SfxUndoAction* GetAction() const { return pAction; } |