diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-11-24 22:18:56 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-11-24 22:40:51 +0100 |
commit | 566d46034fcaf22cf943cf6e1ab3d9be92a81400 (patch) | |
tree | 15a1627758e80d9ac09854bc0ca53594124a0d3d | |
parent | Add dummy Crop to SalBitmap implementations (diff) | |
download | core-566d46034fcaf22cf943cf6e1ab3d9be92a81400.tar.gz core-566d46034fcaf22cf943cf6e1ab3d9be92a81400.zip |
Add dummy Erase to SalBitmap implementations
Change-Id: I5790deb9ab5af6f8678c964af5321264d3bce733
-rw-r--r-- | vcl/headless/svpbmp.cxx | 5 | ||||
-rw-r--r-- | vcl/inc/headless/svpbmp.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/impbmp.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/opengl/salbmp.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/quartz/salbmp.h | 1 | ||||
-rw-r--r-- | vcl/inc/salbmp.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/salbmp.h | 1 | ||||
-rw-r--r-- | vcl/inc/win/salbmp.h | 1 | ||||
-rw-r--r-- | vcl/opengl/salbmp.cxx | 5 | ||||
-rw-r--r-- | vcl/quartz/salbmp.cxx | 5 | ||||
-rw-r--r-- | vcl/source/gdi/impbmp.cxx | 5 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 5 | ||||
-rw-r--r-- | vcl/win/source/gdi/salbmp.cxx | 5 |
13 files changed, 38 insertions, 0 deletions
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index d5a1e79b5421..e4080da12f68 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -344,6 +344,11 @@ bool SvpSalBitmap::Crop( const Rectangle& /*rRectPixel*/ ) return false; } +bool SvpSalBitmap::Erase( const ::Color& /*rFillColor*/ ) +{ + return false; +} + bool SvpSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ ) { return false; diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 0de0d788c839..eda1be49f293 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -59,6 +59,7 @@ public: virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; + virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE; virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE; static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat ); diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index 8f373c59ce08..3b2abead2dc8 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -69,6 +69,7 @@ public: inline sal_uLong ImplGetChecksum() const { return mnChecksum; } bool ImplCrop( const Rectangle& rRectPixel ); + bool ImplErase( const Color& rFillColor ); bool ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ); }; diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index 20b0e6137f14..449c1b68adf3 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -79,6 +79,7 @@ public: bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; + bool Erase( const Color& rFillColor ) SAL_OVERRIDE; bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE; public: diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index c98cf2f22c21..9ece5a3dbdfe 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -80,6 +80,7 @@ public: bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; + bool Erase( const Color& rFillColor ) SAL_OVERRIDE; bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE; private: diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx index 5eb977d1eee8..12e795421743 100644 --- a/vcl/inc/salbmp.hxx +++ b/vcl/inc/salbmp.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/rendering/XBitmapCanvas.hpp> struct BitmapBuffer; +class Color; class SalGraphics; class BitmapPalette; struct BitmapSystemData; @@ -56,6 +57,7 @@ public: virtual bool GetSystemData( BitmapSystemData& rData ) = 0; virtual bool Crop( const Rectangle& rRectPixel ) = 0; + virtual bool Erase( const Color& rFillColor ) = 0; virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) = 0; }; diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index 5975f664ceaf..56f3b85e6e48 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -147,6 +147,7 @@ public: virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; + virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE; virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE; }; diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index b74ba73eaf8e..7329449dc852 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -98,6 +98,7 @@ public: virtual bool GetSystemData( BitmapSystemData& rData ); virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; + virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE; virtual bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ); }; diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index 7a1af0d0f9af..8cd756176e74 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -578,4 +578,9 @@ bool OpenGLSalBitmap::Crop( const Rectangle& /*rRectPixel*/ ) return false; } +bool OpenGLSalBitmap::Erase( const ::Color& /*rFillColor*/ ) +{ + return false; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index b75c08fad7a4..80ae37ee376a 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -972,6 +972,11 @@ bool QuartzSalBitmap::Crop( const Rectangle& /*rRectPixel*/ ) return false; } +bool QuartzSalBitmap::Erase( const ::Color& /*rFillColor*/ ) +{ + return false; +} + bool QuartzSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ ) { return false; diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index b402d5b91a8e..bcb5b75d20d5 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -98,6 +98,11 @@ bool ImpBitmap::ImplCrop( const Rectangle& rRectPixel ) return mpSalBitmap->Crop( rRectPixel ); } +bool ImpBitmap::ImplErase( const ::Color& rFillColor ) +{ + return mpSalBitmap->Erase( rFillColor ); +} + bool ImpBitmap::ImplScale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) { return mpSalBitmap->Scale( rScaleX, rScaleY, nScaleFlag ); diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index a245dc9637b0..b8d9a7db9ea7 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -865,6 +865,11 @@ bool X11SalBitmap::Crop( const Rectangle& /*rRectPixel*/ ) return false; } +bool X11SalBitmap::Erase( const ::Color& /*rFillColor*/ ) +{ + return false; +} + bool X11SalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ ) { return false; diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index d4ae11ab1b2e..5cb094358dcb 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -1081,6 +1081,11 @@ bool WinSalBitmap::Crop( const Rectangle& /*rRectPixel*/ ) return false; } +bool WinSalBitmap::Erase( const ::Color& /*rFillColor*/ ) +{ + return false; +} + bool WinSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ ) { return false; |