diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /sd/inc/undo | |
parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sd/inc/undo')
-rw-r--r-- | sd/inc/undo/undofactory.hxx | 12 | ||||
-rw-r--r-- | sd/inc/undo/undomanager.hxx | 4 | ||||
-rw-r--r-- | sd/inc/undo/undoobjects.hxx | 36 |
3 files changed, 26 insertions, 26 deletions
diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx index 0c2390d7eecc..4db4cbf10c45 100644 --- a/sd/inc/undo/undofactory.hxx +++ b/sd/inc/undo/undofactory.hxx @@ -28,12 +28,12 @@ namespace sd class UndoFactory : public SdrUndoFactory { public: - virtual SdrUndoAction* CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect = false); - virtual SdrUndoAction* CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false); - virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ); - virtual SdrUndoAction* CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ); - virtual SdrUndoAction* CreateUndoGeoObject( SdrObject& rObject ); - virtual SdrUndoAction* CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ); + virtual SdrUndoAction* CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect = false) SAL_OVERRIDE; + virtual SdrUndoAction* CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false) SAL_OVERRIDE; + virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ) SAL_OVERRIDE; + virtual SdrUndoAction* CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ) SAL_OVERRIDE; + virtual SdrUndoAction* CreateUndoGeoObject( SdrObject& rObject ) SAL_OVERRIDE; + virtual SdrUndoAction* CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ) SAL_OVERRIDE; }; diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index b0f68d1f53bb..a3f68f929b03 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -31,9 +31,9 @@ class UndoManager : public SdrUndoManager public: UndoManager( sal_uInt16 nMaxUndoActionCount = 20 ); - virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0); + virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) SAL_OVERRIDE; - virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ); + virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) SAL_OVERRIDE; /** Set or reset the undo manager linked with the called undo manager. */ diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx index c0270b8f17f8..3e45400dd378 100644 --- a/sd/inc/undo/undoobjects.hxx +++ b/sd/inc/undo/undoobjects.hxx @@ -51,8 +51,8 @@ class UndoRemoveObject : public SdrUndoRemoveObj, public UndoRemovePresObjectImp public: UndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; private: SdrObjectWeakRef mxSdrObject; @@ -63,8 +63,8 @@ class UndoDeleteObject : public SdrUndoDelObj, public UndoRemovePresObjectImpl public: UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; private: SdrObjectWeakRef mxSdrObject; @@ -76,8 +76,8 @@ class UndoReplaceObject : public SdrUndoReplaceObj, public UndoRemovePresObjectI public: UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; private: SdrObjectWeakRef mxSdrObject; @@ -90,8 +90,8 @@ public: UndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ); virtual ~UndoObjectSetText(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; private: SfxUndoAction* mpUndoAnimation; @@ -107,8 +107,8 @@ class UndoObjectUserCall : public SdrUndoObj public: UndoObjectUserCall(SdrObject& rNewObj); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: SdrObjUserCall* mpOldUserCall; @@ -124,8 +124,8 @@ class UndoObjectPresentationKind : public SdrUndoObj public: UndoObjectPresentationKind(SdrObject& rObject); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: PresObjKind meOldKind; @@ -143,8 +143,8 @@ class UndoAutoLayoutPosAndSize : public SfxUndoAction public: UndoAutoLayoutPosAndSize( SdPage& rPage ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: SdrPageWeakRef mxPage; @@ -156,8 +156,8 @@ class UndoGeoObject : public SdrUndoGeoObj public: UndoGeoObject( SdrObject& rNewObj ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: SdrPageWeakRef mxPage; @@ -170,8 +170,8 @@ class UndoAttrObject : public SdrUndoAttrObj public: UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; protected: SdrPageWeakRef mxPage; |