CWS-TOOLING: integrate CWS aw058

2008-11-19 14:27:57 +0100 aw  r263994 : #i95264# corrected line primitive range calculation for hairlines
2008-11-18 11:31:52 +0100 wg  r263754 : i96156
2008-11-18 11:22:38 +0100 wg  r263752 : i96156
2008-11-13 11:46:49 +0100 aw  r263626 : #i93169# used flag the wrong way; true means that nothing was done yet
2008-11-12 15:33:41 +0100 wg  r263601 : i96156
2008-11-12 13:22:38 +0100 wg  r263592 : i95527
2008-11-12 13:18:51 +0100 wg  r263591 : i95527
2008-10-29 13:22:02 +0100 aw  r262794 : #i93485# identified reason and with PL's help changed problem accordingly with usage of an old fallback. This will need to be optimized again by HDU when he finds the time.
2008-10-28 18:23:04 +0100 aw  r262763 : unxmacxi compiler warning fixed
2008-10-28 18:17:01 +0100 aw  r262762 : unxmacxi compiler warning fixed
2008-10-28 17:55:18 +0100 aw  r262761 : unxmacxi compiler warning fixed
2008-10-28 13:48:22 +0100 aw  r262743 : #i93485# added UnifiedAlphaPrimitive2D to VclRenderer; corrected getB2DRange implementations for hairlines which are view-dependent
2008-10-28 12:40:55 +0100 aw  r262735 : #i93485# had to move Pre/PostPaint to LocalPre/PostPaint since PrePaint is a virtual window method
2008-10-27 15:54:10 +0100 aw  r262679 : #i19871# adapted the call order to parent implementations in some Nbc methods in SdrPathObj due to errors in SnapRect recalculation when GluePoints are involved
2008-10-24 18:31:48 +0200 aw  r262661 : #i77187# disable all buttons in bezier toolbar when move and/or resize protected object is involved
2008-10-24 18:30:16 +0200 aw  r262660 : #i77187# simplified and secured model changers, added toolbar update, disabled move drag start when polygon point is selected
2008-10-24 12:57:50 +0200 hdu  r262635 : #i93485# use device transformation for SAL layer
2008-10-24 12:41:37 +0200 hdu  r262634 : #i93485# use device transformation for SAL layer
2008-10-23 19:46:12 +0200 aw  r262630 : mac compiler warning fixed
2008-10-23 18:15:02 +0200 aw  r262628 : #i93485# modified dialog previews to use prerendering
2008-10-23 18:14:27 +0200 aw  r262627 : #i93485# added assert when render helper uses Window as copy source
2008-10-22 18:07:30 +0200 aw  r262610 : #i95264# fixes assertion
2008-10-22 14:31:51 +0200 aw  r262606 : #i89661# also enabling DrawTransparent shortcut for VCL-Renderer
2008-10-22 14:10:31 +0200 aw  r262604 : #i89661# new HitTest 2D primitive to support BoundRect and HitTest calculations/tests
2008-10-22 14:09:22 +0200 aw  r262603 : #i89661# new HitTest tolerance, new TextFrame selection overlay, support for HitTest geometry
2008-10-22 14:08:16 +0200 aw  r262602 : #i89661# correcting old HitTest tolerance expansion
2008-10-20 15:31:48 +0200 aw  r262321 : #i89661# added patch to test it
2008-10-20 11:50:31 +0200 aw  r262310 : #i87762# removed no longer used icons (aw053)
2008-10-17 15:41:48 +0200 aw  r262288 : #i93169#, #i93180# FormControl corrections for Primitive handling
2008-10-17 15:40:54 +0200 aw  r262287 : #i93169#, #i93180# FormControl corrections for Primitive handling
2008-10-16 11:12:44 +0200 aw  r262253 : #i93595# removed superfluous grid interface
2008-10-16 11:11:20 +0200 aw  r262252 : #i93595# changed grid display to sub-grid usage and new defaults
2008-10-15 15:09:40 +0200 aw  r262234 : #i93597# moved flag for only vertical PageBorder, added reacting on it to primitive creation
2008-10-15 15:09:09 +0200 aw  r262233 : #i93597# moved flag for only vertical PageBorder
2008-10-15 15:08:46 +0200 aw  r262232 : #i93597# moved flag for only vertical PageBorder, added reacting on it to primitive creation
2008-10-14 16:27:07 +0200 aw  r262207 : #i93648# (flushViewObjectContacts) and #i93318# (propertyChange)
2008-10-14 16:25:10 +0200 aw  r262206 : #i93318# back to old state since detecting a change is not placed well at the primitive (which is a graphical information at the itme it was fetched). Instead i will add the needed check and flush at the FormControl's VOC
2008-10-14 13:47:38 +0200 aw  r262201 : #i93318# added a change listener to the XControlModel and code to make the operator== at control primitive fail

13 files changed, 401 insertions, 145 deletions

diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx
index f3b56e2db6..dbbd116775 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx
@@ -73,6 +73,9 @@ namespace drawinglayer
                 const ::std::vector< double >& rDotDashArray, double fFullDotDashLen);
             ~SdrLineAttribute();
 
+            // constructor to create a line attribute for a colored hairline
+            SdrLineAttribute(const basegfx::BColor& rColor);
+            
             // compare operator
             bool operator==(const SdrLineAttribute& rCandidate) const;
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
index 53f17204f8..f3490b8559 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
@@ -99,6 +99,7 @@
 #define PRIMITIVE2D_ID_CHARTPRIMITIVE2D						(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 48)
 #define PRIMITIVE2D_ID_STRUCTURETAGRIMITIVE2D				(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 49)
 #define PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D				(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 50)
+#define PRIMITIVE2D_ID_HITTESTPRIMITIVE2D                   (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 51)
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx
new file mode 100644
index 0000000000..f72ee164cf
--- /dev/null
+++ b/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: hittestprimitive3d.hxx,v $
+ *
+ *  $Revision: 1.1.2.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2008/09/24 14:27:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HITTESTPRIMITIVE2D_HXX
+#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HITTESTPRIMITIVE2D_HXX
+
+#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace drawinglayer
+{
+    namespace primitive2d
+    {
+        // This primitive is used to represent geometry for non-visible objects,
+        // e.g. a PresObj's outline. To still be able to use primitives for HitTest 
+        // functionality, the 2d decompositions will produce an as much as possible 
+        // simplified line geometry encapsulated in this primtive when there is no 
+        // line geometry. In a further enchanced version this may change to 'if neither 
+        // filled nor lines' creation criteria. The whole primitive decomposes to nothing, 
+        // so no one not knowing it will be influenced. Only helper processors for hit test 
+        // (and maybe BoundRect extractors) will use it and it's children subcontent.
+        class HitTestPrimitive2D : public GroupPrimitive2D
+        {
+        protected:
+            // local decomposition. Implementation will return empty Primitive2DSequence
+            // since this is no visualisation data
+            virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+
+        public:
+            HitTestPrimitive2D(const Primitive2DSequence& rChildren);
+
+            // despite returning an empty decomposition since it's no visualisation data, 
+            // range calculation is intended to use invisible replacement geometry, so
+            // the local implementation will return the children's range
+            virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const;
+
+            // provide unique ID
+            DeclPrimitrive2DIDBlock()
+        };
+    } // end of namespace primitive2d
+} // end of namespace drawinglayer
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HITTESTPRIMITIVE2D_HXX
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
index e38542fa5b..1ad23644d9 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
@@ -54,6 +54,7 @@ namespace drawinglayer { namespace primitive2d {
     class PolyPolygonColorPrimitive2D;
     class MetafilePrimitive2D;
     class MaskPrimitive2D;
+    class UnifiedAlphaPrimitive2D;
     class AlphaPrimitive2D;
     class TransformPrimitive2D;
     class MarkerArrayPrimitive2D;
@@ -103,6 +104,7 @@ namespace drawinglayer
             void RenderMetafilePrimitive2D(const primitive2d::MetafilePrimitive2D& rPolygonCandidate);
             void RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive2D& rMaskCandidate);
             void RenderModifiedColorPrimitive2D(const primitive2d::ModifiedColorPrimitive2D& rModifiedCandidate);
+            void RenderUnifiedAlphaPrimitive2D(const primitive2d::UnifiedAlphaPrimitive2D& rTransCandidate);
             void RenderAlphaPrimitive2D(const primitive2d::AlphaPrimitive2D& rTransCandidate);
             void RenderTransformPrimitive2D(const primitive2d::TransformPrimitive2D& rTransformCandidate);
             void RenderPagePreviewPrimitive2D(const primitive2d::PagePreviewPrimitive2D& rPagePreviewCandidate);
@@ -115,10 +117,6 @@ namespace drawinglayer
             void adaptLineToFillDrawMode() const;
             void adaptTextToFillDrawMode() const;
             
-            /////////////////////////////////////////////////////////////////////////////
-            // FormControl support
-            basegfx::B2DPoint PositionAndSizeControl(const primitive2d::ControlPrimitive2D& rControlPrimitive2D);
-
         public:
             // constructor/destructor
             VclProcessor2D(
diff --git a/drawinglayer/prj/d.lst b/drawinglayer/prj/d.lst
index 3e3055d73c..3f71b945fb 100644
--- a/drawinglayer/prj/d.lst
+++ b/drawinglayer/prj/d.lst
@@ -24,6 +24,7 @@ mkdir: %_DEST%\inc%_EXT%\drawinglayer\primitive2d
 ..\inc\drawinglayer\primitive2d\gridprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\gridprimitive2d.hxx
 ..\inc\drawinglayer\primitive2d\groupprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\groupprimitive2d.hxx
 ..\inc\drawinglayer\primitive2d\helplineprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\helplineprimitive2d.hxx
+..\inc\drawinglayer\primitive2d\hittestprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\hittestprimitive2d.hxx
 ..\inc\drawinglayer\primitive2d\markerarrayprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\markerarrayprimitive2d.hxx
 ..\inc\drawinglayer\primitive2d\maskprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\maskprimitive2d.hxx
 ..\inc\drawinglayer\primitive2d\mediaprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\mediaprimitive2d.hxx
diff --git a/drawinglayer/source/attribute/sdrattribute.cxx b/drawinglayer/source/attribute/sdrattribute.cxx
index f94183f94e..4955ceddc9 100644
--- a/drawinglayer/source/attribute/sdrattribute.cxx
+++ b/drawinglayer/source/attribute/sdrattribute.cxx
@@ -58,6 +58,16 @@ namespace drawinglayer
         {
         }
 
+        SdrLineAttribute::SdrLineAttribute(const basegfx::BColor& rColor)
+        :	meJoin(basegfx::B2DLINEJOIN_NONE),
+            mfWidth(0.0),
+            mfTransparence(0.0),
+            maColor(rColor),
+            maDotDashArray(),
+            mfFullDotDashLen(0.0)
+        {
+        }
+
         SdrLineAttribute::~SdrLineAttribute()
         {
         }
diff --git a/drawinglayer/source/primitive2d/hittestprimitive2d.cxx b/drawinglayer/source/primitive2d/hittestprimitive2d.cxx
new file mode 100644
index 0000000000..58f7242254
--- /dev/null
+++ b/drawinglayer/source/primitive2d/hittestprimitive2d.cxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: hittestprimitive3d.cxx,v $
+ *
+ *  $Revision: 1.1.2.1 $
+ *
+ *  last change: $Author: aw $ $Date: 2008/09/25 17:12:14 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_drawinglayer.hxx"
+
+#include <drawinglayer/primitive2d/hittestprimitive2d.hxx>
+#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+using namespace com::sun::star;
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace drawinglayer
+{
+    namespace primitive2d
+    {
+        Primitive2DSequence HitTestPrimitive2D::createLocalDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+        {
+            // return empty sequence
+            return Primitive2DSequence();
+        }
+
+        HitTestPrimitive2D::HitTestPrimitive2D(
+            const Primitive2DSequence& rChildren)
+        :	GroupPrimitive2D(rChildren)
+        {
+        }
+
+        basegfx::B2DRange HitTestPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
+        {
+            return getB2DRangeFromPrimitive2DSequence(getChildren(), rViewInformation);
+        }
+
+        // provide unique ID
+        ImplPrimitrive2DIDBlock(HitTestPrimitive2D, PRIMITIVE2D_ID_HITTESTPRIMITIVE2D)
+
+    } // end of namespace primitive2d
+} // end of namespace drawinglayer
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/drawinglayer/source/primitive2d/makefile.mk b/drawinglayer/source/primitive2d/makefile.mk
index 563bd3ae6a..b909d0fde9 100644
--- a/drawinglayer/source/primitive2d/makefile.mk
+++ b/drawinglayer/source/primitive2d/makefile.mk
@@ -61,6 +61,7 @@ SLOFILES= \
         $(SLO)$/gridprimitive2d.obj				\
         $(SLO)$/groupprimitive2d.obj			\
         $(SLO)$/helplineprimitive2d.obj			\
+        $(SLO)$/hittestprimitive2d.obj			\
         $(SLO)$/markerarrayprimitive2d.obj		\
         $(SLO)$/pointarrayprimitive2d.obj		\
         $(SLO)$/maskprimitive2d.obj				\
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 90ba526f9e..f981fce815 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -42,6 +42,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -75,10 +76,26 @@ namespace drawinglayer
             return false;
         }
 
-        basegfx::B2DRange PolygonHairlinePrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const
+        basegfx::B2DRange PolygonHairlinePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
         {
+            // this is a hairline, thus the line width is view-dependent. Get range of polygon
+            // as base size
+            basegfx::B2DRange aRetval(getB2DPolygon().getB2DRange());
+
+            if(!aRetval.isEmpty())
+            {
+                // Calculate view-dependent hairline width
+                const basegfx::B2DVector aDiscreteSize(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0));
+                const double fDiscreteHalfLineWidth(aDiscreteSize.getLength() * 0.5);
+                
+                if(basegfx::fTools::more(fDiscreteHalfLineWidth, 0.0))
+                {
+                    aRetval.grow(fDiscreteHalfLineWidth);
+                }
+            }
+
             // return range
-            return basegfx::tools::getRange(getB2DPolygon());
+            return aRetval;
         }
 
         // provide unique ID
