summaryrefslogtreecommitdiff
path: root/basebmp/source/bitmapdevice.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-08-03 11:27:01 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-08-03 11:27:01 +0000
commit1315f219030ea14dabbe535c549f31b039138bf9 (patch)
tree40ec1e3342ce9a5e40c7b2e95519d3b4955c7173 /basebmp/source/bitmapdevice.cxx
parent89366dd944bd3e628433d16564a698cf653415fd (diff)
INTEGRATION: CWS pj83 (1.27.2); FILE MERGED
2007/07/31 20:02:34 thb 1.27.2.2: RESYNC: (1.27-1.29); FILE MERGED 2007/07/31 15:40:29 thb 1.27.2.1: #i80150# Applied er's patch to make this build for gcc3.3 again
Diffstat (limited to 'basebmp/source/bitmapdevice.cxx')
-rw-r--r--basebmp/source/bitmapdevice.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 696e2a8a508a..fd79bb5fa5dc 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: bitmapdevice.cxx,v $
*
- * $Revision: 1.29 $
+ * $Revision: 1.30 $
*
- * last change: $Author: obo $ $Date: 2007-07-18 11:00:18 $
+ * last change: $Author: hr $ $Date: 2007-08-03 12:27:01 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1464,7 +1464,8 @@ void BitmapDevice::drawMaskedColor( Color aSrcColor,
BitmapDeviceSharedPtr pAlphaCopy(
cloneBitmapDevice( aSize,
shared_from_this()) );
- const basegfx::B2IRange aAlphaRange( basegfx::B2ITuple(),
+ basegfx::B2ITuple aGcc3WorkaroundTemporary;
+ const basegfx::B2IRange aAlphaRange( aGcc3WorkaroundTemporary,
aSize );
pAlphaCopy->drawBitmap(rAlphaMask,
aSrcRange,
@@ -1516,7 +1517,8 @@ void BitmapDevice::drawMaskedColor( Color aSrcColor,
BitmapDeviceSharedPtr pAlphaCopy(
cloneBitmapDevice( aSize,
shared_from_this()) );
- const basegfx::B2IRange aAlphaRange( basegfx::B2ITuple(),
+ basegfx::B2ITuple aGcc3WorkaroundTemporary;
+ const basegfx::B2IRange aAlphaRange( aGcc3WorkaroundTemporary,
aSize );
pAlphaCopy->drawBitmap(rAlphaMask,
aSrcRange,