summaryrefslogtreecommitdiff
path: root/basebmp
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /basebmp
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'basebmp')
-rw-r--r--basebmp/source/bitmapdevice.cxx44
-rw-r--r--basebmp/test/bmpmasktest.cxx2
-rw-r--r--basebmp/test/bmptest.cxx2
-rw-r--r--basebmp/test/cliptest.cxx2
-rw-r--r--basebmp/test/filltest.cxx2
-rw-r--r--basebmp/test/linetest.cxx2
-rw-r--r--basebmp/test/masktest.cxx2
-rw-r--r--basebmp/test/polytest.cxx2
8 files changed, 29 insertions, 29 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 707559c828c9..e2836dedf260 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -377,7 +377,7 @@ namespace
return boost::dynamic_pointer_cast< BitmapRenderer >( bmp );
}
- virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const
+ virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const SAL_OVERRIDE
{
// TODO(P1): dynamic_cast usually called twice for
// compatible formats
@@ -397,7 +397,7 @@ namespace
return pMask;
}
- virtual bool isCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const
+ virtual bool isCompatibleClipMask( const BitmapDeviceSharedPtr& bmp ) const SAL_OVERRIDE
{
// TODO(P1): dynamic_cast usually called twice for
// compatible formats
@@ -409,7 +409,7 @@ namespace
return boost::dynamic_pointer_cast<alphamask_bitmap_type>( bmp );
}
- virtual bool isCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) const
+ virtual bool isCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) const SAL_OVERRIDE
{
// TODO(P1): dynamic_cast usually called twice for
// compatible formats
@@ -417,7 +417,7 @@ namespace
}
virtual void clear_i( Color fillColor,
- const basegfx::B2IBox& rBounds )
+ const basegfx::B2IBox& rBounds ) SAL_OVERRIDE
{
fillImage(destIterRange(maBegin,
maRawAccessor,
@@ -430,7 +430,7 @@ namespace
virtual void setPixel_i( const basegfx::B2IPoint& rPt,
Color pixelColor,
- DrawMode drawMode )
+ DrawMode drawMode ) SAL_OVERRIDE
{
const DestIterator pixel( maBegin +
vigra::Diff2D(rPt.getX(),
@@ -447,7 +447,7 @@ namespace
virtual void setPixel_i( const basegfx::B2IPoint& rPt,
Color pixelColor,
DrawMode drawMode,
- const BitmapDeviceSharedPtr& rClip )
+ const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE
{
boost::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rClip) );
OSL_ASSERT( pMask );
@@ -468,7 +468,7 @@ namespace
damagedPixel(rPt);
}
- virtual Color getPixel_i(const basegfx::B2IPoint& rPt )
+ virtual Color getPixel_i(const basegfx::B2IPoint& rPt ) SAL_OVERRIDE
{
const DestIterator pixel( maBegin +
vigra::Diff2D(rPt.getX(),
@@ -476,7 +476,7 @@ namespace
return maAccessor(pixel);
}
- virtual sal_uInt32 getPixelData_i( const basegfx::B2IPoint& rPt )
+ virtual sal_uInt32 getPixelData_i( const basegfx::B2IPoint& rPt ) SAL_OVERRIDE
{
const DestIterator pixel( maBegin +
vigra::Diff2D(rPt.getX(),
@@ -541,7 +541,7 @@ namespace
const basegfx::B2IPoint& rPt2,
const basegfx::B2IBox& rBounds,
Color lineColor,
- DrawMode drawMode )
+ DrawMode drawMode ) SAL_OVERRIDE
{
implDrawLine(rPt1,rPt2,rBounds,lineColor,
maBegin,
@@ -562,7 +562,7 @@ namespace
const basegfx::B2IBox& rBounds,
Color lineColor,
DrawMode drawMode,
- const BitmapDeviceSharedPtr& rClip )
+ const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE
{
implDrawLine(rPt1,rPt2,rBounds,lineColor,
getMaskedIter(rClip),
@@ -605,7 +605,7 @@ namespace
virtual void drawPolygon_i(const basegfx::B2DPolygon& rPoly,
const basegfx::B2IBox& rBounds,
Color lineColor,
- DrawMode drawMode )
+ DrawMode drawMode ) SAL_OVERRIDE
{
if( drawMode == DrawMode_XOR )
implDrawPolygon( rPoly, rBounds, lineColor,
@@ -621,7 +621,7 @@ namespace
const basegfx::B2IBox& rBounds,
Color lineColor,
DrawMode drawMode,
- const BitmapDeviceSharedPtr& rClip )
+ const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE
{
if( drawMode == DrawMode_XOR )
implDrawPolygon( rPoly, rBounds, lineColor,
@@ -662,7 +662,7 @@ namespace
virtual void fillPolyPolygon_i(const basegfx::B2DPolyPolygon& rPoly,
Color fillColor,
DrawMode drawMode,
- const basegfx::B2IBox& rBounds )
+ const basegfx::B2IBox& rBounds ) SAL_OVERRIDE
{
if( drawMode == DrawMode_XOR )
implFillPolyPolygon( rPoly, fillColor,
@@ -680,7 +680,7 @@ namespace
Color fillColor,
DrawMode drawMode,
const basegfx::B2IBox& rBounds,
- const BitmapDeviceSharedPtr& rClip )
+ const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE
{
if( drawMode == DrawMode_XOR )
implFillPolyPolygon( rPoly, fillColor,
@@ -788,7 +788,7 @@ namespace
virtual void drawBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap,
const basegfx::B2IBox& rSrcRect,
const basegfx::B2IBox& rDstRect,
- DrawMode drawMode )
+ DrawMode drawMode ) SAL_OVERRIDE
{
if( isCompatibleBitmap( rSrcBitmap ) )
{
@@ -823,7 +823,7 @@ namespace
const basegfx::B2IBox& rSrcRect,
const basegfx::B2IBox& rDstRect,
DrawMode drawMode,
- const BitmapDeviceSharedPtr& rClip )
+ const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE
{
if( isCompatibleBitmap( rSrcBitmap ) )
{
@@ -853,7 +853,7 @@ namespace
virtual void drawMaskedColor_i(Color aSrcColor,
const BitmapDeviceSharedPtr& rAlphaMask,
const basegfx::B2IBox& rSrcRect,
- const basegfx::B2IPoint& rDstPoint )
+ const basegfx::B2IPoint& rDstPoint ) SAL_OVERRIDE
{
boost::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rAlphaMask) );
boost::shared_ptr<alphamask_bitmap_type> pAlpha( getCompatibleAlphaMask(rAlphaMask) );
@@ -903,7 +903,7 @@ namespace
const BitmapDeviceSharedPtr& rAlphaMask,
const basegfx::B2IBox& rSrcRect,
const basegfx::B2IPoint& rDstPoint,
- const BitmapDeviceSharedPtr& rClip )
+ const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE
{
boost::shared_ptr<mask_bitmap_type> pMask( getCompatibleClipMask(rAlphaMask) );
boost::shared_ptr<alphamask_bitmap_type> pAlpha( getCompatibleAlphaMask(rAlphaMask) );
@@ -1031,7 +1031,7 @@ namespace
const BitmapDeviceSharedPtr& rMask,
const basegfx::B2IBox& rSrcRect,
const basegfx::B2IBox& rDstRect,
- DrawMode drawMode )
+ DrawMode drawMode ) SAL_OVERRIDE
{
if( isCompatibleClipMask(rMask) &&
isCompatibleBitmap(rSrcBitmap) )
@@ -1068,7 +1068,7 @@ namespace
const basegfx::B2IBox& rSrcRect,
const basegfx::B2IBox& rDstRect,
DrawMode drawMode,
- const BitmapDeviceSharedPtr& rClip )
+ const BitmapDeviceSharedPtr& rClip ) SAL_OVERRIDE
{
if( isCompatibleClipMask(rMask) &&
isCompatibleBitmap(rSrcBitmap) )
@@ -1100,11 +1100,11 @@ namespace
damaged( rDstRect );
}
- IBitmapDeviceDamageTrackerSharedPtr getDamageTracker_i() const
+ IBitmapDeviceDamageTrackerSharedPtr getDamageTracker_i() const SAL_OVERRIDE
{
return mpDamage;
}
- void setDamageTracker_i( const IBitmapDeviceDamageTrackerSharedPtr& rDamage )
+ void setDamageTracker_i( const IBitmapDeviceDamageTrackerSharedPtr& rDamage ) SAL_OVERRIDE
{
mpDamage = rDamage;
}
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index e543263b1f01..610707a069ae 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -88,7 +88,7 @@ private:
}
public:
- void setUp()
+ void setUp() SAL_OVERRIDE
{
const basegfx::B2ISize aSize(10,10);
mpDevice1bpp = createBitmapDevice( aSize,
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 97f67c312829..1f051aed1034 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -145,7 +145,7 @@ private:
}
public:
- void setUp()
+ void setUp() SAL_OVERRIDE
{
const basegfx::B2ISize aSize(10,10);
mpDevice1bpp = createBitmapDevice( aSize,
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index dad88a2b601a..8526964a08ac 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -185,7 +185,7 @@ private:
}
public:
- void setUp()
+ void setUp() SAL_OVERRIDE
{
const basegfx::B2ISize aSize(11,11);
mpClipMask = createBitmapDevice( aSize,
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index 1a393b667264..067ec24cb471 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -206,7 +206,7 @@ private:
}
public:
- void setUp()
+ void setUp() SAL_OVERRIDE
{
const basegfx::B2ISize aSize(11,11);
mpDevice1bpp = createBitmapDevice( aSize,
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index 6b9b5122640b..f6a39099087c 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -146,7 +146,7 @@ private:
}
public:
- void setUp()
+ void setUp() SAL_OVERRIDE
{
const basegfx::B2ISize aSize(11,11);
mpDevice1bpp = createBitmapDevice( aSize,
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index d82bb04fc132..90a345c62e8b 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -99,7 +99,7 @@ private:
}
public:
- void setUp()
+ void setUp() SAL_OVERRIDE
{
const basegfx::B2ISize aSize(10,10);
mpDevice1bpp = createBitmapDevice( aSize,
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index 775364127ec7..64f693357298 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -291,7 +291,7 @@ private:
public:
- void setUp()
+ void setUp() SAL_OVERRIDE
{
const basegfx::B2ISize aSize(10,10);
mpDevice1bpp = createBitmapDevice( aSize,