SAL_OVERRIDE, Mac OS X vcl redux

Change-Id: I25f2a79efff7b77651f7cd6c658269e9411c3bdd

4 files changed, 81 insertions, 81 deletions

diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h
index 993a2efe0c57..4e5a91a3b711 100644
--- a/vcl/inc/osx/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -33,8 +33,8 @@ class AquaSalTimer : public SalTimer
     AquaSalTimer();
     virtual ~AquaSalTimer();
 
-    void Start( sal_uLong nMS );
-    void Stop();
+    void Start( sal_uLong nMS ) SAL_OVERRIDE;
+    void Stop() SAL_OVERRIDE;
 
     static void handleStartTimerEvent( NSEvent* pEvent );
 
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 1e946d214b52..c96257d5d43b 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -63,23 +63,23 @@ public:
 public:
 
     // SalBitmap methods
-    bool            Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
-    bool            Create( const SalBitmap& rSalBmp );
-    bool            Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics );
-    bool            Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount );
+    bool            Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) SAL_OVERRIDE;
+    bool            Create( const SalBitmap& rSalBmp ) SAL_OVERRIDE;
+    bool            Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) SAL_OVERRIDE;
+    bool            Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) SAL_OVERRIDE;
     virtual bool    Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
                             Size& rSize,
-                            bool bMask = false );
+                            bool bMask = false ) SAL_OVERRIDE;
 
-    void            Destroy();
+    void            Destroy() SAL_OVERRIDE;
 
-    Size            GetSize() const;
-    sal_uInt16          GetBitCount() const;
+    Size            GetSize() const SAL_OVERRIDE;
+    sal_uInt16          GetBitCount() const SAL_OVERRIDE;
 
-    BitmapBuffer   *AcquireBuffer( bool bReadOnly );
-    void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
+    BitmapBuffer   *AcquireBuffer( bool bReadOnly ) SAL_OVERRIDE;
+    void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) SAL_OVERRIDE;
 
-    bool            GetSystemData( BitmapSystemData& rData );
+    bool            GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
 
 private:
     // quartz helper
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 9d78b8172c62..0653484223c3 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -67,9 +67,9 @@ public:
 
     ~CoreTextFontData();
 
-    PhysicalFontFace*   Clone() const;
-    ImplFontEntry*  CreateFontInstance( FontSelectPattern& ) const;
-    sal_IntPtr      GetFontId() const;
+    PhysicalFontFace*   Clone() const SAL_OVERRIDE;
+    ImplFontEntry*  CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE;
+    sal_IntPtr      GetFontId() const SAL_OVERRIDE;
 
     CoreTextStyle*  CreateTextStyle( const FontSelectPattern& ) const;
     int             GetFontTable( const char pTagName[5], unsigned char* ) const;
@@ -227,67 +227,67 @@ public:
     // InvalidateContext does an UnsetState and sets mrContext to 0
     void                InvalidateContext();
 
-    virtual bool        setClipRegion( const Region& );
+    virtual bool        setClipRegion( const 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 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 sal_uInt8* const* pFlgAry );
+    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    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 sal_uInt8* const* pFlgAry ) SAL_OVERRIDE;
     virtual bool        drawPolyLine(
         const ::basegfx::B2DPolygon&,
         double fTransparency,
         const ::basegfx::B2DVector& rLineWidths,
         basegfx::B2DLineJoin,
-        com::sun::star::drawing::LineCap eLineCap);
+        com::sun::star::drawing::LineCap eLineCap) SAL_OVERRIDE;
 
     // 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_uLong nSize );
+    virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) SAL_OVERRIDE;
 
     virtual bool            drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
-                                             const SalBitmap& rAlphaBitmap );
+                                             const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
 
     bool drawTransformedBitmap(
         const basegfx::B2DPoint& rNull,
         const basegfx::B2DPoint& rX,
         const basegfx::B2DPoint& rY,
         const SalBitmap& rSourceBitmap,
-        const SalBitmap* pAlphaBitmap);
+        const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
 
     virtual bool            drawAlphaRect( long nX, long nY, long nWidth,
-                                           long nHeight, sal_uInt8 nTransparency );
+                                           long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
 
     CGPoint*                makeCGptArray(sal_uInt32 nPoints, const SalPoint*  pPtAry);
     // native widget rendering methods that require mirroring
@@ -295,50 +295,50 @@ public:
                                               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;
 
     // 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 bInvertOnly );
+    virtual void            SetXORMode( bool bSet, bool bInvertOnly ) 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 ImplFontCharMap* GetImplFontCharMap() const;
-    virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
+    virtual const ImplFontCharMap* GetImplFontCharMap() const SAL_OVERRIDE;
+    virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) 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
@@ -358,7 +358,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
@@ -367,7 +367,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 );
+    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded ) SAL_OVERRIDE;
 
     // GetEmbedFontData: gets the font data for a font marked
     // embeddable by GetDevFontList or NULL in case of error
@@ -380,27 +380,27 @@ public:
                                           const sal_Ucs* pUnicodes,
                                           sal_Int32* pWidths,
                                           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 );
+                                            Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
 
-    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 bool                    supportsOperation( OutDevSupportType ) const;
+    virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
+    virtual void                     DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
+    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;
 
 private:
     // differences between VCL, Quartz and kHiThemeOrientation coordinate systems
diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index beec9891bde5..7b53e06c4260 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -58,10 +58,10 @@ public:
     AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData );
     virtual ~AquaSalVirtualDevice();
 
-    virtual SalGraphics*            AcquireGraphics();
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
-    virtual bool                    SetSize( long nNewDX, long nNewDY );
-    virtual void                       GetSize( long& rWidth, long& rHeight );
+    virtual SalGraphics*            AcquireGraphics() SAL_OVERRIDE;
+    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
+    virtual bool                    SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
+    virtual void                       GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_VCL_INC_OSX_SALVD_H