From 4cef86a3df68deac59ad6eec71db7eb4bf1476e7 Mon Sep 17 00:00:00 2001
From: Christian Lippka <christian.lippka@sun.com>
Date: Mon, 12 Apr 2010 18:28:42 +0200
Subject: fixed merge error

---
 svx/source/sdr/overlay/overlaybitmapex.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'svx/source')

diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index c0b8975cf1c4..2a3a00b25b99 100644
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx>
+#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <svx/sdr/overlay/overlaybitmapex.hxx>
 #include <vcl/salbtype.hxx>
 #include <vcl/outdev.hxx>
@@ -53,7 +53,7 @@ namespace sdr
             {
                 const drawinglayer::primitive2d::Primitive2DSequence aNewTransPrimitiveVector(&aReference, 1L);
                 aReference = drawinglayer::primitive2d::Primitive2DReference(
-                                new drawinglayer::primitive2d::UnifiedAlphaPrimitive2D(aNewTransPrimitiveVector, mfAlpha));
+                                new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(aNewTransPrimitiveVector, mfAlpha));
             }
 
             return drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1);
-- 
cgit