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 /svx/inc/galobj.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'svx/inc/galobj.hxx')
| -rw-r--r-- | svx/inc/galobj.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 24c923c01a75..77cfb6e60659 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -91,10 +91,10 @@ private: GalSoundType eSoundType; - virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const SAL_OVERRIDE; - virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SAL_OVERRIDE; + virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const override; + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) override; - virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return 6; } + virtual sal_uInt16 GetVersion() const override { return 6; } public: @@ -102,8 +102,8 @@ public: SgaObjectSound( const INetURLObject& rURL ); virtual ~SgaObjectSound(); - virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_SOUND; } - virtual BitmapEx GetThumbBmp() const SAL_OVERRIDE; + virtual SgaObjKind GetObjKind() const override { return SGA_OBJ_SOUND; } + virtual BitmapEx GetThumbBmp() const override; }; class FmFormModel; @@ -116,10 +116,10 @@ private: bool CreateThumb( const FmFormModel& rModel ); - virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const SAL_OVERRIDE; - virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SAL_OVERRIDE; + virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const override; + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) override; - virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return 5; } + virtual sal_uInt16 GetVersion() const override { return 5; } public: @@ -128,7 +128,7 @@ public: SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL ); virtual ~SgaObjectSvDraw() {}; - virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_SVDRAW; } + virtual SgaObjKind GetObjKind() const override { return SGA_OBJ_SVDRAW; } }; class SgaObjectBmp: public SgaObject @@ -137,10 +137,10 @@ private: void Init( const Graphic& rGraphic, const INetURLObject& rURL ); - virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const SAL_OVERRIDE; - virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SAL_OVERRIDE; + virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const override; + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) override; - virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return 5; } + virtual sal_uInt16 GetVersion() const override { return 5; } public: @@ -149,7 +149,7 @@ public: SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormat ); virtual ~SgaObjectBmp() {}; - virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_BMP; } + virtual SgaObjKind GetObjKind() const override { return SGA_OBJ_BMP; } }; class SgaObjectAnim : public SgaObjectBmp @@ -165,7 +165,7 @@ public: virtual ~SgaObjectAnim() {}; - virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_ANIM; } + virtual SgaObjKind GetObjKind() const override { return SGA_OBJ_ANIM; } }; class SgaObjectINet : public SgaObjectAnim @@ -181,7 +181,7 @@ public: virtual ~SgaObjectINet() {}; - virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_INET; } + virtual SgaObjKind GetObjKind() const override { return SGA_OBJ_INET; } }; #endif |