summaryrefslogtreecommitdiff
path: root/sc/inc/chgtrack.hxx
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 /sc/inc/chgtrack.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sc/inc/chgtrack.hxx')
-rw-r--r--sc/inc/chgtrack.hxx64
1 files changed, 32 insertions, 32 deletions
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 34941bc06197..bb91165613f9 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -408,12 +408,12 @@ class ScChangeActionIns : public ScChangeAction
ScChangeActionIns( const ScRange& rRange, bool bEndOfList = false );
virtual ~ScChangeActionIns();
- virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE {}
- virtual void DeleteCellEntries() SAL_OVERRIDE {}
+ virtual void AddContent( ScChangeActionContent* ) override {}
+ virtual void DeleteCellEntries() override {}
- virtual bool Reject(ScDocument* pDoc) SAL_OVERRIDE;
+ virtual bool Reject(ScDocument* pDoc) override;
- virtual const ScChangeTrack* GetChangeTrack() const SAL_OVERRIDE { return 0; }
+ virtual const ScChangeTrack* GetChangeTrack() const override { return 0; }
public:
ScChangeActionIns(
@@ -428,7 +428,7 @@ public:
bool bEndOfList = false );
virtual void GetDescription(
- OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true) const SAL_OVERRIDE;
+ OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true) const override;
SC_DLLPUBLIC bool IsEndOfList() const;
};
@@ -478,19 +478,19 @@ class ScChangeActionDel : public ScChangeAction
ScChangeActionDel( const ScRange& rRange, SCsCOL nDx, SCsROW nDy, ScChangeTrack* );
virtual ~ScChangeActionDel();
- virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE;
- virtual void DeleteCellEntries() SAL_OVERRIDE;
+ virtual void AddContent( ScChangeActionContent* ) override;
+ virtual void DeleteCellEntries() override;
void UndoCutOffMoves();
void UndoCutOffInsert();
virtual void UpdateReference( const ScChangeTrack*,
UpdateRefMode, const ScBigRange&,
- sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) SAL_OVERRIDE;
+ sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) override;
- virtual bool Reject(ScDocument* pDoc) SAL_OVERRIDE;
+ virtual bool Reject(ScDocument* pDoc) override;
- virtual const ScChangeTrack* GetChangeTrack() const SAL_OVERRIDE { return pTrack; }
+ virtual const ScChangeTrack* GetChangeTrack() const override { return pTrack; }
public:
ScChangeActionDel(
@@ -523,7 +523,7 @@ public:
short GetCutOffCount() const { return nCutOff; }
virtual void GetDescription(
- OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const SAL_OVERRIDE;
+ OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const override;
void SetCutOffInsert( ScChangeActionIns* p, short n )
{ pCutOff = p; nCutOff = n; } // only to use in the XML import
@@ -558,8 +558,8 @@ class ScChangeActionMove : public ScChangeAction
{}
virtual ~ScChangeActionMove();
- virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE;
- virtual void DeleteCellEntries() SAL_OVERRIDE;
+ virtual void AddContent( ScChangeActionContent* ) override;
+ virtual void DeleteCellEntries() override;
ScBigRange& GetFromRange() { return aFromRange; }
@@ -570,11 +570,11 @@ class ScChangeActionMove : public ScChangeAction
virtual void UpdateReference( const ScChangeTrack*,
UpdateRefMode, const ScBigRange&,
- sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) SAL_OVERRIDE;
+ sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) override;
- virtual bool Reject(ScDocument* pDoc) SAL_OVERRIDE;
+ virtual bool Reject(ScDocument* pDoc) override;
- virtual const ScChangeTrack* GetChangeTrack() const SAL_OVERRIDE { return pTrack; }
+ virtual const ScChangeTrack* GetChangeTrack() const override { return pTrack; }
protected:
using ScChangeAction::GetRefString;
@@ -595,10 +595,10 @@ public:
virtual void GetDescription(
OUString& rStr, ScDocument* pDoc, bool bSplitRange = false,
- bool bWarning = true ) const SAL_OVERRIDE;
+ bool bWarning = true ) const override;
virtual void GetRefString(
- OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const SAL_OVERRIDE;
+ OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const override;
};
ScChangeActionDelMoveEntry::ScChangeActionDelMoveEntry(
@@ -697,16 +697,16 @@ class ScChangeActionContent : public ScChangeAction
void GetFormulaString( OUString& rStr, const ScFormulaCell* pCell ) const;
- virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE {}
- virtual void DeleteCellEntries() SAL_OVERRIDE {}
+ virtual void AddContent( ScChangeActionContent* ) override {}
+ virtual void DeleteCellEntries() override {}
virtual void UpdateReference( const ScChangeTrack*,
UpdateRefMode, const ScBigRange&,
- sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) SAL_OVERRIDE;
+ sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) override;
- virtual bool Reject(ScDocument* pDoc) SAL_OVERRIDE;
+ virtual bool Reject(ScDocument* pDoc) override;
- virtual const ScChangeTrack* GetChangeTrack() const SAL_OVERRIDE { return 0; }
+ virtual const ScChangeTrack* GetChangeTrack() const override { return 0; }
// pRejectActions!=NULL: reject actions get
// stacked, no SetNewValue, no Append
@@ -744,8 +744,8 @@ public:
ScChangeActionContent* GetTopContent() const;
bool IsTopContent() const { return pNextContent == NULL; }
- virtual ScChangeActionLinkEntry* GetDeletedIn() const SAL_OVERRIDE;
- virtual ScChangeActionLinkEntry** GetDeletedInAddress() SAL_OVERRIDE;
+ virtual ScChangeActionLinkEntry* GetDeletedIn() const override;
+ virtual ScChangeActionLinkEntry** GetDeletedInAddress() override;
void PutOldValueToDoc( ScDocument*,
SCsCOL nDx, SCsROW nDy ) const;
@@ -784,10 +784,10 @@ public:
const ScCellValue& GetOldCell() const { return maOldCell;}
const ScCellValue& GetNewCell() const { return maNewCell;}
virtual void GetDescription(
- OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const SAL_OVERRIDE;
+ OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true ) const override;
virtual void GetRefString(
- OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const SAL_OVERRIDE;
+ OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const override;
static ScChangeActionContentCellType GetContentCellType( const ScCellValue& rCell );
static ScChangeActionContentCellType GetContentCellType( const ScRefCellValue& rIter );
@@ -811,12 +811,12 @@ class ScChangeActionReject : public ScChangeAction
SetState( SC_CAS_ACCEPTED );
}
- virtual void AddContent( ScChangeActionContent* ) SAL_OVERRIDE {}
- virtual void DeleteCellEntries() SAL_OVERRIDE {}
+ virtual void AddContent( ScChangeActionContent* ) override {}
+ virtual void DeleteCellEntries() override {}
- virtual bool Reject(ScDocument* pDoc) SAL_OVERRIDE;
+ virtual bool Reject(ScDocument* pDoc) override;
- virtual const ScChangeTrack* GetChangeTrack() const SAL_OVERRIDE { return 0; }
+ virtual const ScChangeTrack* GetChangeTrack() const override { return 0; }
public:
ScChangeActionReject(const sal_uLong nActionNumber,
@@ -992,7 +992,7 @@ class ScChangeTrack : public utl::ConfigurationListener
bool IsLastAction( sal_uLong nNum ) const;
void ClearMsgQueue();
- virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE;
+ virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override;
public: