vcl: add SAL_OVERRIDE attributes to Windows-specific classes

and fix a bug where SalObject::Enabled(bool) should be virtual,
introduced by my commit
b44cbb26efe1d0b0950b1e1613e131b506dc3876
"new loplugin: change virtual methods to non-virtual"

Change-Id: I08cdddb36eed887ea7bd01f6260fa5fd89d12429
Reviewed-on: https://gerrit.libreoffice.org/14273
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

1 files changed, 75 insertions, 75 deletions

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 97431fd9342c..66a92011ae80 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -77,16 +77,16 @@ public:
                                 BYTE nPitchAndFamily  );
     virtual                 ~ImplWinFontData();
 
-    virtual PhysicalFontFace*   Clone() const;
-    virtual ImplFontEntry*  CreateFontInstance( FontSelectPattern& ) const;
-    virtual sal_IntPtr      GetFontId() const;
+    virtual PhysicalFontFace*   Clone() const SAL_OVERRIDE;
+    virtual ImplFontEntry*  CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE;
+    virtual sal_IntPtr      GetFontId() const SAL_OVERRIDE;
     void                    SetFontId( sal_IntPtr nId ) { mnId = nId; }
     void                    UpdateFromHDC( HDC ) const;
 
     bool                    HasChar( sal_uInt32 cChar ) const;
 
-    BYTE                GetCharSet() const          { return meWinCharSet; }
-    BYTE                GetPitchAndFamily() const   { return mnPitchAndFamily; }
+    BYTE                    GetCharSet() const          { return meWinCharSet; }
+    BYTE                    GetPitchAndFamily() const   { return mnPitchAndFamily; }
     bool                    IsGlyphApiDisabled() const  { return mbDisableGlyphApi; }
     bool                    SupportsKorean() const      { return mbHasKoreanRange; }
     bool                    SupportsCJK() const         { return mbHasCJKSupport; }
@@ -124,8 +124,8 @@ private:
     mutable const Ucs2SIntMap*      mpEncodingVector;
     mutable vcl::FontCapabilities   maFontCapabilities;
 
-    BYTE                meWinCharSet;
-    BYTE                mnPitchAndFamily;
+    BYTE                    meWinCharSet;
+    BYTE                    mnPitchAndFamily;
     bool                    mbAliasSymbolsHigh;
     bool                    mbAliasSymbolsLow;
 private:
@@ -214,7 +214,7 @@ private:
     ImplFontAttrCache*      mpFontAttrCache;    // Cache font attributes from files in so/share/fonts
     bool                    mbFontKernInit;     // FALSE: FontKerns must be queried
     KERNINGPAIR*            mpFontKernPairs;    // Kerning Pairs of the current Font
-    sal_uIntPtr                 mnFontKernPairCount;// Number of Kerning Pairs of the current Font
+    sal_uIntPtr             mnFontKernPairCount;// Number of Kerning Pairs of the current Font
     int                     mnPenWidth;         // Linienbreite
 
 public:
@@ -257,63 +257,63 @@ public:
     void setHWND(HWND hWnd);
 
 protected:
-    virtual bool        setClipRegion( const vcl::Region& );
+    virtual bool        setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    virtual void        drawPixel( long nX, long nY );
-    virtual void        drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void        drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
-    virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
+    virtual void        drawPixel( long nX, long nY ) SAL_OVERRIDE;
+    virtual void        drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
+    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void        drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+    virtual void        drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+    virtual void        drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
+    virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
     virtual bool        drawPolyLine(
         const ::basegfx::B2DPolygon&,
         double fTransparency,
         const ::basegfx::B2DVector& rLineWidth,
         basegfx::B2DLineJoin,
-        com::sun::star::drawing::LineCap);
-    virtual bool    drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
-    virtual bool    drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
-    virtual bool    drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
+        com::sun::star::drawing::LineCap) SAL_OVERRIDE;
+    virtual bool        drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+    virtual bool        drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+    virtual bool        drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) SAL_OVERRIDE;
     virtual bool        drawGradient( const tools::PolyPolygon&, const Gradient& ) SAL_OVERRIDE { return false; };
 
     // CopyArea --> No RasterOp, but ClipRegion
     virtual void        copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
-                                  long nSrcHeight, sal_uInt16 nFlags );
+                                  long nSrcHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void        copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics );
-    virtual void        drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap );
+    virtual void        copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
+    virtual void        drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
     virtual void        drawBitmap( const SalTwoRect& rPosAry,
                                     const SalBitmap& rSalBitmap,
-                                    SalColor nTransparentColor );
+                                    SalColor nTransparentColor ) SAL_OVERRIDE;
     virtual void        drawBitmap( const SalTwoRect& rPosAry,
                                     const SalBitmap& rSalBitmap,
-                                    const SalBitmap& rTransparentBitmap );
+                                    const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
     virtual void        drawMask( const SalTwoRect& rPosAry,
                                   const SalBitmap& rSalBitmap,
-                                  SalColor nMaskColor );
+                                  SalColor nMaskColor ) SAL_OVERRIDE;
 
-    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor    getPixel( long nX, long nY );
+    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual SalColor    getPixel( long nX, long nY ) SAL_OVERRIDE;
 
     // invert --> ClipRegion (only Windows or VirDevs)
-    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
-    virtual void        invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) SAL_OVERRIDE;
+    virtual void        invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
 
-    virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
+    virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) SAL_OVERRIDE;
 
     // native widget rendering methods that require mirroring
     virtual bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                               const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
     virtual bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
