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/avmedia | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/avmedia')
| -rw-r--r-- | include/avmedia/mediaitem.hxx | 10 | ||||
| -rw-r--r-- | include/avmedia/mediaplayer.hxx | 6 | ||||
| -rw-r--r-- | include/avmedia/mediatoolbox.hxx | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index bd48ae221ff4..2ba3c1d1e25b 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -71,15 +71,15 @@ public: MediaItem( const MediaItem& rMediaItem ); virtual ~MediaItem(); - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, OUString& rText, - const IntlWrapper *pIntl ) const SAL_OVERRIDE; - virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; + const IntlWrapper *pIntl ) const override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; void merge( const MediaItem& rMediaItem ); diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index bb24bd08ff0a..d2a0ce04b9b8 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -45,7 +45,7 @@ public: MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, vcl::Window* pParent ); virtual ~MediaFloater(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately ); @@ -53,8 +53,8 @@ public: private: - virtual void Resize() SAL_OVERRIDE; - virtual void ToggleFloatingMode() SAL_OVERRIDE; + virtual void Resize() override; + virtual void ToggleFloatingMode() override; MediaWindow* mpMediaWindow; }; diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index e0ccd86ca058..89e6083cf986 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -40,8 +40,8 @@ public: MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX ); virtual ~MediaToolBoxControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override; private: |