diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-04-12 18:28:42 +0200 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-04-12 18:28:42 +0200 |
| commit | 4cef86a3df68deac59ad6eec71db7eb4bf1476e7 (patch) | |
| tree | 2bd4cc6baa4075f2ad9f04c3a0827401134c87b8 /svx/source | |
| parent | c6963ac502f6b693d6c9bd6d2a3c08a442d3e86d (diff) | |
fixed merge error
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/sdr/overlay/overlaybitmapex.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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); |