summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-01-29 07:04:33 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-01-29 07:04:33 +0000
commit1c888f0ef80f038d3d8cc7e2411436c89a34dc8a (patch)
tree29b8baaf66d88f82d047c12e9106fd24ac8ede9c /vcl/source
parente90383b732575ca2e96d751307becfe0f9abb9b0 (diff)
INTEGRATION: CWS thbpp10 (1.26.156); FILE MERGED
2008/01/14 14:42:38 thb 1.26.156.1: #i83087# Don't use native alpha for emulated alpha vdev cases
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/gdi/outdev6.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 4e621cc6428c..7997262cc358 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: outdev6.cxx,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: hr $ $Date: 2007-08-03 12:30:35 $
+ * last change: $Author: vg $ $Date: 2008-01-29 08:04:33 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -290,7 +290,9 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
// #i66849# Added fast path for exactly rectangular
// polygons
- if( !pDisableNative && aPolyPoly.IsRect() )
+ // #i83087# Naturally, system alpha blending cannot
+ // work with separate alpha VDev
+ if( !mpAlphaVDev && !pDisableNative && aPolyPoly.IsRect() )
{
// setup Graphics only here (other cases delegate
// to basic OutDev methods)