diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /vcl/opengl/salbmp.cxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'vcl/opengl/salbmp.cxx')
| -rw-r--r-- | vcl/opengl/salbmp.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index d3a2ade2ae86..14250b7b01a8 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -263,7 +263,7 @@ public: : mrPalette( rPalette ) { } - virtual const BitmapColor& ReadPixel() SAL_OVERRIDE + virtual const BitmapColor& ReadPixel() override { assert( mrPalette.GetEntryCount() > *mpData ); return mrPalette[ *mpData++ ]; @@ -284,13 +284,13 @@ public: , mnShift(4) { } - virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE + virtual void StartLine( sal_uInt8* pLine ) override { mpData = pLine; mnX = 0; mnShift = 4; } - virtual const BitmapColor& ReadPixel() SAL_OVERRIDE + virtual const BitmapColor& ReadPixel() override { sal_uInt32 nIdx = ( mpData[mnX >> 1] >> mnShift) & 0x0f; assert( mrPalette.GetEntryCount() > nIdx ); @@ -313,12 +313,12 @@ public: , mnX(0) { } - virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE + virtual void StartLine( sal_uInt8* pLine ) override { mpData = pLine; mnX = 0; } - virtual const BitmapColor& ReadPixel() SAL_OVERRIDE + virtual const BitmapColor& ReadPixel() override { const BitmapColor& rColor = mrPalette[ (mpData[mnX >> 3 ] >> ( 7 - ( mnX & 7 ) )) & 1]; mnX++; |