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 /basebmp | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'basebmp')
-rw-r--r-- | basebmp/source/bitmapdevice.cxx | 42 | ||||
-rw-r--r-- | basebmp/test/bmpmasktest.cxx | 2 | ||||
-rw-r--r-- | basebmp/test/bmptest.cxx | 2 | ||||
-rw-r--r-- | basebmp/test/cliptest.cxx | 2 | ||||
-rw-r--r-- | basebmp/test/filltest.cxx | 2 | ||||
-rw-r--r-- | basebmp/test/linetest.cxx | 2 | ||||
-rw-r--r-- | basebmp/test/masktest.cxx | 2 | ||||
-rw-r--r-- | basebmp/test/polytest.cxx | 2 |
8 files changed, 28 insertions, 28 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 040015e11d3d..2100710bec69 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -380,7 +380,7 @@ namespace return std::dynamic_pointer_cast< BitmapRenderer >( bmp ); } - virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const SAL_OVERRIDE + virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const override { // TODO(P1): dynamic_cast usually called twice for // compatible formats @@ -400,7 +400,7 @@ namespace return pMask; } - virtual bool isCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const SAL_OVERRIDE + virtual bool isCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const override { // TODO(P1): dynamic_cast usually called twice for // compatible formats @@ -413,7 +413,7 @@ namespace } virtual void clear_i( Color fillColor, - const basegfx::B2IBox& rBounds ) SAL_OVERRIDE + const basegfx::B2IBox& rBounds ) override { fillImage(destIterRange(maBegin, maRawAccessor, @@ -426,7 +426,7 @@ namespace virtual void setPixel_i( const basegfx::B2IPoint& rPt, Color pixelColor, - DrawMode drawMode ) SAL_OVERRIDE + DrawMode drawMode ) override { const DestIterator pixel( maBegin + vigra::Diff2D(rPt.getX(), @@ -443,7 +443,7 @@ namespace virtual void setPixel_i( const basegfx::B2IPoint& rPt, Color pixelColor, DrawMode drawMode, - const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE + const BitmapDeviceSharedPtr& rClip ) override { std::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rClip) ); OSL_ASSERT( pMask ); @@ -464,7 +464,7 @@ namespace damagedPixel(rPt); } - virtual Color getPixel_i(const basegfx::B2IPoint& rPt ) SAL_OVERRIDE + virtual Color getPixel_i(const basegfx::B2IPoint& rPt ) override { const DestIterator pixel( maBegin + vigra::Diff2D(rPt.getX(), @@ -472,7 +472,7 @@ namespace return maAccessor(pixel); } - virtual sal_uInt32 getPixelData_i( const basegfx::B2IPoint& rPt ) SAL_OVERRIDE + virtual sal_uInt32 getPixelData_i( const basegfx::B2IPoint& rPt ) override { const DestIterator pixel( maBegin + vigra::Diff2D(rPt.getX(), @@ -553,7 +553,7 @@ namespace const basegfx::B2IPoint& rPt2, const basegfx::B2IBox& rBounds, Color lineColor, - DrawMode drawMode ) SAL_OVERRIDE + DrawMode drawMode ) override { implDrawLine(rPt1,rPt2,rBounds,lineColor, maBegin, @@ -574,7 +574,7 @@ namespace const basegfx::B2IBox& rBounds, Color lineColor, DrawMode drawMode, - const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE + const BitmapDeviceSharedPtr& rClip ) override { implDrawLine(rPt1,rPt2,rBounds,lineColor, getMaskedIter(rClip), @@ -617,7 +617,7 @@ namespace virtual void drawPolygon_i(const basegfx::B2DPolygon& rPoly, const basegfx::B2IBox& rBounds, Color lineColor, - DrawMode drawMode ) SAL_OVERRIDE + DrawMode drawMode ) override { if( drawMode == DrawMode::XOR ) implDrawPolygon( rPoly, rBounds, lineColor, @@ -633,7 +633,7 @@ namespace const basegfx::B2IBox& rBounds, Color lineColor, DrawMode drawMode, - const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE + const BitmapDeviceSharedPtr& rClip ) override { if( drawMode == DrawMode::XOR ) implDrawPolygon( rPoly, rBounds, lineColor, @@ -674,7 +674,7 @@ namespace virtual void fillPolyPolygon_i(const basegfx::B2DPolyPolygon& rPoly, Color fillColor, DrawMode drawMode, - const basegfx::B2IBox& rBounds ) SAL_OVERRIDE + const basegfx::B2IBox& rBounds ) override { if( drawMode == DrawMode::XOR ) implFillPolyPolygon( rPoly, fillColor, @@ -692,7 +692,7 @@ namespace Color fillColor, DrawMode drawMode, const basegfx::B2IBox& rBounds, - const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE + const BitmapDeviceSharedPtr& rClip ) override { if( drawMode == DrawMode::XOR ) implFillPolyPolygon( rPoly, fillColor, @@ -800,7 +800,7 @@ namespace virtual void drawBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap, const basegfx::B2IBox& rSrcRect, const basegfx::B2IBox& rDstRect, - DrawMode drawMode ) SAL_OVERRIDE + DrawMode drawMode ) override { if( isCompatibleBitmap( rSrcBitmap ) ) { @@ -835,7 +835,7 @@ namespace const basegfx::B2IBox& rSrcRect, const basegfx::B2IBox& rDstRect, DrawMode drawMode, - const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE + const BitmapDeviceSharedPtr& rClip ) override { if( isCompatibleBitmap( rSrcBitmap ) ) { @@ -865,7 +865,7 @@ namespace virtual void drawMaskedColor_i(Color aSrcColor, const BitmapDeviceSharedPtr& rAlphaMask, const basegfx::B2IBox& rSrcRect, - const basegfx::B2IPoint& rDstPoint ) SAL_OVERRIDE + const basegfx::B2IPoint& rDstPoint ) override { std::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rAlphaMask) ); std::shared_ptr<alphamask_bitmap_type> pAlpha( getCompatibleAlphaMask(rAlphaMask) ); @@ -915,7 +915,7 @@ namespace const BitmapDeviceSharedPtr& rAlphaMask, const basegfx::B2IBox& rSrcRect, const basegfx::B2IPoint& rDstPoint, - const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE + const BitmapDeviceSharedPtr& rClip ) override { std::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rAlphaMask) ); std::shared_ptr<alphamask_bitmap_type> pAlpha( getCompatibleAlphaMask(rAlphaMask) ); @@ -1043,7 +1043,7 @@ namespace const BitmapDeviceSharedPtr& rMask, const basegfx::B2IBox& rSrcRect, const basegfx::B2IBox& rDstRect, - DrawMode drawMode ) SAL_OVERRIDE + DrawMode drawMode ) override { if( isCompatibleClipMask(rMask) && isCompatibleBitmap(rSrcBitmap) ) @@ -1080,7 +1080,7 @@ namespace const basegfx::B2IBox& rSrcRect, const basegfx::B2IBox& rDstRect, DrawMode drawMode, - const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE + const BitmapDeviceSharedPtr& rClip ) override { if( isCompatibleClipMask(rMask) && isCompatibleBitmap(rSrcBitmap) ) @@ -1112,11 +1112,11 @@ namespace damaged( rDstRect ); } - IBitmapDeviceDamageTrackerSharedPtr getDamageTracker_i() const SAL_OVERRIDE + IBitmapDeviceDamageTrackerSharedPtr getDamageTracker_i() const override { return mpDamage; } - void setDamageTracker_i( const IBitmapDeviceDamageTrackerSharedPtr& rDamage ) SAL_OVERRIDE + void setDamageTracker_i( const IBitmapDeviceDamageTrackerSharedPtr& rDamage ) override { mpDamage = rDamage; } diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index f8b20a5a4bda..531991c99632 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -86,7 +86,7 @@ private: } public: - void setUp() SAL_OVERRIDE + void setUp() override { const basegfx::B2ISize aSize(10,10); mpDevice1bpp = createBitmapDevice( aSize, diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index fd60eb462802..3d1436786996 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -145,7 +145,7 @@ private: } public: - void setUp() SAL_OVERRIDE + void setUp() override { const basegfx::B2ISize aSize(10,10); sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbPal, aSize.getX()); diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index 060e2b3d2578..e6a1bdc6f099 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -186,7 +186,7 @@ private: } public: - void setUp() SAL_OVERRIDE + void setUp() override { const basegfx::B2ISize aSize(11,11); sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(Format::OneBitMsbGrey, aSize.getX()); diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index 64c5bdc51273..3462108334c6 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -206,7 +206,7 @@ private: } public: - void setUp() SAL_OVERRIDE + void setUp() override { const basegfx::B2ISize aSize(11,11); mpDevice1bpp = createBitmapDevice( aSize, diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index b803e73503a1..c83956815312 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -146,7 +146,7 @@ private: } public: - void setUp() SAL_OVERRIDE + void setUp() override { const basegfx::B2ISize aSize(11,11); mpDevice1bpp = createBitmapDevice( aSize, diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 981736773fb9..b4598ae7c3ed 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -99,7 +99,7 @@ private: } public: - void setUp() SAL_OVERRIDE + void setUp() override { const basegfx::B2ISize aSize(10,10); mpDevice1bpp = createBitmapDevice( aSize, diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 48814e6a2e8a..ae9f15fdf07e 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -291,7 +291,7 @@ private: public: - void setUp() SAL_OVERRIDE + void setUp() override { const basegfx::B2ISize aSize(10,10); mpDevice1bpp = createBitmapDevice( aSize, |