@@ -273,28 +290,44 @@ namespace drawinglayer
 
         basegfx::B2DRange PolygonStrokePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
         {
+            basegfx::B2DRange aRetval;
+
             if(getLineAttribute().getWidth())
             {
                 if(basegfx::B2DLINEJOIN_MITER == getLineAttribute().getLineJoin())
                 {
                     // if line is mitered, use parent call since mitered line
                     // geometry may use more space than the geometry grown by half line width
-                    return BasePrimitive2D::getB2DRange(rViewInformation);
+                    aRetval = BasePrimitive2D::getB2DRange(rViewInformation);
                 }
                 else
                 {
                     // for all other B2DLINEJOIN_* get the range from the base geometry
                     // and expand by half the line width
-                    basegfx::B2DRange aRetval(basegfx::tools::getRange(getB2DPolygon()));
-                    aRetval.grow(getLineAttribute().getWidth() / 2.0);
-                    return aRetval;
+                    aRetval = getB2DPolygon().getB2DRange();
+                    aRetval.grow(getLineAttribute().getWidth() * 0.5);
                 }
             }
             else
             {
-                // range of polygon is adequate
-                return basegfx::tools::getRange(getB2DPolygon());
+                // this is a hairline, thus the line width is view-dependent. Get range of polygon
+                // as base size
+                aRetval = getB2DPolygon().getB2DRange();
+
+                if(!aRetval.isEmpty())
+                {
+                    // Calculate view-dependent hairline width
+                    const basegfx::B2DVector aDiscreteSize(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0));
+                    const double fDiscreteHalfLineWidth(aDiscreteSize.getLength() * 0.5);
+                    
+                    if(basegfx::fTools::more(fDiscreteHalfLineWidth, 0.0))
+                    {
+                        aRetval.grow(fDiscreteHalfLineWidth);
+                    }
+                }
             }
