diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
| commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
| tree | a70f4957c454b443520cbf91250c41d9eea80017 /vcl/generic/glyphs | |
| parent | cp#1000044 DOC import: fProtEnabled means document is not totally read-only (diff) | |
| download | core-70cc2b191b95fbc210bc1f0f6a7159f341894f0f.tar.gz core-70cc2b191b95fbc210bc1f0f6a7159f341894f0f.zip | |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'vcl/generic/glyphs')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.hxx | 6 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/glyphs/scrptrun.h | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index a0915ea72bdd..7015b343f960 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -168,9 +168,9 @@ public: FtFontInfo* GetFtFontInfo() const { return mpFtFontInfo; } - virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const; - virtual PhysicalFontFace* Clone() const { return new ImplFTSFontData( *this ); } - virtual sal_IntPtr GetFontId() const { return mpFtFontInfo->GetFontId(); } + virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE; + virtual PhysicalFontFace* Clone() const SAL_OVERRIDE { return new ImplFTSFontData( *this ); } + virtual sal_IntPtr GetFontId() const SAL_OVERRIDE { return mpFtFontInfo->GetFontId(); } static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( IFTSFONT_MAGIC ); } }; diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 84f0a494e1d3..dfbd653224a2 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -329,7 +329,7 @@ public: HbLayoutEngine(ServerFont&); virtual ~HbLayoutEngine(); - virtual bool layout(ServerFontLayout&, ImplLayoutArgs&); + virtual bool layout(ServerFontLayout&, ImplLayoutArgs&) SAL_OVERRIDE; }; HbLayoutEngine::HbLayoutEngine(ServerFont& rServerFont) diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h index bdea66109068..72975464a38e 100644 --- a/vcl/generic/glyphs/scrptrun.h +++ b/vcl/generic/glyphs/scrptrun.h @@ -37,6 +37,9 @@ #ifndef __SCRPTRUN_H #define __SCRPTRUN_H +#include <sal/config.h> + +#include <sal/types.h> #include "unicode/utypes.h" #include "unicode/uobject.h" #include "unicode/uscript.h" @@ -81,7 +84,7 @@ public: * * @stable ICU 2.2 */ - virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); } + virtual inline UClassID getDynamicClassID() const SAL_OVERRIDE { return getStaticClassID(); } /** * ICU "poor man's RTTI", returns a UClassID for this class. |