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 /cui/source/tabpages | |
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 'cui/source/tabpages')
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/borderconn.cxx | 20 | ||||
-rw-r--r-- | cui/source/tabpages/tabstpge.cxx | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 81d76d76e2d0..f681ee7a1fba 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -309,7 +309,7 @@ public: virtual void Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, - const SvTreeListEntry* pEntry); + const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; void OfaImpBrwString::Paint( diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 5eea3323ad67..c1d035991c9e 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -187,9 +187,9 @@ public: void NotifyChange( const Bitmap* pBitmap ); protected: - virtual void Paint( const Rectangle& rRect ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; private: diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index b6255128812e..47f77950d706 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -44,9 +44,9 @@ public: virtual ~LineItemWrapper() {} - virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const + virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const SAL_OVERRIDE { return rItem.GetLine(); } - virtual void SetItemValue( SvxLineItem& rItem, const editeng::SvxBorderLine* pLine ) const + virtual void SetItemValue( SvxLineItem& rItem, const editeng::SvxBorderLine* pLine ) const SAL_OVERRIDE { rItem.SetLine( pLine ); } }; @@ -58,11 +58,11 @@ public: inline explicit FrameSelectorWrapper( FrameSelector& rFrameSel, FrameBorderType eBorder ) : SingleControlWrapperType( rFrameSel ), meBorder( eBorder ) {} - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual const editeng::SvxBorderLine* GetControlValue() const; - virtual void SetControlValue( const editeng::SvxBorderLine* pLine ); + virtual const editeng::SvxBorderLine* GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( const editeng::SvxBorderLine* pLine ) SAL_OVERRIDE; private: FrameBorderType meBorder; /// The line this wrapper works with. @@ -115,8 +115,8 @@ public: MetricField& rMfLeft, MetricField& rMfRight, MetricField& rMfTop, MetricField& rMfBottom ); - virtual SvxMarginItem GetControlValue() const; - virtual void SetControlValue( SvxMarginItem aItem ); + virtual SvxMarginItem GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( SvxMarginItem aItem ) SAL_OVERRIDE; private: sfx::Int16MetricFieldWrapper maLeftWrp; @@ -209,8 +209,8 @@ class ShadowControlsWrapper : public sfx::MultiControlWrapper< SvxShadowItem > public: explicit ShadowControlsWrapper( ValueSet& rVsPos, MetricField& rMfSize, ColorListBox& rLbColor ); - virtual SvxShadowItem GetControlValue() const; - virtual void SetControlValue( SvxShadowItem aItem ); + virtual SvxShadowItem GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( SvxShadowItem aItem ) SAL_OVERRIDE; private: ShadowPosWrapper maPosWrp; diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index afaff7c771c8..e1cebfdf46fb 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -52,7 +52,7 @@ public: { } - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; void SetTabulatorTabPage(SvxTabulatorTabPage* pPage) { mpPage = pPage; } void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; } |