summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-11-14 14:25:40 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-11-14 14:25:40 +0000
commit5dd0fc746c2879c956f7c5b0bf224e2728125182 (patch)
tree53c058aca66766fe21311617468a02dc8ebd9132 /vcl/unx
parentd5506537ad53e66478a7d2c389bc700345153bf5 (diff)
INTEGRATION: CWS aw024 (1.21.30); FILE MERGED
2006/11/10 05:48:31 aw 1.21.30.5: RESYNC: (1.24-1.26); FILE MERGED 2006/09/22 03:38:18 aw 1.21.30.4: RESYNC: (1.23-1.24); FILE MERGED 2006/09/08 21:21:09 aw 1.21.30.3: RESYNC: (1.22-1.23); FILE MERGED 2006/08/03 17:28:22 aw 1.21.30.2: RESYNC: (1.21-1.22); FILE MERGED 2006/07/20 16:03:34 thb 1.21.30.1: #i66849# Join from CWS xralpha; added XRENDER_LINK feature back again; renamed drawTransparentBitmap() to drawMaskedBitmap() and made private nonvirtual; added drawAlphaRect()
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/source/gdi/salbmp.cxx25
1 files changed, 19 insertions, 6 deletions
diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/source/gdi/salbmp.cxx
index c135bcba82ed..2004ed82da1a 100644
--- a/vcl/unx/source/gdi/salbmp.cxx
+++ b/vcl/unx/source/gdi/salbmp.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: salbmp.cxx,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: vg $ $Date: 2006-11-01 14:47:51 $
+ * last change: $Author: ihi $ $Date: 2006-11-14 15:25:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -579,9 +579,10 @@ X11SalBitmap::ImplCreateFromXImage (Display* pDisplay, XLIB_Window hWindow, int
return False;
}
-void X11SalBitmap::ImplDraw( Drawable aDrawable,
- int nScreen, long nDrawableDepth,
- const SalTwoRect& rTwoRect, const GC& rGC ) const
+ImplSalDDB* X11SalBitmap::ImplGetDDB( Drawable aDrawable,
+ int nScreen,
+ long nDrawableDepth,
+ const SalTwoRect& rTwoRect ) const
{
if( !mpDDB || !mpDDB->ImplMatches( nScreen, nDrawableDepth, rTwoRect ) )
{
@@ -633,7 +634,7 @@ void X11SalBitmap::ImplDraw( Drawable aDrawable,
// than image bitmap (broken)
if( aTwoRect.mnSrcX >= aSize.Width() ||
aTwoRect.mnSrcY >= aSize.Height() )
- return; // this would be a really mad case
+ return NULL; // this would be a really mad case
if( aTwoRect.mnSrcWidth+aTwoRect.mnSrcX > aSize.Width() )
{
@@ -669,6 +670,18 @@ void X11SalBitmap::ImplDraw( Drawable aDrawable,
}
}
+ return mpDDB;
+}
+
+// -----------------------------------------------------------------------------
+
+void X11SalBitmap::ImplDraw( Drawable aDrawable,
+ int nScreen,
+ long nDrawableDepth,
+ const SalTwoRect& rTwoRect,
+ const GC& rGC ) const
+{
+ ImplGetDDB( aDrawable, nScreen, nDrawableDepth, rTwoRect );
if( mpDDB )
mpDDB->ImplDraw( aDrawable, nDrawableDepth, rTwoRect, rGC );
}