summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-11-24 22:18:56 +0100
committerJan Holesovsky <kendy@collabora.com>2014-12-03 14:41:18 +0100
commitd2b86b1eb241aa37e2335af351f706226047cd21 (patch)
tree14ab244a6aee92f5bc9d84f7884492f764d53980
parentvcl: Add reference on default window's context so it doesn't get destroyed (diff)
downloadcore-d2b86b1eb241aa37e2335af351f706226047cd21.tar.gz
core-d2b86b1eb241aa37e2335af351f706226047cd21.zip
Add dummy Erase to SalBitmap implementations
Change-Id: I5790deb9ab5af6f8678c964af5321264d3bce733
-rw-r--r--vcl/headless/svpbmp.cxx5
-rw-r--r--vcl/inc/headless/svpbmp.hxx1
-rw-r--r--vcl/inc/impbmp.hxx1
-rw-r--r--vcl/inc/opengl/salbmp.hxx1
-rw-r--r--vcl/inc/quartz/salbmp.h1
-rw-r--r--vcl/inc/salbmp.hxx2
-rw-r--r--vcl/inc/unx/salbmp.h1
-rw-r--r--vcl/inc/win/salbmp.h1
-rw-r--r--vcl/opengl/salbmp.cxx5
-rw-r--r--vcl/quartz/salbmp.cxx5
-rw-r--r--vcl/source/gdi/impbmp.cxx5
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx5
-rw-r--r--vcl/win/source/gdi/salbmp.cxx5
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 6938a22a1846..c25dfa892785 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -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;
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 df6e8bd0e9e3..0dfbb2ff3468 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 db2bb1cfd454..9fde11861325 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -574,4 +574,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 c3245b63da7c..e77f9d4a2ba7 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -968,6 +968,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 5d442f1a9f46..a08aa7da0290 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 fd02f54e15e9..9af94eef6c19 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -1067,6 +1067,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;