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 /sc/inc/conditio.hxx | |
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 'sc/inc/conditio.hxx')
-rw-r--r-- | sc/inc/conditio.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index bd8837c4a5d5..cb4218942833 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -204,7 +204,7 @@ public: bool operator== ( const ScConditionEntry& r ) const; - virtual void SetParent( ScConditionalFormat* pNew ) { pCondFormat = pNew; } + virtual void SetParent( ScConditionalFormat* pNew ) SAL_OVERRIDE { pCondFormat = pNew; } bool IsCellValid( ScRefCellValue& rCell, const ScAddress& rPos ) const; @@ -227,23 +227,23 @@ public: void CompileAll(); void CompileXML(); - virtual void UpdateReference( sc::RefUpdateContext& rCxt ); - virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ); - virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ); - virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ); + virtual void UpdateReference( sc::RefUpdateContext& rCxt ) SAL_OVERRIDE; + virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) SAL_OVERRIDE; + virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) SAL_OVERRIDE; + virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) SAL_OVERRIDE; void SourceChanged( const ScAddress& rChanged ); bool MarkUsedExternalReferences() const; - virtual condformat::ScFormatEntryType GetType() const { return condformat::CONDITION; } + virtual condformat::ScFormatEntryType GetType() const SAL_OVERRIDE { return condformat::CONDITION; } - virtual ScFormatEntry* Clone(ScDocument* pDoc = NULL) const; + virtual ScFormatEntry* Clone(ScDocument* pDoc = NULL) const SAL_OVERRIDE; static ScConditionMode GetModeFromApi(sal_Int32 nOperator); - virtual void endRendering(); - virtual void startRendering(); + virtual void endRendering() SAL_OVERRIDE; + virtual void startRendering() SAL_OVERRIDE; protected: virtual void DataChanged( const ScRange* pModified ) const; @@ -312,10 +312,10 @@ public: const OUString& GetStyle() const { return aStyleName; } void UpdateStyleName(const OUString& rNew) { aStyleName=rNew; } - virtual ScFormatEntry* Clone(ScDocument* pDoc) const; + virtual ScFormatEntry* Clone(ScDocument* pDoc) const SAL_OVERRIDE; protected: - virtual void DataChanged( const ScRange* pModified ) const; + virtual void DataChanged( const ScRange* pModified ) const SAL_OVERRIDE; }; namespace condformat { @@ -353,20 +353,20 @@ public: const OUString& GetStyleName() const; void SetStyleName( const OUString& rStyleName ); - virtual condformat::ScFormatEntryType GetType() const { return condformat::DATE; } - virtual void UpdateReference( sc::RefUpdateContext& ) {} - virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& ) {} - virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& ) {} - virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& ) {} + virtual condformat::ScFormatEntryType GetType() const SAL_OVERRIDE { return condformat::DATE; } + virtual void UpdateReference( sc::RefUpdateContext& ) SAL_OVERRIDE {} + virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& ) SAL_OVERRIDE {} + virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& ) SAL_OVERRIDE {} + virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& ) SAL_OVERRIDE {} - virtual ScFormatEntry* Clone( ScDocument* pDoc = NULL ) const; + virtual ScFormatEntry* Clone( ScDocument* pDoc = NULL ) const SAL_OVERRIDE; - virtual void SetParent( ScConditionalFormat* ) {} + virtual void SetParent( ScConditionalFormat* ) SAL_OVERRIDE {} bool operator==( const ScFormatEntry& ) const; - virtual void startRendering(); - virtual void endRendering(); + virtual void startRendering() SAL_OVERRIDE; + virtual void endRendering() SAL_OVERRIDE; private: condformat::ScCondFormatDateType meType; |