-                                           const OUString& aCaption );
+                                           const OUString& aCaption ) SAL_OVERRIDE;
     virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const OUString& aCaption,
-                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
 
     virtual bool        blendBitmap( const SalTwoRect&,
                                      const SalBitmap& rBitmap ) SAL_OVERRIDE;
@@ -325,14 +325,14 @@ protected:
 
     virtual bool        drawAlphaBitmap( const SalTwoRect&,
                                          const SalBitmap& rSourceBitmap,
-                                         const SalBitmap& rAlphaBitmap );
-    virtual bool drawTransformedBitmap(
-        const basegfx::B2DPoint& rNull,
-        const basegfx::B2DPoint& rX,
-        const basegfx::B2DPoint& rY,
-        const SalBitmap& rSourceBitmap,
-        const SalBitmap* pAlphaBitmap);
-    virtual bool        drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency );
+                                         const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+    virtual bool       drawTransformedBitmap(
+                           const basegfx::B2DPoint& rNull,
+                           const basegfx::B2DPoint& rX,
+                           const basegfx::B2DPoint& rY,
+                           const SalBitmap& rSourceBitmap,
+                           const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
+    virtual bool       drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
 
 private:
     // local helpers
@@ -344,45 +344,45 @@ public:
     // public SalGraphics methods, the interface to the independent vcl part
 
     // get device resolution
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
+    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
     // get the depth of the device
-    virtual sal_uInt16          GetBitCount() const;
+    virtual sal_uInt16          GetBitCount() const SAL_OVERRIDE;
     // get the width of the device
-    virtual long            GetGraphicsWidth() const;
+    virtual long            GetGraphicsWidth() const SAL_OVERRIDE;
 
     // set the clip region to empty
-    virtual void            ResetClipRegion();
+    virtual void            ResetClipRegion() SAL_OVERRIDE;
 
     // set the line color to transparent (= don't draw lines)
-    virtual void            SetLineColor();
+    virtual void            SetLineColor() SAL_OVERRIDE;
     // set the line color to a specific color
-    virtual void            SetLineColor( SalColor nSalColor );
+    virtual void            SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
     // set the fill color to transparent (= don't fill)
-    virtual void            SetFillColor();
+    virtual void            SetFillColor() SAL_OVERRIDE;
     // set the fill color to a specific color, shapes will be
     // filled accordingly
-    virtual void            SetFillColor( SalColor nSalColor );
+    virtual void            SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
     // enable/disable XOR drawing
-    virtual void            SetXORMode( bool bSet, bool );
+    virtual void            SetXORMode( bool bSet, bool ) SAL_OVERRIDE;
     // set line color for raster operations
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
+    virtual void            SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
     // set fill color for raster operations
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
+    virtual void            SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
     // set the text color to a specific color
-    virtual void            SetTextColor( SalColor nSalColor );
+    virtual void            SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
     // set the font
-    virtual sal_uInt16         SetFont( FontSelectPattern*, int nFallbackLevel );
+    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
     // get the current font's metrics
-    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
     // get the repertoire of the current font
-    virtual const FontCharMapPtr GetFontCharMap() const;
+    virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE;
     // get the layout capabilities of the current font
-    virtual bool GetFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const;
+    virtual bool GetFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const SAL_OVERRIDE;
     // graphics must fill supplied font list
-    virtual void            GetDevFontList( PhysicalFontCollection* );
+    virtual void            GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
     // graphics must drop any cached font info
-    virtual void ClearDevFontCache();
-    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName );
+    virtual void            ClearDevFontCache() SAL_OVERRIDE;
+    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
     // returns TRUE if creation of subset was successful
@@ -402,7 +402,7 @@ public:
                                               sal_Int32* pWidths,
                                               int nGlyphs,
                                               FontSubsetInfo& rInfo // out parameter
-                                              );
+                                              ) SAL_OVERRIDE;
 
     // GetFontEncodingVector: a method to get the encoding map Unicode
     // to font encoded character; this is only used for type1 fonts and
@@ -411,7 +411,7 @@ public:
     // glyphs with only a name) exist it is set to the corresponding
     // map for non encoded glyphs; the encoding vector contains -1
     // as encoding for these cases
-    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** );
+    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) SAL_OVERRIDE;
 
     // GetEmbedFontData: gets the font data for a font marked
     // embeddable by GetDevFontList or NULL in case of error
@@ -425,27 +425,27 @@ public:
                                           sal_Int32* pWidths,
                                           size_t nLen,
                                           FontSubsetInfo& rInfo,
-                                          long* pDataLen );
+                                          long* pDataLen ) SAL_OVERRIDE;
     // frees the font data again
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
-                                            Ucs2UIntMap& rUnicodeEnc );
-    virtual int             GetMinKashidaWidth();
+                                            Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
+            int             GetMinKashidaWidth();
 
-    virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& );
-    virtual bool            GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& );
+    virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& ) SAL_OVERRIDE;
+    virtual bool            GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
 
-    virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void                     DrawServerFontLayout( const ServerFontLayout& );
+    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
+    virtual void            DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
 
-    virtual bool            supportsOperation( OutDevSupportType ) const;
+    virtual bool            supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
     // Query the platform layer for control support
-    virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
+    virtual bool            IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
 
-    virtual SystemGraphicsData GetGraphicsData() const;
-    virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const;
+    virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE;
+    virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const SAL_OVERRIDE;
 
     virtual void               BeginPaint() SAL_OVERRIDE;
     virtual void               EndPaint() SAL_OVERRIDE;