Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

2 files changed, 40 insertions, 40 deletions

diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 8e8f27572d3c..5d03b7a3abd2 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -35,25 +35,25 @@ public:
     explicit        CTLayout( const CoreTextStyle* );
     virtual         ~CTLayout();
 
-    virtual bool    LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;
-    virtual void    AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
-    virtual void    DrawText( SalGraphics& ) const SAL_OVERRIDE;
-    virtual bool    DrawTextSpecial( SalGraphics& rGraphics, sal_uInt32 flags ) const SAL_OVERRIDE;
+    virtual bool    LayoutText( ImplLayoutArgs& ) override;
+    virtual void    AdjustLayout( ImplLayoutArgs& ) override;
+    virtual void    DrawText( SalGraphics& ) const override;
+    virtual bool    DrawTextSpecial( SalGraphics& rGraphics, sal_uInt32 flags ) const override;
 
     virtual int     GetNextGlyphs( int nLen, sal_GlyphId* pOutGlyphIds, Point& rPos, int&,
                                    DeviceCoordinate* pGlyphAdvances, int* pCharIndexes,
-                                   const PhysicalFontFace** pFallbackFonts ) const SAL_OVERRIDE;
-
-    virtual DeviceCoordinate GetTextWidth() const SAL_OVERRIDE;
-    virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const SAL_OVERRIDE;
-    virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const SAL_OVERRIDE;
-    virtual void    GetCaretPositions( int nArraySize, long* pCaretXArray ) const SAL_OVERRIDE;
-    virtual bool    GetBoundRect( SalGraphics&, Rectangle& ) const SAL_OVERRIDE;
-
-    virtual void    InitFont() const SAL_OVERRIDE;
-    virtual void    MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE;
-    virtual void    DropGlyph( int nStart ) SAL_OVERRIDE;
-    virtual void    Simplify( bool bIsBase ) SAL_OVERRIDE;
+                                   const PhysicalFontFace** pFallbackFonts ) const override;
+
+    virtual DeviceCoordinate GetTextWidth() const override;
+    virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const override;
+    virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const override;
+    virtual void    GetCaretPositions( int nArraySize, long* pCaretXArray ) const override;
+    virtual bool    GetBoundRect( SalGraphics&, Rectangle& ) const override;
+
+    virtual void    InitFont() const override;
+    virtual void    MoveGlyph( int nStart, long nNewXPos ) override;
+    virtual void    DropGlyph( int nStart ) override;
+    virtual void    Simplify( bool bIsBase ) override;
 
 private:
     void            drawCTLine(AquaSalGraphics& rAquaGraphics, CTLineRef ctline, const CoreTextStyle* const pStyle) const;
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index ea6b6f616fb3..bbf1a54c9436 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -363,18 +363,18 @@ class ImplPixelFormat32 : public ImplPixelFormat
 {
     sal_uInt8* pData;
 public:
-    virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE { pData = pLine; }
-    virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
+    virtual void StartLine( sal_uInt8* pLine ) override { pData = pLine; }
+    virtual void SkipPixel( sal_uInt32 nPixel ) override
     {
         pData += nPixel << 2;
     }
-    virtual ColorData ReadPixel() SAL_OVERRIDE
+    virtual ColorData ReadPixel() override
     {
         const ColorData c = RGB_COLORDATA( pData[1], pData[2], pData[3] );
         pData += 4;
         return c;
     }
-    virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
+    virtual void WritePixel( ColorData nColor ) override
     {
         *pData++ = 0;
         *pData++ = COLORDATA_RED( nColor );
@@ -388,18 +388,18 @@ class ImplPixelFormat24 : public ImplPixelFormat
 {
     sal_uInt8* pData;
 public:
-    virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE { pData = pLine; }
-    virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
+    virtual void StartLine( sal_uInt8* pLine ) override { pData = pLine; }
+    virtual void SkipPixel( sal_uInt32 nPixel ) override
     {
         pData += (nPixel << 1) + nPixel;
     }
-    virtual ColorData ReadPixel() SAL_OVERRIDE
+    virtual ColorData ReadPixel() override
     {
         const ColorData c = RGB_COLORDATA( pData[2], pData[1], pData[0] );
         pData += 3;
         return c;
     }
-    virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
+    virtual void WritePixel( ColorData nColor ) override
     {
         *pData++ = COLORDATA_BLUE( nColor );
         *pData++ = COLORDATA_GREEN( nColor );
@@ -413,21 +413,21 @@ class ImplPixelFormat16 : public ImplPixelFormat
     sal_uInt16* pData;
 public:
 
-    virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE
+    virtual void StartLine( sal_uInt8* pLine ) override
     {
         pData = reinterpret_cast<sal_uInt16*>(pLine);
     }
-    virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
+    virtual void SkipPixel( sal_uInt32 nPixel ) override
     {
         pData += nPixel;
     }
-    virtual ColorData ReadPixel() SAL_OVERRIDE
+    virtual ColorData ReadPixel() override
     {
         const ColorData c = RGB_COLORDATA( (*pData & 0xf800) >> 8, (*pData & 0x07e0) >> 3 , (*pData & 0x001f) << 3 );
         pData++;
         return c;
     }
-    virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
+    virtual void WritePixel( ColorData nColor ) override
     {
         *pData++ =  ((COLORDATA_RED( nColor ) & 0xf8 ) << 8 ) |
                     ((COLORDATA_GREEN( nColor ) & 0xfc ) << 3 ) |
@@ -446,16 +446,16 @@ public:
         : mrPalette( rPalette )
         {
         }
-    virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE { pData = pLine; }
-    virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
+    virtual void StartLine( sal_uInt8* pLine ) override { pData = pLine; }
+    virtual void SkipPixel( sal_uInt32 nPixel ) override
         {
             pData += nPixel;
         }
-    virtual ColorData ReadPixel() SAL_OVERRIDE
+    virtual ColorData ReadPixel() override
         {
             return mrPalette[ *pData++ ].operator Color().GetColor();
         }
-    virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
+    virtual void WritePixel( ColorData nColor ) override
         {
             const BitmapColor aColor( COLORDATA_RED( nColor ),
                                       COLORDATA_GREEN( nColor ),
@@ -477,7 +477,7 @@ public:
         : mrPalette( rPalette )
         {
         }
-    virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
+    virtual void SkipPixel( sal_uInt32 nPixel ) override
         {
             mnX += nPixel;
             if( (nPixel & 1) )
@@ -485,20 +485,20 @@ public:
                 mnShift ^= 4;
             }
         }
-    virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE
+    virtual void StartLine( sal_uInt8* pLine ) override
         {
             pData = pLine;
             mnX = 0;
             mnShift = 4;
         }
-    virtual ColorData ReadPixel() SAL_OVERRIDE
+    virtual ColorData ReadPixel() override
         {
             const BitmapColor& rColor = mrPalette[( pData[mnX >> 1] >> mnShift) & 0x0f];
             mnX++;
             mnShift ^= 4;
             return rColor.operator Color().GetColor();
         }
-    virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
+    virtual void WritePixel( ColorData nColor ) override
         {
             const BitmapColor aColor( COLORDATA_RED( nColor ),
                                       COLORDATA_GREEN( nColor ),
@@ -522,22 +522,22 @@ public:
         : mrPalette( rPalette )
         {
         }
-    virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
+    virtual void SkipPixel( sal_uInt32 nPixel ) override
         {
             mnX += nPixel;
         }
-    virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE
+    virtual void StartLine( sal_uInt8* pLine ) override
         {
             pData = pLine;
             mnX = 0;
         }
-    virtual ColorData ReadPixel() SAL_OVERRIDE
+    virtual ColorData ReadPixel() override
         {
             const BitmapColor& rColor = mrPalette[ (pData[mnX >> 3 ] >> ( 7 - ( mnX & 7 ) )) & 1];
             mnX++;
             return rColor.operator Color().GetColor();
         }
-    virtual void WritePixel( ColorData nColor ) SAL_OVERRIDE
+    virtual void WritePixel( ColorData nColor ) override
         {
             const BitmapColor aColor( COLORDATA_RED( nColor ),
                                       COLORDATA_GREEN( nColor ),