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/sfx2/itemconnect.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/sfx2/itemconnect.hxx')
| -rw-r--r-- | include/sfx2/itemconnect.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index 1f10eaa2a6ed..2f86bf1bda92 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -252,11 +252,11 @@ public: protected: /** Actions according to current flags for the control. */ - virtual void ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual void ApplyFlags( const SfxItemSet& rItemSet ) override; /** Resets the control according to the item contents. */ - virtual void Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rItemSet ) override; /** Fills the item set according to the control's state. */ - virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) override; ItemWrapperType maItemWrp; ControlWrapperRef mxCtrlWrp; @@ -281,9 +281,9 @@ public: ItemConnFlags nFlags = ITEMCONN_DEFAULT ); protected: - virtual void ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; + virtual void ApplyFlags( const SfxItemSet& rItemSet ) override; + virtual void Reset( const SfxItemSet& rItemSet ) override; + virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) override; private: sal_uInt16 mnSlot; @@ -432,9 +432,9 @@ public: void AddConnection( ItemConnectionBase* pConnection ); protected: - virtual void ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; + virtual void ApplyFlags( const SfxItemSet& rItemSet ) override; + virtual void Reset( const SfxItemSet& rItemSet ) override; + virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) override; private: std::unique_ptr< ItemConnectionArrayImpl > mxImpl; |