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 /cui/source/tabpages/borderconn.cxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'cui/source/tabpages/borderconn.cxx')
| -rw-r--r-- | cui/source/tabpages/borderconn.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 6dc3b8e7ffee..7b4020fb4dea 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 SAL_OVERRIDE + virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const override { return rItem.GetLine(); } - virtual void SetItemValue( SvxLineItem& rItem, const editeng::SvxBorderLine* pLine ) const SAL_OVERRIDE + virtual void SetItemValue( SvxLineItem& rItem, const editeng::SvxBorderLine* pLine ) const override { rItem.SetLine( pLine ); } }; @@ -58,11 +58,11 @@ public: inline explicit FrameSelectorWrapper( FrameSelector& rFrameSel, FrameBorderType eBorder ) : SingleControlWrapperType( rFrameSel ), meBorder( eBorder ) {} - virtual bool IsControlDontKnow() const SAL_OVERRIDE; - virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; + virtual bool IsControlDontKnow() const override; + virtual void SetControlDontKnow( bool bSet ) override; - virtual const editeng::SvxBorderLine* GetControlValue() const SAL_OVERRIDE; - virtual void SetControlValue( const editeng::SvxBorderLine* pLine ) SAL_OVERRIDE; + virtual const editeng::SvxBorderLine* GetControlValue() const override; + virtual void SetControlValue( const editeng::SvxBorderLine* pLine ) 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 SAL_OVERRIDE; - virtual void SetControlValue( SvxMarginItem aItem ) SAL_OVERRIDE; + virtual SvxMarginItem GetControlValue() const override; + virtual void SetControlValue( SvxMarginItem aItem ) 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 SAL_OVERRIDE; - virtual void SetControlValue( SvxShadowItem aItem ) SAL_OVERRIDE; + virtual SvxShadowItem GetControlValue() const override; + virtual void SetControlValue( SvxShadowItem aItem ) override; private: ShadowPosWrapper maPosWrp; |