diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /include/svx/svdundo.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svx/svdundo.hxx')
-rw-r--r-- | include/svx/svdundo.hxx | 170 |
1 files changed, 85 insertions, 85 deletions
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 6b4773f72fc7..d98aba1ff82d 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -59,10 +59,10 @@ public: TYPEINFO_OVERRIDE(); virtual ~SdrUndoAction(); - virtual bool CanRepeat(SfxRepeatTarget& rView) const SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget& rView) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rView) const override; + virtual void Repeat(SfxRepeatTarget& rView) override; - virtual OUString GetRepeatComment(SfxRepeatTarget& rView) const SAL_OVERRIDE; + virtual OUString GetRepeatComment(SfxRepeatTarget& rView) const override; virtual OUString GetSdrRepeatComment(SdrView& rView) const; virtual bool CanSdrRepeat(SdrView& rView) const; @@ -98,14 +98,14 @@ public: void SetComment(const OUString& rStr) { aComment=rStr; } void SetObjDescription(const OUString& rStr) { aObjDescription=rStr; } - virtual OUString GetComment() const SAL_OVERRIDE; - virtual OUString GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual OUString GetSdrRepeatComment(SdrView& rView) const override; - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; - virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; - virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; + virtual bool CanSdrRepeat(SdrView& rView) const override; + virtual void SdrRepeat(SdrView& rView) override; void SetRepeatFunction(SdrRepeatFunc eFunc) { eFunction=eFunc; } }; @@ -163,14 +163,14 @@ protected: public: SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1 = false, bool bSaveText = false); virtual ~SdrUndoAttrObj(); - 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 GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual OUString GetSdrRepeatComment(SdrView& rView) const override; - virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; - virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; + virtual void SdrRepeat(SdrView& rView) override; + virtual bool CanSdrRepeat(SdrView& rView) const override; }; /** @@ -188,14 +188,14 @@ public: SdrUndoMoveObj(SdrObject& rNewObj, const Size& rDist): SdrUndoObj(rNewObj),aDistance(rDist) {} virtual ~SdrUndoMoveObj(); - 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 GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual OUString GetSdrRepeatComment(SdrView& rView) const override; - virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; - virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; + virtual void SdrRepeat(SdrView& rView) override; + virtual bool CanSdrRepeat(SdrView& rView) const override; }; /** @@ -215,10 +215,10 @@ public: SdrUndoGeoObj(SdrObject& rNewObj); virtual ~SdrUndoGeoObj(); - 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; }; /** @@ -260,8 +260,8 @@ public: SdrUndoRemoveObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; virtual ~SdrUndoRemoveObj(); }; @@ -278,8 +278,8 @@ public: SdrUndoInsertObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; }; /** @@ -292,14 +292,14 @@ class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj public: SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect = false); - 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 GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual OUString GetSdrRepeatComment(SdrView& rView) const override; - virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; - virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; + virtual void SdrRepeat(SdrView& rView) override; + virtual bool CanSdrRepeat(SdrView& rView) const override; }; /** @@ -313,10 +313,10 @@ public: SdrUndoNewObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoInsertObj(rNewObj,bOrdNumDirect) {} - 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; static OUString GetComment(const SdrObject& _rForObject); }; @@ -340,8 +340,8 @@ public: SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect = false); virtual ~SdrUndoReplaceObj(); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; bool IsNewOwner() { return bNewOwner; } void SetNewOwner(bool bNew); @@ -361,7 +361,7 @@ public: SdrUndoCopyObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoNewObj(rNewObj,bOrdNumDirect) {} - virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetComment() const override; }; class SdrUndoObjOrdNum : public SdrUndoObj @@ -373,10 +373,10 @@ protected: public: SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1); - 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; }; @@ -391,8 +391,8 @@ protected: public: SdrUndoObjectLayerChange(SdrObject& rObj, SdrLayerID aOldLayer, SdrLayerID aNewLayer); - virtual void Undo() SAL_OVERRIDE; - virtual void Redo() SAL_OVERRIDE; + virtual void Undo() override; + virtual void Redo() override; }; class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj @@ -411,14 +411,14 @@ public: bool IsDifferent() const { return pOldText!=pNewText; } void AfterSetText(); - 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 GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual OUString GetSdrRepeatComment(SdrView& rView) const override; - virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; - virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; + virtual void SdrRepeat(SdrView& rView) override; + virtual bool CanSdrRepeat(SdrView& rView) const override; }; /** @@ -446,10 +446,10 @@ public: const OUString& sOldStr, const OUString& sNewStr); - 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; }; @@ -485,10 +485,10 @@ public: SdrUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) {} - 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; }; /** @@ -502,10 +502,10 @@ public: SdrUndoDelLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=true; } - 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; }; /** @@ -521,10 +521,10 @@ public: SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {} - 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; }; @@ -585,14 +585,14 @@ public: SdrUndoDelPage(SdrPage& rNewPg); virtual ~SdrUndoDelPage(); - 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 GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual OUString GetSdrRepeatComment(SdrView& rView) const override; - virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; - virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; + virtual void SdrRepeat(SdrView& rView) override; + virtual bool CanSdrRepeat(SdrView& rView) const override; }; /** @@ -605,10 +605,10 @@ class SVX_DLLPUBLIC SdrUndoNewPage : public SdrUndoPageList public: SdrUndoNewPage(SdrPage& rNewPg): SdrUndoPageList(rNewPg) {} - 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; }; /** @@ -621,11 +621,11 @@ class SdrUndoCopyPage : public SdrUndoNewPage public: SdrUndoCopyPage(SdrPage& rNewPg): SdrUndoNewPage(rNewPg) {} - virtual OUString GetComment() const SAL_OVERRIDE; - virtual OUString GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; + virtual OUString GetComment() const override; + virtual OUString GetSdrRepeatComment(SdrView& rView) const override; - virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; - virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; + virtual void SdrRepeat(SdrView& rView) override; + virtual bool CanSdrRepeat(SdrView& rView) const override; }; /** @@ -643,10 +643,10 @@ public: SdrUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1) : SdrUndoPage(rNewPg),nOldPageNum(nOldPageNum1),nNewPageNum(nNewPageNum1) {} - 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; }; @@ -683,10 +683,10 @@ class SdrUndoPageRemoveMasterPage : public SdrUndoPageMasterPage public: SdrUndoPageRemoveMasterPage(SdrPage& rChangedPage); - 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; }; /** @@ -704,10 +704,10 @@ protected: public: SdrUndoPageChangeMasterPage(SdrPage& rChangedPage); - 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; }; |