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 /svx/inc/galobj.hxx | |
| 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 '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 ad04daad9a70..79110b3ddd7e 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -98,10 +98,10 @@ private: GalSoundType eSoundType; - virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const; - virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); + virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const SAL_OVERRIDE; + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SAL_OVERRIDE; - virtual sal_uInt16 GetVersion() const { return 6; } + virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return 6; } public: @@ -109,8 +109,8 @@ public: SgaObjectSound( const INetURLObject& rURL ); virtual ~SgaObjectSound(); - virtual SgaObjKind GetObjKind() const { return SGA_OBJ_SOUND; } - virtual BitmapEx GetThumbBmp() const; + virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_SOUND; } + virtual BitmapEx GetThumbBmp() const SAL_OVERRIDE; GalSoundType GetSoundType() const { return eSoundType; } }; @@ -124,10 +124,10 @@ private: sal_Bool CreateThumb( const FmFormModel& rModel ); - virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const; - virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); + virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const SAL_OVERRIDE; + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SAL_OVERRIDE; - virtual sal_uInt16 GetVersion() const { return 5; } + virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return 5; } public: @@ -136,7 +136,7 @@ public: SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL ); virtual ~SgaObjectSvDraw() {}; - virtual SgaObjKind GetObjKind() const { return SGA_OBJ_SVDRAW; } + virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_SVDRAW; } }; class SgaObjectBmp: public SgaObject @@ -145,10 +145,10 @@ private: void Init( const Graphic& rGraphic, const INetURLObject& rURL ); - virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const; - virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); + virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const SAL_OVERRIDE; + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SAL_OVERRIDE; - virtual sal_uInt16 GetVersion() const { return 5; } + virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return 5; } public: @@ -157,7 +157,7 @@ public: SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormat ); virtual ~SgaObjectBmp() {}; - virtual SgaObjKind GetObjKind() const { return SGA_OBJ_BMP; } + virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_BMP; } }; class SgaObjectAnim : public SgaObjectBmp @@ -173,7 +173,7 @@ public: virtual ~SgaObjectAnim() {}; - virtual SgaObjKind GetObjKind() const { return SGA_OBJ_ANIM; } + virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_ANIM; } }; class SgaObjectINet : public SgaObjectAnim @@ -189,7 +189,7 @@ public: virtual ~SgaObjectINet() {}; - virtual SgaObjKind GetObjKind() const { return SGA_OBJ_INET; } + virtual SgaObjKind GetObjKind() const SAL_OVERRIDE { return SGA_OBJ_INET; } }; #endif |