+
+            return aRetval;
         }
 
         // provide unique ID
@@ -396,15 +429,15 @@ namespace drawinglayer
             basegfx::B2DRange aRetval(PolygonStrokePrimitive2D::getB2DRange(rViewInformation));
 
             // if WaveHeight, grow by it
-            if(!basegfx::fTools::equalZero(getWaveHeight()))
+            if(basegfx::fTools::more(getWaveHeight(), 0.0))
             {
                 aRetval.grow(getWaveHeight());
             }
 
             // if line width, grow by it
-            if(!basegfx::fTools::equalZero(getLineAttribute().getWidth()))
+            if(basegfx::fTools::more(getLineAttribute().getWidth(), 0.0))
             {
-                aRetval.grow(getLineAttribute().getWidth());
+                aRetval.grow(getLineAttribute().getWidth() * 0.5);
             }
 
             return aRetval;
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index faffb6095f..7d83d05a46 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -68,6 +68,10 @@ namespace drawinglayer
         {
             maContent.SetOutputSizePixel(maDestPixel.GetSize(), false);
 
+            // #i93485# assert when copying from window to VDev is used
+            OSL_ENSURE(rOutDev.GetOutDevType() != OUTDEV_WINDOW, 
+                "impBufferDevice render helper: Copying from Window to VDev, this should be avoided (!)");
+
             const bool bWasEnabledSrc(rOutDev.IsMapModeEnabled());
             rOutDev.EnableMapMode(false);
             maContent.DrawOutDev(aEmptyPoint, maDestPixel.GetSize(), maDestPixel.TopLeft(), maDestPixel.GetSize(), rOutDev);
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index a5d8345ed0..723155a18b 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -98,23 +98,14 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
+using namespace com::sun::star;
+
+//////////////////////////////////////////////////////////////////////////////
+
 namespace drawinglayer
 {
     namespace processor2d
     {
-        //////////////////////////////////////////////////////////////////////////////
-        // UNO usings
-        using ::com::sun::star::uno::Reference;
-        using ::com::sun::star::uno::UNO_QUERY;
-        using ::com::sun::star::uno::UNO_QUERY_THROW;
-        using ::com::sun::star::uno::Exception;
-        using ::com::sun::star::beans::XPropertySet;
-        using ::com::sun::star::beans::XPropertySetInfo;
-        using ::com::sun::star::awt::XView;
-        //using ::com::sun::star::awt::XGraphics;
-        //using ::com::sun::star::awt::XWindow;
-        //using ::com::sun::star::awt::PosSize::POSSIZE;
-
         Rectangle VclMetafileProcessor2D::impDumpToMetaFile(
             const primitive2d::Primitive2DSequence& rContent, 
             GDIMetaFile& o_rContentMetafile)
@@ -387,7 +378,7 @@ namespace drawinglayer
         }
 
         // init static break iterator
-        Reference< ::com::sun::star::i18n::XBreakIterator > VclMetafileProcessor2D::mxBreakIterator;
+        uno::Reference< ::com::sun::star::i18n::XBreakIterator > VclMetafileProcessor2D::mxBreakIterator;
 
         VclMetafileProcessor2D::VclMetafileProcessor2D(const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev)
         :	VclProcessor2D(rViewInformation, rOutDev),
@@ -691,93 +682,113 @@ namespace drawinglayer
                 case PRIMITIVE2D_ID_CONTROLPRIMITIVE2D :
                 {
                     const primitive2d::ControlPrimitive2D& rControlPrimitive = static_cast< const primitive2d::ControlPrimitive2D& >(rCandidate);
-                    bool bDoProcessRecursively(true);
-                    static bool bSuppressPDFExtOutDevDataSupport(false);
-                    static bool bSuppressPrinterOutput(false);
-                    
-                    if(mpPDFExtOutDevData && !bSuppressPDFExtOutDevDataSupport && mpPDFExtOutDevData->GetIsExportFormFields())
+                    const uno::Reference< awt::XControl >& rXControl(rControlPrimitive.getXControl());
+                    bool bIsPrintableControl(false);
+
+                    // find out if control is printable
+                    if(rXControl.is())
                     {
-                        // emulate data handling from UnoControlPDFExportContact
-                        // I have now moved describePDFControl to toolkit, thus i can implement the PDF
-                        // form control support now as follows
-                        ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget > pPDFControl;
-                        ::toolkitform::describePDFControl( rControlPrimitive.getXControl(), pPDFControl );
-                        
-                        if(pPDFControl.get())
+                        try
                         {
-                            // still need to fill in the location (is a class Rectangle)
-                            const basegfx::B2DRange aRangeLogic(rControlPrimitive.getB2DRange(getViewInformation2D()));
-                            const Rectangle aRectLogic(
-                                (sal_Int32)floor(aRangeLogic.getMinX()), (sal_Int32)floor(aRangeLogic.getMinY()), 
-                                (sal_Int32)ceil(aRangeLogic.getMaxX()), (sal_Int32)ceil(aRangeLogic.getMaxY()));
-                            pPDFControl->Location = aRectLogic;
-                            
-                            Size aFontSize(pPDFControl->TextFont.GetSize());
-                            aFontSize = mpOutputDevice->LogicToLogic(aFontSize, MapMode(MAP_POINT), mpOutputDevice->GetMapMode());
-                            pPDFControl->TextFont.SetSize(aFontSize);
-                            
-                            mpPDFExtOutDevData->BeginStructureElement(vcl::PDFWriter::Form);
-                            mpPDFExtOutDevData->CreateControl(*pPDFControl.get());
-                            mpPDFExtOutDevData->EndStructureElement();
+                            uno::Reference< beans::XPropertySet > xModelProperties(rXControl->getModel(), uno::UNO_QUERY);
+                            uno::Reference< beans::XPropertySetInfo > xPropertyInfo(xModelProperties.is() 
+                                ? xModelProperties->getPropertySetInfo() 
+                                : uno::Reference< beans::XPropertySetInfo >());
+                            const ::rtl::OUString sPrintablePropertyName(RTL_CONSTASCII_USTRINGPARAM("Printable"));
 
-                            // no normal paint needed (see original UnoControlPDFExportContact::do_PaintObject); 
-                            // do not process recursively
-                            bDoProcessRecursively = false;
+                            if(xPropertyInfo.is() && xPropertyInfo->hasPropertyByName(sPrintablePropertyName))
+                            {
+                                OSL_VERIFY(xModelProperties->getPropertyValue(sPrintablePropertyName) >>= bIsPrintableControl);
+                            }
+                        }
+                        catch(const uno::Exception&)
+                        {
+                            OSL_ENSURE(false, "VclMetafileProcessor2D: No access to printable flag of Control, caught an exception!");
                         }
                     }
 
-                    // printer output preparation
-                    if(bDoProcessRecursively && !bSuppressPrinterOutput)
+                    // PDF export and printing only for printable controls
+                    if(bIsPrintableControl)
                     {
-                        // this needs to do the same as UnoControlPrintOrPreviewContact::do_PaintObject
-                        // does ATM. This means prepare_PrintOrPrintPreview and paint_Control
-                        bool bIsPrintableControl(false);
+                        const bool bPDFExport(mpPDFExtOutDevData && mpPDFExtOutDevData->GetIsExportFormFields());
+                        bool bDoProcessRecursively(true);
 
-                        if(rControlPrimitive.getXControl().is())
+                        if(bPDFExport)
                         {
-                            try
+                            // PDF export. Emulate data handling from UnoControlPDFExportContact
+                            // I have now moved describePDFControl to toolkit, thus i can implement the PDF
+                            // form control support now as follows
+                            ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget > pPDFControl;
+                            ::toolkitform::describePDFControl(rXControl, pPDFControl);
+                            
+                            if(pPDFControl.get())
                             {
-                                // find out if control is printable
-                                Reference< XPropertySet > xModelProperties(rControlPrimitive.getXControl()->getModel(), UNO_QUERY);
-                                Reference< XPropertySetInfo > xPropertyInfo(xModelProperties.is() 
-                                    ? xModelProperties->getPropertySetInfo() 
-                                    : Reference< XPropertySetInfo >());
-                                const ::rtl::OUString sPrintablePropertyName(RTL_CONSTASCII_USTRINGPARAM("Printable"));
-
-                                if(xPropertyInfo.is() && xPropertyInfo->hasPropertyByName(sPrintablePropertyName))
-                                {
-                                    OSL_VERIFY(xModelProperties->getPropertyValue(sPrintablePropertyName) >>= bIsPrintableControl);
-                                }
+                                // still need to fill in the location (is a class Rectangle)
+                                const basegfx::B2DRange aRangeLogic(rControlPrimitive.getB2DRange(getViewInformation2D()));
+                                const Rectangle aRectLogic(
+                                    (sal_Int32)floor(aRangeLogic.getMinX()), (sal_Int32)floor(aRangeLogic.getMinY()), 
+                                    (sal_Int32)ceil(aRangeLogic.getMaxX()), (sal_Int32)ceil(aRangeLogic.getMaxY()));
+                                pPDFControl->Location = aRectLogic;
+                                
+                                Size aFontSize(pPDFControl->TextFont.GetSize());
+                                aFontSize = mpOutputDevice->LogicToLogic(aFontSize, MapMode(MAP_POINT), mpOutputDevice->GetMapMode());
+                                pPDFControl->TextFont.SetSize(aFontSize);
+                                
+                                mpPDFExtOutDevData->BeginStructureElement(vcl::PDFWriter::Form);
+                                mpPDFExtOutDevData->CreateControl(*pPDFControl.get());
+                                mpPDFExtOutDevData->EndStructureElement();
+
+                                // no normal paint needed (see original UnoControlPDFExportContact::do_PaintObject); 
+                                // do not process recursively
+                                bDoProcessRecursively = false;
                             }
-                            catch(const Exception&)
+                            else
                             {
-                                OSL_ENSURE(false, "VclMetafileProcessor2D: No access to printable flag of Control, caught an exception!");
+                                // PDF export did not work, try simple output.
+                                // Fallback to printer output by not setting bDoProcessRecursively
+                                // to false.
                             }
                         }
-
-                        if(bIsPrintableControl)
+                        
+                        // #i93169# used flag the wrong way; true means that nothing was done yet
+                        if(bDoProcessRecursively)
                         {
+                            // printer output
                             try
                             {
-                                // update position and size
-                                const basegfx::B2DPoint aTopLeftPixel(PositionAndSizeControl(rControlPrimitive));
-                                
-                                // output to given device
-                                Reference< XView > xControlView(rControlPrimitive.getXControl(), UNO_QUERY_THROW);
-                                xControlView->draw(basegfx::fround(aTopLeftPixel.getX()), basegfx::fround(aTopLeftPixel.getY()));
-                                bDoProcessRecursively = false;
+                                // remember old graphics and create new
+                                uno::Reference< awt::XView > xControlView(rXControl, uno::UNO_QUERY_THROW);
+                                const uno::Reference< awt::XGraphics > xOriginalGraphics(xControlView->getGraphics());
+                                const uno::Reference< awt::XGraphics > xNewGraphics(mpOutputDevice->CreateUnoGraphics());
+
+                                if(xNewGraphics.is())
+                                {
+                                    // link graphics and view
+                                    xControlView->setGraphics(xNewGraphics);
+
+                                    // get position
+                                    const basegfx::B2DHomMatrix aObjectToDiscrete(getViewInformation2D().getObjectToViewTransformation() * rControlPrimitive.getTransform());
+                                    const basegfx::B2DPoint aTopLeftDiscrete(aObjectToDiscrete * basegfx::B2DPoint(0.0, 0.0));
+                                    
+                                    // draw it
+                                    xControlView->draw(basegfx::fround(aTopLeftDiscrete.getX()), basegfx::fround(aTopLeftDiscrete.getY()));
+                                    bDoProcessRecursively = false;
+                                    
+                                    // restore original graphics
+                                    xControlView->setGraphics(xOriginalGraphics);
+                                }
                             }
-                            catch( const Exception& )
+                            catch( const uno::Exception& )
                             {
                                 OSL_ENSURE(false, "VclMetafileProcessor2D: Printing of Control failed, caught an exception!");
                             }
                         }
-                    }
 
-                    // process recursively and add MetaFile comment
-                    if(bDoProcessRecursively)
-                    {
-                        process(rControlPrimitive.get2DDecomposition(getViewInformation2D()));
+                        // process recursively if not done yet to export as decomposition (bitmap)
+                        if(bDoProcessRecursively)
+                        {
+                            process(rControlPrimitive.get2DDecomposition(getViewInformation2D()));
+                        }
                     }
                     
                     break;
@@ -917,8 +928,8 @@ namespace drawinglayer
                         // support for TEXT_ MetaFile actions only for decorated texts
                         if(!mxBreakIterator.is())
                         {
-                            Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(::comphelper::getProcessServiceFactory());
-                            mxBreakIterator.set(xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator")), UNO_QUERY);
+                            uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(::comphelper::getProcessServiceFactory());
+                            mxBreakIterator.set(xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator")), uno::UNO_QUERY);
                         }
 
                         if(mxBreakIterator.is())
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index b679a2c4bf..45fb80dbc8 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -62,10 +62,16 @@
 #include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <vcl/hatch.hxx>
+#include <tools/diagnose_ex.h>
+#include <com/sun/star/awt/PosSize.hpp>
 #include <cstdio>
 
 //////////////////////////////////////////////////////////////////////////////
 
+using namespace com::sun::star;
+
+//////////////////////////////////////////////////////////////////////////////
+
 namespace drawinglayer
 {
     namespace processor2d
@@ -242,9 +248,9 @@ namespace drawinglayer
                     const primitive2d::Primitive2DSequence rContent = rUniAlphaCandidate.getChildren();
                     bool bDrawTransparentUsed(false);
 
-                    // ATM need to disable this since OutputDevice::DrawTransparent uses the
-                    // old tools::Polygon classes and may not be sufficient here. HDU is evaluating...
-                    static bool bAllowUsingDrawTransparent(false);
+                    // since DEV300 m33 DrawTransparent is supported in VCL (for some targets
+                    // natively), so i am now enabling this shortcut
+                    static bool bAllowUsingDrawTransparent(true);
 
                     if(bAllowUsingDrawTransparent && rContent.hasElements() && 1 == rContent.getLength())
                     {
@@ -268,8 +274,8 @@ namespace drawinglayer
 
                     if(!bDrawTransparentUsed)
                     {
-                        // use decomposition
-                        process(rCandidate.get2DDecomposition(getViewInformation2D()));
+                        // unified sub-transparence. Draw to VDev first.
+                        RenderUnifiedAlphaPrimitive2D(rUniAlphaCandidate);
                     }
 
                     break;
@@ -308,35 +314,43 @@ namespace drawinglayer
                 {
                     // control primitive
                     const primitive2d::ControlPrimitive2D& rControlPrimitive = static_cast< const primitive2d::ControlPrimitive2D& >(rCandidate);
+                    const uno::Reference< awt::XControl >& rXControl(rControlPrimitive.getXControl());
 
-                    // if control primitive is a xWindow2 and visible, it oes not need to be painted
-                    bool bControlIsVisibleAsChildWindow(false);
-
-                    if(rControlPrimitive.getXControl().is())
+                    try
                     {
-                        com::sun::star::uno::Reference< com::sun::star::awt::XWindow2 > xControlWindow(rControlPrimitive.getXControl(), com::sun::star::uno::UNO_QUERY_THROW);
+                        // remember old graphics and create new
+                        uno::Reference< awt::XView > xControlView(rXControl, uno::UNO_QUERY_THROW);
+                        const uno::Reference< awt::XGraphics > xOriginalGraphics(xControlView->getGraphics());
+                        const uno::Reference< awt::XGraphics > xNewGraphics(mpOutputDevice->CreateUnoGraphics());
 
-                        if(xControlWindow.is())
+                        if(xNewGraphics.is())
                         {
-                            if(xControlWindow->isVisible())
+                            // link graphics and view
+                            xControlView->setGraphics(xNewGraphics);
+
+                            // get position
+                            const basegfx::B2DHomMatrix aObjectToPixel(maCurrentTransformation * rControlPrimitive.getTransform());
+                            const basegfx::B2DPoint aTopLeftPixel(aObjectToPixel * basegfx::B2DPoint(0.0, 0.0));
+
+                            // find out if the control is already visualized as a VCL-ChildWindow. If yes,
+                            // it does not need to be painted at all.
+                            uno::Reference< awt::XWindow2 > xControlWindow(rXControl, uno::UNO_QUERY_THROW);
+                            const bool bControlIsVisibleAsChildWindow(rXControl->getPeer().is() && xControlWindow->isVisible());
+                            
+                            if(!bControlIsVisibleAsChildWindow)
                             {
-                                bControlIsVisibleAsChildWindow = true;
+                                // draw it
+                                xControlView->draw(basegfx::fround(aTopLeftPixel.getX()), basegfx::fround(aTopLeftPixel.getY()));
                             }
+                            
+                            // restore original graphics
+                            xControlView->setGraphics(xOriginalGraphics);
                         }
                     }
-
-                    if(bControlIsVisibleAsChildWindow)
+                    catch(const uno::Exception&)
                     {
-                        // update position and size as VCL Child Window
-                        static bool bDoSizeAndPositionControlsB(false);
+                        DBG_UNHANDLED_EXCEPTION();
                         
-                        if(bDoSizeAndPositionControlsB)
-                        {
-                            PositionAndSizeControl(rControlPrimitive);
-                        }
-                    }
-                    else
-                    {
                         // process recursively and use the decomposition as Bitmap
                         process(rCandidate.get2DDecomposition(getViewInformation2D()));
                     }
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 2c2b09b660..811d77e91f 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -56,6 +56,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <vclhelperbufferdevice.hxx>
 #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
+#include <drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx>
 #include <drawinglayer/primitive2d/alphaprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx>
@@ -64,6 +65,7 @@
 #include <svtools/ctloptions.hxx>
 #include <vcl/svapp.hxx>
 #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
+#include <tools/diagnose_ex.h>
 
 //////////////////////////////////////////////////////////////////////////////
 // control support
@@ -94,6 +96,7 @@ namespace drawinglayer
         using ::com::sun::star::uno::Reference;
         using ::com::sun::star::uno::UNO_QUERY;
         using ::com::sun::star::uno::UNO_QUERY_THROW;
+        using ::com::sun::star::uno::Exception;
         using ::com::sun::star::awt::XView;
         using ::com::sun::star::awt::XGraphics;
         using ::com::sun::star::awt::XWindow;
@@ -712,6 +715,52 @@ namespace drawinglayer
             }
         }
 
+        // unified sub-transparence. Draw to VDev first.
+        void VclProcessor2D::RenderUnifiedAlphaPrimitive2D(const primitive2d::UnifiedAlphaPrimitive2D& rTransCandidate)
+        {
+            static bool bForceToDecomposition(false);
+
+            if(rTransCandidate.getChildren().hasElements())
+            {
+                if(bForceToDecomposition)
+                {
+                    // use decomposition
+                    process(rTransCandidate.get2DDecomposition(getViewInformation2D()));
+                }
+                else 
+                {
+                    if(0.0 == rTransCandidate.getAlpha())
+                    {
+                        // no transparence used, so just use the content
+                        process(rTransCandidate.getChildren());
+                    }
+                    else if(rTransCandidate.getAlpha() > 0.0 && rTransCandidate.getAlpha() < 1.0)
+                    {
+                        // alpha is in visible range
+                        basegfx::B2DRange aRange(primitive2d::getB2DRangeFromPrimitive2DSequence(rTransCandidate.getChildren(), getViewInformation2D()));
+                        aRange.transform(maCurrentTransformation);
+                        impBufferDevice aBufferDevice(*mpOutputDevice, aRange);
+
+                        if(aBufferDevice.isVisible())
+                        {
+                            // remember last OutDev and set to content
+                            OutputDevice* pLastOutputDevice = mpOutputDevice;
+                            mpOutputDevice = &aBufferDevice.getContent();
+
+                            // paint content to it
+                            process(rTransCandidate.getChildren());
+                            
+                            // back to old OutDev
+                            mpOutputDevice = pLastOutputDevice;
+
+                            // dump buffer to outdev using given alpha
+                            aBufferDevice.paint(rTransCandidate.getAlpha());
+                        }
+                    }
+                }
+            }
+        }
+
         // sub-transparence group. Draw to VDev first.
         void VclProcessor2D::RenderAlphaPrimitive2D(const primitive2d::AlphaPrimitive2D& rTransCandidate)
         {
@@ -1100,32 +1149,6 @@ namespace drawinglayer
             }
         }
 
-        basegfx::B2DPoint VclProcessor2D::PositionAndSizeControl(const primitive2d::ControlPrimitive2D& rControlPrimitive2D)
-        {
-            // prepare output for given device
-            Reference< XGraphics > xGraphics(mpOutputDevice->CreateUnoGraphics());
-            Reference< XView > xControlView(rControlPrimitive2D.getXControl(), UNO_QUERY_THROW);
-            xControlView->setGraphics(xGraphics);
-
-            // set position and size (in pixel)
-            const basegfx::B2DHomMatrix aObjectToPixel(maCurrentTransformation * rControlPrimitive2D.getTransform());
-            const basegfx::B2DPoint aTopLeftPixel(aObjectToPixel * basegfx::B2DPoint(0.0, 0.0));
-            Reference< XWindow > xControlWindow(rControlPrimitive2D.getXControl(), UNO_QUERY);
-            
-            if(xControlWindow.is())
-            {
-                const basegfx::B2DPoint aBottomRightPixel(aObjectToPixel * basegfx::B2DPoint(1.0, 1.0));
-                
-                xControlWindow->setPosSize(
-                    basegfx::fround(aTopLeftPixel.getX()), basegfx::fround(aTopLeftPixel.getY()),
-                    basegfx::fround(aBottomRightPixel.getX() - aTopLeftPixel.getX()),
-                    basegfx::fround(aBottomRightPixel.getY() - aTopLeftPixel.getY()),
-                    POSSIZE);
-            }
-
-            return aTopLeftPixel;
-        }
-        
         //////////////////////////////////////////////////////////////////////////////
         // process support