Author: alg
Date: Tue Jul 16 12:55:39 2013
New Revision: 1503698
URL: http://svn.apache.org/r1503698
Log:
i122758 integrated fix from trunk
Modified:
openoffice/branches/AOO400/main/drawinglayer/ (props changed)
openoffice/branches/AOO400/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
Propchange: openoffice/branches/AOO400/main/drawinglayer/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 16 12:55:39 2013
@@ -0,0 +1,7 @@
+/incubator/ooo/branches/AOO34/main/drawinglayer:1346776-1346777,1347535,1348052,1348914,1350569,1352456,1358991,1359004,1359010,1359024,1359546-1359547,1359553,1359555-1359556,1360552,1368968,1369110,1371068
+/incubator/ooo/branches/alg/linecap/main/drawinglayer:1226811-1232461
+/incubator/ooo/branches/alg/svgreplacement/main/drawinglayer:1205420-1220782
+/incubator/ooo/branches/writer001/main/drawinglayer:1356067-1386577
+/openoffice/branches/alg/clibboard/main/drawinglayer:1428975-1437368
+/openoffice/branches/sidebar/main/drawinglayer:1415095-1466374
+/openoffice/trunk/main/drawinglayer:1503696
Modified:
openoffice/branches/AOO400/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1503698&r1=1503697&r2=1503698&view=diff
==============================================================================
---
openoffice/branches/AOO400/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
(original)
+++
openoffice/branches/AOO400/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
Tue Jul 16 12:55:39 2013
@@ -425,7 +425,8 @@ namespace drawinglayer
#if defined(MACOSX)
const AlphaMask aMaskBmp(
aContent.GetSizePixel());
#else
- const Bitmap aMaskBmp( aContent.GetSizePixel(),
1);
+ Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+ aMaskBmp.Erase(Color(COL_BLACK)); // #122758# Initialize to
non-transparent
#endif
aBitmapEx = BitmapEx(aContent, aMaskBmp);
}
