[Libreoffice-commits] .: svx/source

[Michael Meeks]

 svx/source/svdraw/svdhdl.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 54c7480a6cdb049a5b0c907fa86af42068dcae16
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Nov 1 12:21:49 2011 +0000

    add real alpha to markers

diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 62ee66b..14f4289 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -101,18 +101,10 @@ public:
 #define INDIVIDUAL_COUNT    (4)
 
 SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
-:   maMarkersBitmap(),
+    :   maMarkersBitmap(ResId(nResId, *ImpGetResMgr())),
     // 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra
-    maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
+        maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
 {
-    // #101928# change color used for transparent parts to 0x00ff00ff (ImageList standard)
-    const Color aColTransparent(0x00ff00ff);
-    const Bitmap aBitmap(ResId(nResId, *ImpGetResMgr()));
-    const Bitmap aMask(aBitmap.CreateMask(aColTransparent));
-
-    // create a real BitmapEx with an AlphaMask
-    maMarkersBitmap = BitmapEx(aBitmap, aMask);
-    // maMarkersBitmap = BitmapEx(aBitmap, aColTransparent);
 }
 
 SdrHdlBitmapSet::~SdrHdlBitmapSet()