merging in latest changes from OOO330(m3)

87 files changed, 1491 insertions, 1010 deletions

diff --git a/vcl/aqua/inc/salframeview.h b/vcl/aqua/inc/salframeview.h
index 498c9679e97c..0174c1a68832 100755
--- a/vcl/aqua/inc/salframeview.h
+++ b/vcl/aqua/inc/salframeview.h
@@ -108,6 +108,7 @@
 -(MacOSBOOL)sendKeyToFrameDirect: (USHORT)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod;
 -(MacOSBOOL)sendSingleCharacter:(NSEvent*)pEvent;
 -(MacOSBOOL)handleKeyDownException:(NSEvent*)pEvent;
+-(void)clearLastEvent;
 /*
     text action methods
 */
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h
index 247de1b95dec..8867d1d26078 100644
--- a/vcl/aqua/inc/salgdi.h
+++ b/vcl/aqua/inc/salgdi.h
@@ -191,7 +191,7 @@ public:
     virtual sal_Bool    drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
     virtual sal_Bool    drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
     virtual sal_Bool    drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
-    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin);
+    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
 
     // CopyArea --> No RasterOp, but ClipRegion
     virtual void        copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
@@ -229,17 +229,17 @@ public:
 
     CGPoint*                makeCGptArray(ULONG nPoints, const SalPoint*  pPtAry);
     // native widget rendering methods that require mirroring
-    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                               const Point& aPos, BOOL& rIsInside );
-    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& aCaption );
-    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                const rtl::OUString& aCaption );
-    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Region& rControlRegion, ControlState nState,
+    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& aCaption,
-                                                Region &rNativeBoundingRegion, Region &rNativeContentRegion );
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 
     // get device resolution
     virtual void            GetResolution( long& rDPIX, long& rDPIY );
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 5b1e24befc9b..8a4744d1efcd 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -988,6 +988,7 @@ bool AquaSalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPol
 // -----------------------------------------------------------------------
 
 bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine,
+    double fTransparency,
     const ::basegfx::B2DVector& rLineWidths,
     basegfx::B2DLineJoin eLineJoin )
 {
@@ -1032,6 +1033,7 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine,
         CGContextAddPath( mrContext, xPath );
         // draw path with antialiased line
         CGContextSetShouldAntialias( mrContext, true );
+        CGContextSetAlpha( mrContext, 1.0 - fTransparency );
         CGContextSetLineJoin( mrContext, aCGLineJoin );
         CGContextSetLineWidth( mrContext, rLineWidths.getX() );
         CGContextDrawPath( mrContext, kCGPathStroke );
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 5eccf88dc523..6e206977b5c4 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -379,13 +379,13 @@ BOOL AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart n
  *  aPos was or was not inside the native widget specified by the
  *  nType/nPart combination.
  */
-BOOL AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+BOOL AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                         const Point& rPos, BOOL& rIsInside )
 {
     if ( nType == CTRL_SCROLLBAR )
     {
         Rectangle aRect;
-        bool bValid = AquaGetScrollRect( /* TODO: m_nScreen */ nPart, rControlRegion.GetBoundRect(), aRect );
+        bool bValid = AquaGetScrollRect( /* TODO: m_nScreen */ nPart, rControlRegion, aRect );
         rIsInside = bValid ? aRect.IsInside( rPos ) : FALSE;
         if( GetSalData()->mbIsScrollbarDoubleMax )
         {
@@ -472,7 +472,7 @@ UInt32 AquaSalGraphics::getTrackState( ControlState nState )
  */
 BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                     ControlPart nPart,
-                    const Region& rControlRegion,
+                    const Rectangle& rControlRegion,
                     ControlState nState,
                     const ImplControlValue& aValue,
                     const rtl::OUString& aCaption )
@@ -484,7 +484,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
 
     CGContextSaveGState( mrContext );
 
-    Rectangle buttonRect = rControlRegion.GetBoundRect();
+    Rectangle buttonRect = rControlRegion;
     HIRect rc = ImplGetHIRectFromRectangle(buttonRect);
 
     /** Scrollbar parts code equivalent **
@@ -621,7 +621,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             // no animation
             aPushInfo.animation.time.start = 0;
             aPushInfo.animation.time.current = 0;
-            PushButtonValue* pPBVal = (PushButtonValue*)aValue.getOptionalVal();
+            PushButtonValue* pPBVal = aValue.getType() == CTRL_PUSHBUTTON ? (PushButtonValue*)&aValue : NULL;
             int nPaintHeight = static_cast<int>(rc.size.height);
 
             if( pPBVal && pPBVal->mbBevelButton )
@@ -790,7 +790,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
 
     case CTRL_SLIDER:
         {
-            SliderValue* pSLVal = (SliderValue*)aValue.getOptionalVal();
+            SliderValue* pSLVal = (SliderValue*)&aValue;
 
             HIThemeTrackDrawInfo aTrackDraw;
             aTrackDraw.kind = kThemeSliderMedium;
@@ -820,7 +820,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
 
     case CTRL_SCROLLBAR:
         {
-            ScrollbarValue* pScrollbarVal = (ScrollbarValue *)(aValue.getOptionalVal());
+            ScrollbarValue* pScrollbarVal = (ScrollbarValue *)&aValue;
 
             if( nPart == PART_DRAW_BACKGROUND_VERT ||
                 nPart == PART_DRAW_BACKGROUND_HORZ )
@@ -962,17 +962,19 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             //first, last or middle tab
             aTabItemDrawInfo.position=kHIThemeTabPositionMiddle;
 
-            TabitemValue *aTabValue=(TabitemValue *) aValue.getOptionalVal();
-            unsigned int nAlignement=aTabValue->mnAlignment;
+            TabitemValue* pTabValue = (TabitemValue *) &aValue;
+            unsigned int nAlignment = pTabValue->mnAlignment;
             //TABITEM_LEFTALIGNED (and TABITEM_RIGHTALIGNED) for the leftmost (or rightmost) tab
             //when there are several lines of tabs because there is only one first tab and one
             //last tab and TABITEM_FIRST_IN_GROUP (and TABITEM_LAST_IN_GROUP) because when the
             //line width is different from window width, there may not be TABITEM_RIGHTALIGNED
-            if((nAlignement & TABITEM_LEFTALIGNED)&&(nAlignement & TABITEM_RIGHTALIGNED)) //tab alone
+            if( ( (nAlignment & TABITEM_LEFTALIGNED)&&(nAlignment & TABITEM_RIGHTALIGNED) ) ||
+                ( (nAlignment & TABITEM_FIRST_IN_GROUP)&&(nAlignment & TABITEM_LAST_IN_GROUP) )
+               ) //tab alone
                 aTabItemDrawInfo.position=kHIThemeTabPositionOnly;
-            else if((nAlignement & TABITEM_LEFTALIGNED)||(nAlignement & TABITEM_FIRST_IN_GROUP))
+            else if((nAlignment & TABITEM_LEFTALIGNED)||(nAlignment & TABITEM_FIRST_IN_GROUP))
                 aTabItemDrawInfo.position=kHIThemeTabPositionFirst;
-            else if((nAlignement & TABITEM_RIGHTALIGNED)||(nAlignement & TABITEM_LAST_IN_GROUP))
+            else if((nAlignment & TABITEM_RIGHTALIGNED)||(nAlignment & TABITEM_LAST_IN_GROUP))
                 aTabItemDrawInfo.position=kHIThemeTabPositionLast;
 
             //support for RTL
@@ -1087,7 +1089,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 if(nState & CTRL_STATE_FOCUSED) HIThemeDrawFocusRect(&rc, true, mrContext, kHIThemeOrientationNormal);
 
                 //buttons:
-                SpinbuttonValue* pSpinButtonVal = (SpinbuttonValue *)(aValue.getOptionalVal());
+                SpinbuttonValue* pSpinButtonVal = (SpinbuttonValue *)&aValue;
                 ControlState nUpperState = CTRL_STATE_ENABLED;//state of the upper button
                 ControlState nLowerState = CTRL_STATE_ENABLED;//and of the lower button
                 if(pSpinButtonVal) {//pSpinButtonVal is sometimes null
@@ -1226,7 +1228,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
  *  aValue:     An optional value (tristate/numerical/string)
  *  aCaption:   A caption or title string (like button text etc)
  */
-BOOL AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+BOOL AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                const rtl::OUString& aCaption )
 {
@@ -1247,14 +1249,14 @@ BOOL AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPar
  *  aValue:     An optional value (tristate/numerical/string)
  *  aCaption:       A caption or title string (like button text etc)
  */
-BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Region& rControlRegion, ControlState nState,
+BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                const ImplControlValue& aValue, const rtl::OUString& aCaption,
-                                                Region &rNativeBoundingRegion, Region &rNativeContentRegion )
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
 
 {
     BOOL toReturn = FALSE;
 
-    Rectangle aCtrlBoundRect( rControlRegion.GetBoundRect() );
+    Rectangle aCtrlBoundRect( rControlRegion );
     short x = aCtrlBoundRect.Left();
     short y = aCtrlBoundRect.Top();
     short w, h;
@@ -1269,14 +1271,14 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa
                 {
                     w = 19; // taken from HIG
                     h = aCtrlBoundRect.GetHeight();
-                    rNativeBoundingRegion = rNativeContentRegion = Region( Rectangle( Point( x, y ), Size( w, h ) ) );
+                    rNativeBoundingRegion = rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) );
                     toReturn = true;
                 }
                 else if( nPart == PART_THUMB_VERT )
                 {
                     w = aCtrlBoundRect.GetWidth();
                     h = 18; // taken from HIG
-                    rNativeBoundingRegion = rNativeContentRegion = Region( Rectangle( Point( x, y ), Size( w, h ) ) );
+                    rNativeBoundingRegion = rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) );
                     toReturn = true;
                 }
             }
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 0dfa0fa356aa..25dadf0e592b 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -1510,6 +1510,11 @@ private:
     mbKeyHandled = true;
 }
 
+-(void)clearLastEvent
+{
+    mpLastEvent = nil;
+}
+
 - (NSRect)firstRectForCharacterRange:(NSRange)theRange
 {
     SalExtTextInputPosEvent aPosEvent;
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index f39d7c675bc4..ed3086d8506f 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -370,6 +370,10 @@ bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rR
     displayPopupFrame.origin.y = pWin->ImplGetFrame()->maGeometry.nY - pParentAquaSalFrame->maGeometry.nY + offset;
     pParentAquaSalFrame->VCLToCocoa(displayPopupFrame, false);
 
+    // #i111992# if this menu was opened due to a key event, prevent dispatching that yet again
+    if( [pParentNSView respondsToSelector: @selector(clearLastEvent)] )
+        [pParentNSView performSelector:@selector(clearLastEvent)];
+
     // open popup menu
     NSPopUpButtonCell * pPopUpButtonCell = [[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO];
     [pPopUpButtonCell setMenu: pCopyMenu];
diff --git a/vcl/inc/vcl/abstdlg.hxx b/vcl/inc/vcl/abstdlg.hxx
index 1d4e08991bda..2fa134af5078 100644
--- a/vcl/inc/vcl/abstdlg.hxx
+++ b/vcl/inc/vcl/abstdlg.hxx
@@ -66,6 +66,16 @@ public:
     virtual void            Sync() = 0;
 };
 
+class VCL_DLLPUBLIC AbstractPasswordToOpenModifyDialog : public VclAbstractDialog
+{
+public:
+    virtual String  GetPasswordToOpen() const   = 0;
+    virtual String  GetPasswordToModify() const = 0;
+    virtual bool    IsRecommendToOpenReadonly() const = 0;
+};
+
+//-------------------------------------------------------------
+
 class VCL_DLLPUBLIC VclAbstractDialogFactory
 {
 public:
@@ -74,6 +84,9 @@ public:
     // nDialogId was previously a ResId without ResMgr; the ResourceId is now
     // an implementation detail of the factory
     virtual VclAbstractDialog*          CreateVclDialog( Window* pParent, sal_uInt32 nResId ) = 0;
+
+    // creates instance of PasswordToOpenModifyDialog from cui
+    virtual AbstractPasswordToOpenModifyDialog *    CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) = 0;
 };
 
 #endif
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 8f4b94bf7b18..fa185c32dcda 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -66,6 +66,8 @@ public:
     SAL_DLLPRIVATE void             ImplSetSymbolAlign( SymbolAlign eAlign );
     SAL_DLLPRIVATE SymbolAlign      ImplGetSymbolAlign() const;
     SAL_DLLPRIVATE void             ImplSetSmallSymbol( BOOL bSmall = TRUE );
+    SAL_DLLPRIVATE const Rectangle& ImplGetSymbolRect() const;
+    SAL_DLLPRIVATE void             ImplSetSymbolRect(const Rectangle&);
 
 protected:
                         Button( WindowType nType );
diff --git a/vcl/source/window/dndevdis.hxx b/vcl/inc/vcl/dndevdis.hxx
index 5b91bd0713ec..5b91bd0713ec 100644
--- a/vcl/source/window/dndevdis.hxx
+++ b/vcl/inc/vcl/dndevdis.hxx
diff --git a/vcl/source/window/dndlcon.hxx b/vcl/inc/vcl/dndlcon.hxx
index 5a41a20e4271..5a41a20e4271 100644
--- a/vcl/source/window/dndlcon.hxx
+++ b/vcl/inc/vcl/dndlcon.hxx
diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx
index 3b3938ec848b..dced5a19c461 100644
--- a/vcl/inc/vcl/gfxlink.hxx
+++ b/vcl/inc/vcl/gfxlink.hxx
@@ -33,9 +33,6 @@
 #include <vcl/mapmod.hxx>
 #include <tools/stream.hxx>
 
-//#if 0 // _SOLAR__PRIVATE
-#include <tools/urlobj.hxx>
-
 // -------------
 // - ImpBuffer -
 // -------------
@@ -62,7 +59,7 @@ struct ImpBuffer
 
 struct ImpSwap
 {
-    INetURLObject   maURL;
+    rtl::OUString   maURL;
     ULONG           mnDataSize;
     ULONG           mnRefCount;
 
@@ -71,7 +68,7 @@ struct ImpSwap
 
     BYTE*           GetData() const;
 
-    BOOL            IsSwapped() const { return maURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() > 0; }
+    BOOL            IsSwapped() const { return maURL.getLength() > 0; }
 
     void            WriteTo( SvStream& rOStm ) const;
 };
diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx
index 43c2e37a5fb2..e58881c9f463 100644
--- a/vcl/inc/vcl/graphite_adaptors.hxx
+++ b/vcl/inc/vcl/graphite_adaptors.hxx
@@ -86,8 +86,8 @@ namespace grutils
 //
 class VCL_DLLPUBLIC GraphiteFontAdaptor : public gr::Font
 {
-typedef std::map<const gr::gid16, std::pair<gr::Rect, gr::Point> > GlyphMetricMap;
-
+    typedef std::map<const gr::gid16, std::pair<gr::Rect, gr::Point> > GlyphMetricMap;
+    friend class GrFontHasher;
 public:
     static bool    IsGraphiteEnabledFont(ServerFont &) throw();
 
diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx
index 5472b32dd62f..af1392ed4d4b 100644
--- a/vcl/inc/vcl/graphite_cache.hxx
+++ b/vcl/inc/vcl/graphite_cache.hxx
@@ -105,15 +105,16 @@ typedef std::pair<GraphiteRopeMap::iterator, GraphiteRopeMap::iterator> GrRMEntr
 */
 class GraphiteSegmentCache
 {
+public:
   enum {
     // not really sure what good values are here,
     // bucket size should be >> cache size
-    SEG_BUCKET_SIZE = 4096,
-    SEG_CACHE_SIZE = 255
+    SEG_BUCKET_FACTOR = 4,
+    SEG_DEFAULT_CACHE_SIZE = 2047
   };
-public:
-  GraphiteSegmentCache()
-    : m_segMap(SEG_BUCKET_SIZE),
+  GraphiteSegmentCache(sal_uInt32 nSegCacheSize)
+    : m_segMap(nSegCacheSize * SEG_BUCKET_FACTOR),
+    m_nSegCacheSize(nSegCacheSize),
     m_oldestKey(NULL) {};
   ~GraphiteSegmentCache()
   {
@@ -224,6 +225,7 @@ public:
 private:
   GraphiteSegMap m_segMap;
   GraphiteRopeMap m_ropeMap;
+  sal_uInt32 m_nSegCacheSize;
   const xub_Unicode * m_oldestKey;
   const xub_Unicode * m_prevKey;
 };
@@ -236,7 +238,24 @@ typedef std::hash_map<int, GraphiteSegmentCache *, std::hash<int> > GraphiteCach
 class GraphiteCacheHandler
 {
 public:
-  GraphiteCacheHandler() : m_cacheMap(255) {};
+  GraphiteCacheHandler() : m_cacheMap(255)
+  {
+    const char * pEnvCache = getenv( "SAL_GRAPHITE_CACHE_SIZE" );
+    if (pEnvCache != NULL)
+    {
+        int envCacheSize = atoi(pEnvCache);
+        if (envCacheSize <= 0)
+            m_nSegCacheSize = GraphiteSegmentCache::SEG_DEFAULT_CACHE_SIZE;
+        else
+        {
+            m_nSegCacheSize = envCacheSize;
+        }
+    }
+    else
+    {
+        m_nSegCacheSize = GraphiteSegmentCache::SEG_DEFAULT_CACHE_SIZE;
+    }
+  };
   ~GraphiteCacheHandler()
   {
     GraphiteCacheMap::iterator i = m_cacheMap.begin();
@@ -257,12 +276,13 @@ public:
     {
       return m_cacheMap.find(fontHash)->second;
     }
-    GraphiteSegmentCache *pCache = new GraphiteSegmentCache();
+    GraphiteSegmentCache *pCache = new GraphiteSegmentCache(m_nSegCacheSize);
     m_cacheMap[fontHash] = pCache;
     return pCache;
   }
 private:
   GraphiteCacheMap m_cacheMap;
+  sal_uInt32 m_nSegCacheSize;
 };
 
 #endif
diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/vcl/graphite_layout.hxx
index 520f4620cd90..765a154a9898 100644
--- a/vcl/inc/vcl/graphite_layout.hxx
+++ b/vcl/inc/vcl/graphite_layout.hxx
@@ -65,6 +65,19 @@ class GraphiteFontAdaptor;
 class GrSegRecord;
 // SAL/VCL types
 class ServerFont;
+
+#ifdef WNT
+// The GraphiteWinFont is just a wrapper to enable GrFontHasher to be a friend
+// so that UniqueCacheInfo can be called.
+#include <graphite/WinFont.h>
+class GraphiteWinFont : public gr::WinFont
+{
+    friend class GrFontHasher;
+public:
+    GraphiteWinFont(HDC hdc) : gr::WinFont(hdc) {};
+    virtual ~GraphiteWinFont() {};
+};
+#endif
 // Graphite types
 namespace gr { class Segment; class GlyphIterator; }
 namespace grutils { class GrFeatureParser; }
@@ -98,7 +111,7 @@ public:
         iterator_pair_t    neighbour_clusters(const_iterator) const;
     private:
         std::pair<float,float> appendCluster(gr::Segment & rSeg, ImplLayoutArgs & rArgs,
-            bool bRtl, int nFirstCharInCluster, int nNextChar,
+            bool bRtl, float fSegmentAdvance, int nFirstCharInCluster, int nNextChar,
             int nFirstGlyphInCluster, int nNextGlyph, float fScaling,
             std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char,
             std::vector<int> & rCharDxs, long & rDXOffset);
diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx
index 33f60a1e8a2f..ac278f76f65b 100644
--- a/vcl/inc/vcl/ilstbox.hxx
+++ b/vcl/inc/vcl/ilstbox.hxx
@@ -396,6 +396,7 @@ private:
                         mbHScroll       : 1,    // HScroll an oder aus
                         mbAutoHScroll   : 1;    // AutoHScroll an oder aus
     Link                maScrollHdl;    // Weil der vom ImplListBoxWindow selbst benoetigt wird.
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
 
 protected:
     virtual void        GetFocus();
@@ -500,6 +501,7 @@ public:
 
     // pb: #106948# explicit mirroring for calc
     inline void     EnableMirroring()   { maLBWindow.EnableMirroring(); }
+    inline void     SetDropTraget(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; }
 };
 
 // -----------------------------
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index c0cc3b5b51d6..908f3e30319c 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -41,6 +41,7 @@ struct MenuItemData;
 class Point;
 class Size;
 class Rectangle;
+class Menu;
 class MenuItemList;
 class HelpEvent;
 class Image;
@@ -102,6 +103,17 @@ typedef USHORT MenuItemBits;
 // forces images & toggle visibility for toolbar config popup
 #define MENU_FLAG_SHOWCHECKIMAGES     0x0008
 
+struct ImplMenuDelData
+{
+    ImplMenuDelData* mpNext;
+    const Menu* mpMenu;
+
+    ImplMenuDelData( const Menu* pMenu );
+    ~ImplMenuDelData();
+
+    bool isDeleted() const { return mpMenu == 0; }
+};
+
 // --------
 // - Menu -
 // --------
@@ -120,9 +132,9 @@ class VCL_DLLPUBLIC Menu : public Resource
     friend class MenuFloatingWindow;
     friend class PopupMenu;
     friend class SystemWindow;
-
+    friend struct ImplMenuDelData;
 private:
-    void*               pMenuData_NotUsedYet;
+    ImplMenuDelData*    mpFirstDel;
     MenuItemList*       pItemList;          // Liste mit den MenuItems
     MenuLogo*           pLogo;
     Menu*               pStartedFrom;
@@ -186,6 +198,8 @@ protected:
     // return value is Max( rCheckHeight, rRadioHeight )
     SAL_DLLPRIVATE long             ImplGetNativeCheckAndRadioSize( Window*, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) const;
 
+    SAL_DLLPRIVATE void                ImplAddDel( ImplMenuDelData &rDel );
+    SAL_DLLPRIVATE void                ImplRemoveDel( ImplMenuDelData &rDel );
 public:
     SAL_DLLPRIVATE void             ImplKillLayoutData() const;
     SAL_DLLPRIVATE Menu*            ImplGetStartedFrom() const;
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 9b748f2b5937..f787df3692ce 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -1191,14 +1191,14 @@ public:
     // Query the native control to determine if it was acted upon
     BOOL                HitTestNativeControl(   ControlType nType,
                                                 ControlPart nPart,
-                                                const Region& rControlRegion,
+                                                const Rectangle& rControlRegion,
                                                 const Point& aPos,
                                                 BOOL& rIsInside );
 
     // Request rendering of a particular control and/or part
     BOOL                DrawNativeControl(  ControlType nType,
                                             ControlPart nPart,
-                                            const Region& rControlRegion,
+                                            const Rectangle& rControlRegion,
                                             ControlState nState,
                                             const ImplControlValue& aValue,
                                             ::rtl::OUString aCaption );
@@ -1206,7 +1206,7 @@ public:
      // Request rendering of a caption string for a control
     BOOL                DrawNativeControlText(  ControlType nType,
                                                 ControlPart nPart,
-                                                const Region& rControlRegion,
+                                                const Rectangle& rControlRegion,
                                                 ControlState nState,
                                                 const ImplControlValue& aValue,
                                                 ::rtl::OUString aCaption );
@@ -1214,12 +1214,12 @@ public:
     // Query the native control's actual drawing region (including adornment)
     BOOL                GetNativeControlRegion( ControlType nType,
                                                 ControlPart nPart,
-                                                const Region& rControlRegion,
+                                                const Rectangle& rControlRegion,
                                                 ControlState nState,
                                                 const ImplControlValue& aValue,
                                                 ::rtl::OUString aCaption,
-                                                Region &rNativeBoundingRegion,
-                                                Region &rNativeContentRegion );
+                                                Rectangle &rNativeBoundingRegion,
+                                                Rectangle &rNativeContentRegion );
 
 };
 
diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/vcl/salgdi.hxx
index 510e797678b0..f75817071304 100644
--- a/vcl/inc/vcl/salgdi.hxx
+++ b/vcl/inc/vcl/salgdi.hxx
@@ -125,7 +125,7 @@ protected:
     virtual void        drawPolygon( ULONG nPoints, const SalPoint* pPtAry ) = 0;
     virtual void        drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) = 0;
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) = 0;
-    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin ) = 0;
+    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin ) = 0;
     virtual sal_Bool    drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) = 0;
     virtual sal_Bool    drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) = 0;
     virtual sal_Bool    drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) = 0;
@@ -158,17 +158,17 @@ protected:
     virtual BOOL        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ) = 0;
 
     // native widget rendering methods that require mirroring
-    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                               const Point& aPos, BOOL& rIsInside );
-    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& aCaption );
-    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                const rtl::OUString& aCaption );
-    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Region& rControlRegion, ControlState nState,
+    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& aCaption,
-                                                Region &rNativeBoundingRegion, Region &rNativeContentRegion );
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 
     /** Render bitmap with alpha channel
 
@@ -373,7 +373,7 @@ public:
                                              PCONSTSALPOINT* pPtAry,
                                              const OutputDevice *pOutDev );
     bool                    DrawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency, const OutputDevice* );
-    bool                    DrawPolyLine( const basegfx::B2DPolygon&, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, const OutputDevice* );
+    bool                    DrawPolyLine( const basegfx::B2DPolygon&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, const OutputDevice* );
     sal_Bool                DrawPolyLineBezier( ULONG nPoints,
                                                 const SalPoint* pPtAry,
                                                 const BYTE* pFlgAry,
@@ -440,7 +440,7 @@ public:
     // Query the native control to determine if it was acted upon
     BOOL HitTestNativeControl( ControlType nType,
                                       ControlPart nPart,
-                                      const Region& rControlRegion,
+                                      const Rectangle& rControlRegion,
                                       const Point& aPos,
                                       BOOL& rIsInside,
                                       const OutputDevice *pOutDev );
@@ -448,7 +448,7 @@ public:
     // Request rendering of a particular control and/or part
     BOOL DrawNativeControl( ControlType nType,
                                     ControlPart nPart,
-                                    const Region& rControlRegion,
+                                    const Rectangle& rControlRegion,
                                     ControlState nState,
                                     const ImplControlValue& aValue,
                                     const rtl::OUString& aCaption,
@@ -457,7 +457,7 @@ public:
     // Request rendering of a caption string for a control
     BOOL DrawNativeControlText( ControlType nType,
                                         ControlPart nPart,
-                                        const Region& rControlRegion,
+                                        const Rectangle& rControlRegion,
                                         ControlState nState,
                                         const ImplControlValue& aValue,
                                         const rtl::OUString& aCaption,
@@ -466,12 +466,12 @@ public:
     // Query the native control's actual drawing region (including adornment)
     BOOL GetNativeControlRegion( ControlType nType,
                                          ControlPart nPart,
-                                         const Region& rControlRegion,
+                                         const Rectangle& rControlRegion,
                                          ControlState nState,
                                          const ImplControlValue& aValue,
                                          const rtl::OUString& aCaption,
-                                         Region &rNativeBoundingRegion,
-                                         Region &rNativeContentRegion,
+                                         Rectangle &rNativeBoundingRegion,
+                                         Rectangle &rNativeContentRegion,
                                          const OutputDevice *pOutDev );
 
     static void AddDevFontSubstitute( OutputDevice* pOutDev,
diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx
index 8e98791d9f78..19c34cbc5e34 100644
--- a/vcl/inc/vcl/salnativewidgets.hxx
+++ b/vcl/inc/vcl/salnativewidgets.hxx
@@ -41,6 +41,9 @@
 
 typedef sal_uInt32      ControlType;
 
+// for use in general purpose ImplControlValue
+#define CTRL_GENERIC            0
+
 // Normal PushButton/Command Button
 #define CTRL_PUSHBUTTON         1
 
@@ -260,13 +263,50 @@ enum ButtonValue {
     BUTTONVALUE_MIXED
 };
 
-#ifdef __cplusplus
+/* ImplControlValue:
+ *
+ *   Generic value container for all control parts.
+ */
+
+class VCL_DLLPUBLIC ImplControlValue
+{
+    friend class SalFrame;
+
+    private:
+        ControlType     mType;
+        ButtonValue     mTristate;    // Tristate value: on, off, mixed
+        long            mNumber;      // numeric value
+    protected:
+        ImplControlValue( ControlType i_eType, ButtonValue i_eTriState, long i_nNumber )
+        : mType( i_eType )
+        , mTristate( i_eTriState )
+        , mNumber( i_nNumber )
+        {}
+
+    public:
+        explicit ImplControlValue( ButtonValue nTristate )
+            : mType( CTRL_GENERIC ), mTristate(nTristate), mNumber(0) {}
+        explicit ImplControlValue( long nNumeric )
+            : mType( CTRL_GENERIC ), mTristate(BUTTONVALUE_DONTKNOW), mNumber( nNumeric) {}
+        inline ImplControlValue()
+            : mType( CTRL_GENERIC ), mTristate(BUTTONVALUE_DONTKNOW), mNumber(0) {}
+
+        virtual ~ImplControlValue();
+
+        ControlType getType() const { return mType; }
+
+        inline ButtonValue      getTristateVal( void ) const { return mTristate; }
+        inline void         setTristateVal( ButtonValue nTristate ) { mTristate = nTristate; }
+
+        inline long         getNumericVal( void ) const { return mNumber; }
+        inline void         setNumericVal( long nNumeric ) { mNumber = nNumeric; }
+};
 
 /* ScrollbarValue:
  *
  *   Value container for scrollbars.
  */
-class VCL_DLLPUBLIC ScrollbarValue
+ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue
 {
     public:
         long            mnMin;
@@ -283,15 +323,16 @@ class VCL_DLLPUBLIC ScrollbarValue
         ControlState    mnPage2State;
 
         inline ScrollbarValue()
-                {
-                    mnMin = 0; mnMax = 0; mnCur = 0; mnVisibleSize = 0;
-                    mnButton1State = 0; mnButton2State = 0;
-                    mnThumbState = 0; mnPage1State = 0; mnPage2State = 0;
-                };
-        inline ~ScrollbarValue() {};
+        : ImplControlValue( CTRL_SCROLLBAR, BUTTONVALUE_DONTKNOW, 0 )
+        {
+            mnMin = 0; mnMax = 0; mnCur = 0; mnVisibleSize = 0;
+            mnButton1State = 0; mnButton2State = 0;
+            mnThumbState = 0; mnPage1State = 0; mnPage2State = 0;
+        };
+        virtual ~ScrollbarValue();
 };
 
-class VCL_DLLPUBLIC SliderValue
+class VCL_DLLPUBLIC SliderValue : public ImplControlValue
 {
     public:
         long            mnMin;
@@ -300,9 +341,11 @@ class VCL_DLLPUBLIC SliderValue
         Rectangle       maThumbRect;
         ControlState    mnThumbState;
 
-        SliderValue() : mnMin( 0 ), mnMax( 0 ), mnCur( 0 ), mnThumbState( 0 )
+        SliderValue()
+        : ImplControlValue( CTRL_SLIDER, BUTTONVALUE_DONTKNOW, 0 )
+        , mnMin( 0 ), mnMax( 0 ), mnCur( 0 ), mnThumbState( 0 )
         {}
-        ~SliderValue() {}
+        virtual ~SliderValue();
 };
 
 /* TabitemValue:
@@ -317,23 +360,24 @@ class VCL_DLLPUBLIC SliderValue
 #define TABITEM_FIRST_IN_GROUP 0x004   // the tabitem is the first in group of tabitems
 #define TABITEM_LAST_IN_GROUP  0x008   // the tabitem is the last in group of tabitems
 
-class VCL_DLLPUBLIC TabitemValue
+class VCL_DLLPUBLIC TabitemValue : public ImplControlValue
 {
     public:
         unsigned int    mnAlignment;
 
         inline TabitemValue()
-                {
-                    mnAlignment = 0;
-                };
-        inline ~TabitemValue() {};
-
-        BOOL isLeftAligned()  { return (mnAlignment & TABITEM_LEFTALIGNED) != 0; }
-        BOOL isRightAligned() { return (mnAlignment & TABITEM_RIGHTALIGNED) != 0; }
-        BOOL isBothAligned()  { return isLeftAligned() && isRightAligned(); }
-        BOOL isNotAligned()   { return (mnAlignment & (TABITEM_LEFTALIGNED | TABITEM_RIGHTALIGNED)) == 0; }
-        BOOL isFirst()        { return (mnAlignment & TABITEM_FIRST_IN_GROUP) != 0; }
-        BOOL isLast()         { return (mnAlignment & TABITEM_LAST_IN_GROUP) != 0; }
+        : ImplControlValue( CTRL_TAB_ITEM, BUTTONVALUE_DONTKNOW, 0 )
+        {
+            mnAlignment = 0;
+        };
+        virtual ~TabitemValue();
+
+        BOOL isLeftAligned() const  { return (mnAlignment & TABITEM_LEFTALIGNED) != 0; }
+        BOOL isRightAligned() const { return (mnAlignment & TABITEM_RIGHTALIGNED) != 0; }
+        BOOL isBothAligned() const  { return isLeftAligned() && isRightAligned(); }
+        BOOL isNotAligned() const   { return (mnAlignment & (TABITEM_LEFTALIGNED | TABITEM_RIGHTALIGNED)) == 0; }
+        BOOL isFirst() const        { return (mnAlignment & TABITEM_FIRST_IN_GROUP) != 0; }
+        BOOL isLast() const         { return (mnAlignment & TABITEM_LAST_IN_GROUP) != 0; }
 };
 
 /* SpinbuttonValue:
@@ -342,7 +386,7 @@ class VCL_DLLPUBLIC TabitemValue
  *   Note: the other parameters of DrawNativeControl will have no meaning
  *         all parameters for spinbuttons are carried here
  */
-class VCL_DLLPUBLIC SpinbuttonValue
+class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue
 {
     public:
         Rectangle       maUpperRect;
@@ -353,20 +397,23 @@ class VCL_DLLPUBLIC SpinbuttonValue
         int         mnLowerPart;
 
         inline SpinbuttonValue()
-                {
-                    mnUpperState = mnLowerState = 0;
-                };
-        inline ~SpinbuttonValue() {};
+        : ImplControlValue( CTRL_SPINBUTTONS, BUTTONVALUE_DONTKNOW, 0 )
+        {
+            mnUpperState = mnLowerState = 0;
+        };
+        virtual ~SpinbuttonValue();
 };
 
 /*  Toolbarvalue:
  *
  *  Value container for toolbars detailing the grip position
  */
-class ToolbarValue
+class ToolbarValue : public ImplControlValue
 {
 public:
-    ToolbarValue()  { mbIsTopDockingArea = FALSE; }
+    ToolbarValue() : ImplControlValue( CTRL_TOOLBAR, BUTTONVALUE_DONTKNOW, 0 )
+    { mbIsTopDockingArea = FALSE; }
+    virtual ~ToolbarValue();
     Rectangle           maGripRect;
     BOOL                mbIsTopDockingArea; // indicates that this is the top aligned dockingarea
                                             // adjacent to the menubar
@@ -376,10 +423,12 @@ public:
  *
  *  Value container for menubars specifying height of adjacent docking area
  */
-class MenubarValue
+class MenubarValue : public ImplControlValue
 {
 public:
-    MenubarValue() { maTopDockingAreaHeight=0; }
+    MenubarValue() : ImplControlValue( CTRL_MENUBAR, BUTTONVALUE_DONTKNOW, 0 )
+    { maTopDockingAreaHeight=0; }
+    virtual ~MenubarValue();
     int             maTopDockingAreaHeight;
 };
 
@@ -387,61 +436,18 @@ public:
  *
  *  Value container for pushbuttons specifying additional drawing hints
  */
-class PushButtonValue
+class PushButtonValue : public ImplControlValue
 {
 public:
-PushButtonValue() : mbBevelButton( false ), mbSingleLine( true ) {}
+    PushButtonValue()
+    : ImplControlValue( CTRL_PUSHBUTTON, BUTTONVALUE_DONTKNOW, 0 )
+    , mbBevelButton( false ), mbSingleLine( true ) {}
+    virtual ~PushButtonValue();
+
     bool            mbBevelButton:1;
     bool            mbSingleLine:1;
 };
 
-/* ImplControlValue:
- *
- *   Generic value container for all control parts.
- */
-
-class ImplControlValue
-{
-    friend class SalFrame;
-
-    private:
-        ButtonValue mTristate;  // Tristate value: on, off, mixed
-        rtl::OUString   mString;        // string value
-        long            mNumber;        // numeric value
-        void *      mOptionalVal;   // optional control-specific value
-
-    public:
-        inline ImplControlValue( ButtonValue nTristate, rtl::OUString sString, long nNumeric, void * aOptVal ) \
-                                { mTristate = nTristate; mString = sString; mNumber = nNumeric; mOptionalVal = aOptVal; };
-        inline ImplControlValue( ButtonValue nTristate, rtl::OUString sString, long nNumeric ) \
-                                { mTristate = nTristate; mString = sString; mNumber = nNumeric; mOptionalVal = NULL; };
-        explicit ImplControlValue( ButtonValue nTristate )
-            : mTristate(nTristate), mNumber(0), mOptionalVal(NULL) {}
-        explicit ImplControlValue( rtl::OUString& rString )
-            : mTristate(BUTTONVALUE_DONTKNOW), mString(rString), mNumber(0), mOptionalVal(NULL) {}
-        explicit ImplControlValue( long nNumeric )
-            : mTristate(BUTTONVALUE_DONTKNOW), mNumber( nNumeric), mOptionalVal(NULL) {}
-        explicit ImplControlValue( void* aOptVal )
-             : mTristate(BUTTONVALUE_DONTKNOW), mNumber(0), mOptionalVal(aOptVal) {}
-        inline ImplControlValue()
-            : mTristate(BUTTONVALUE_DONTKNOW), mNumber(0), mOptionalVal(NULL) {}
-
-        inline ~ImplControlValue() { mOptionalVal = NULL; };
-
-        inline ButtonValue      getTristateVal( void ) const { return mTristate; }
-        inline void         setTristateVal( ButtonValue nTristate ) { mTristate = nTristate; }
-
-        inline const rtl::OUString& getStringVal( void ) const { return mString; }
-        inline void         setStringVal( rtl::OUString sString ) { mString = sString; }
-
-        inline long         getNumericVal( void ) const { return mNumber; }
-        inline void         setNumericVal( long nNumeric ) { mNumber = nNumeric; }
-
-        inline void *           getOptionalVal( void ) const { return mOptionalVal; }
-        inline void         setOptionalVal( void * aOptVal ) { mOptionalVal = aOptVal; }
-};
-
-#endif  /* __cplusplus */
 
 #endif
 
diff --git a/vcl/os2/inc/salgdi.h b/vcl/os2/inc/salgdi.h
index b8dc4eba0199..cf05ff15d7e2 100644
--- a/vcl/os2/inc/salgdi.h
+++ b/vcl/os2/inc/salgdi.h
@@ -162,7 +162,7 @@ protected:
     virtual void        drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
     virtual void        drawPolyPolygon( ULONG nPoly, const ULONG* pPoints, PCONSTSALPOINT* pPtAry );
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin);
+    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
     virtual sal_Bool    drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
     virtual sal_Bool    drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
     virtual sal_Bool    drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
diff --git a/vcl/os2/source/gdi/salgdi.cxx b/vcl/os2/source/gdi/salgdi.cxx
index 5be40355f731..dff1557170fb 100644
--- a/vcl/os2/source/gdi/salgdi.cxx
+++ b/vcl/os2/source/gdi/salgdi.cxx
@@ -670,6 +670,7 @@ bool Os2SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double /
 
 bool Os2SalGraphics::drawPolyLine(
     const basegfx::B2DPolygon& /*rPolygon*/,
+    double /*fTransparency*/,
     const basegfx::B2DVector& /*rLineWidths*/,
     basegfx::B2DLineJoin /*eLineJoin*/)
 {
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index ac1da931ba06..1f9efa7b6e65 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -444,7 +444,7 @@ void HelpTextWindow::Paint( const Rectangle& )
     if ( IsNativeControlSupported( CTRL_TOOLTIP, PART_ENTIRE_CONTROL ) )
     {
         // #i46472# workaround gcc3.3 temporary problem
-        Region aCtrlRegion = Region( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
+        Rectangle aCtrlRegion( Point( 0, 0 ), GetOutputSizePixel() );
         ImplControlValue    aControlValue;
         bNativeOK = DrawNativeControl( CTRL_TOOLTIP, PART_ENTIRE_CONTROL, aCtrlRegion,
                                        0, aControlValue, rtl::OUString() );
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 08759f37d7a6..d4f29e224e7b 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -83,6 +83,7 @@ class ImplCommonButtonData
 {
 public:
     Rectangle       maFocusRect;
+    Rectangle       maSymbolRect;
     USHORT          mnButtonState;
     BOOL            mbSmallSymbol;
 
@@ -334,6 +335,18 @@ const Rectangle& Button::GetFocusRect() const
 
 // -----------------------------------------------------------------------
 
+const Rectangle& Button::ImplGetSymbolRect() const
+{
+    return mpButtonData->maSymbolRect;
+}
+
+void Button::ImplSetSymbolRect( const Rectangle& i_rRect )
+{
+    mpButtonData->maSymbolRect = i_rRect;
+}
+
+// -----------------------------------------------------------------------
+
 USHORT Button::ImplGetTextStyle( XubString& rText, WinBits nWinStyle,
                                  ULONG nDrawFlags )
 {
@@ -1176,6 +1189,9 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, ULONG nDrawFlags
     Size aSize = rRect.GetSize();
     Point aPos = rRect.TopLeft();
 
+    ULONG nImageSep = 1 + (pDev->GetTextHeight()-10)/2;
+    if( nImageSep < 1 )
+        nImageSep = 1;
     if ( mnDDStyle == PUSHBUTTON_DROPDOWN_MENUBUTTON )
     {
         if ( aText.Len() && ! (ImplGetButtonState() & BUTTON_DRAW_NOTEXT) )
@@ -1186,8 +1202,8 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, ULONG nDrawFlags
             aInRect.Left()      = aInRect.Right() - nSymbolSize;
             aSize.Width()      -= ( 5 + nSymbolSize );
 
-            ImplDrawAlignedImage( pDev, aPos, aSize, bLayout,
-                                  1, nDrawFlags, nTextStyle );
+            ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, nImageSep,
+                                  nDrawFlags, nTextStyle, NULL, (GetStyle() & WB_FLATBUTTON) != 0 );
         }
         else
             ImplCalcSymbolRect( aInRect );
@@ -1195,15 +1211,19 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, ULONG nDrawFlags
         if( ! bLayout )
         {
             DecorationView aDecoView( pDev );
+            long nDistance = (aInRect.GetHeight() > 10) ? 2 : 1;
+            long nX = aInRect.Left() - 2*nDistance;;
+            Point aStartPt( nX, aInRect.Top()+nDistance );
+            Point aEndPt( nX, aInRect.Bottom()-nDistance );
+            aDecoView.DrawSeparator( aStartPt, aEndPt );
             aDecoView.DrawSymbol( aInRect, SYMBOL_SPIN_DOWN, aColor, nStyle );
+            aInRect.Left() -= 2*nDistance;
+            ImplSetSymbolRect( aInRect );
         }
     }
     else
     {
         Rectangle aSymbolRect;
-        ULONG nImageSep = 1 + (pDev->GetTextHeight()-10)/2;
-        if( nImageSep < 1 )
-            nImageSep = 1;
         // FIXME: (GetStyle() & WB_FLATBUTTON) != 0 is preliminary
         // in the next major this should be replaced by "true"
         ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, nImageSep, nDrawFlags,
@@ -1213,6 +1233,7 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, ULONG nDrawFlags
         {
             DecorationView aDecoView( pDev );
             aDecoView.DrawSymbol( aSymbolRect, meSymbol, aColor, nStyle );
+            ImplSetSymbolRect( aSymbolRect );
         }
 
         if ( mnDDStyle == PUSHBUTTON_DROPDOWN_TOOLBOX && !bLayout )
@@ -1314,7 +1335,6 @@ void PushButton::ImplDrawPushButton( bool bLayout )
                 // for CTRL_LISTBOX/PART_BUTTON_DOWN and CTRL_COMBOBOX/PART_BUTTON_DOWN
 
                 ImplControlValue    aControlValue;
-                Region              aCtrlRegion( aInRect );
                 ControlState        nState = 0;
 
                 if ( mbPressed )                        nState |= CTRL_STATE_PRESSED;
@@ -1326,7 +1346,7 @@ void PushButton::ImplDrawPushButton( bool bLayout )
                 if ( IsMouseOver() && aInRect.IsInside( GetPointerPosPixel() ) )
                     nState |= CTRL_STATE_ROLLOVER;
 
-                bNativeOK = DrawNativeControl( aCtrlType, PART_BUTTON_DOWN, aCtrlRegion, nState,
+                bNativeOK = DrawNativeControl( aCtrlType, PART_BUTTON_DOWN, aInRect, nState,
                                                 aControlValue, rtl::OUString() );
             }
         }
@@ -1338,10 +1358,8 @@ void PushButton::ImplDrawPushButton( bool bLayout )
     bool bRollOver = (IsMouseOver() && aInRect.IsInside( GetPointerPosPixel() ));
     if ( (bNativeOK=IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL)) == TRUE )
     {
-        PushButtonValue aPBVal;
-        ImplControlValue aControlValue;
-        aControlValue.setOptionalVal( &aPBVal );
-        Region           aCtrlRegion( aInRect );
+        PushButtonValue aControlValue;
+        Rectangle        aCtrlRegion( aInRect );
         ControlState     nState = 0;
 
         if ( mbPressed || IsChecked() )                   nState |= CTRL_STATE_PRESSED;
@@ -1354,7 +1372,7 @@ void PushButton::ImplDrawPushButton( bool bLayout )
             nState |= CTRL_STATE_ROLLOVER;
 
         if( GetStyle() & WB_BEVELBUTTON )
-            aPBVal.mbBevelButton = true;
+            aControlValue.mbBevelButton = true;
 
         // draw frame into invisible window to have aInRect modified correctly
         // but do not shift the inner rect for pressed buttons (ie remove BUTTON_DRAW_PRESSED)
@@ -1373,7 +1391,7 @@ void PushButton::ImplDrawPushButton( bool bLayout )
         Size aFontSize( Application::GetSettings().GetStyleSettings().GetPushButtonFont().GetSize() );
         aFontSize = LogicToPixel( aFontSize, MapMode( MAP_POINT ) );
         Size aInRectSize( LogicToPixel( Size( aInRect.GetWidth(), aInRect.GetHeight() ) ) );
-        aPBVal.mbSingleLine = (aInRectSize.Height() < 2 * aFontSize.Height() );
+        aControlValue.mbSingleLine = (aInRectSize.Height() < 2 * aFontSize.Height() );
 
         if( ((nState & CTRL_STATE_ROLLOVER)) || ! (GetStyle() & WB_FLATBUTTON) )
         {
@@ -1434,22 +1452,19 @@ void PushButton::ImplSetDefButton( BOOL bSet )
 
     if ( (IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL)) == TRUE )
     {
-        Region aBoundingRgn, aContentRgn;
+        Rectangle aBound, aCont;
         Rectangle aCtrlRect( 0, 0, 80, 20 ); // use a constant size to avoid accumulating
                                              // will not work if the theme has dynamic adornment sizes
         ImplControlValue aControlValue;
-        Region           aCtrlRegion( aCtrlRect );
+        Rectangle        aCtrlRegion( aCtrlRect );
         ControlState     nState = CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED;
 
         // get native size of a 'default' button
         // and adjust the VCL button if more space for adornment is required
         if( GetNativeControlRegion( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion,
                                 nState, aControlValue, rtl::OUString(),
-                                aBoundingRgn, aContentRgn ) )
+                                aBound, aCont ) )
         {
-            Rectangle aCont(aContentRgn.GetBoundRect());
-            Rectangle aBound(aBoundingRgn.GetBoundRect());
-
             dLeft = aCont.Left() - aBound.Left();
             dTop = aCont.Top() - aBound.Top();
             dRight = aBound.Right() - aCont.Right();
@@ -2004,6 +2019,8 @@ Size PushButton::CalcMinimumSize( long nMaxWidth ) const
             aSize = Size( 16, 12 );
         else
             aSize = Size( 26, 24 );
+        if( mnDDStyle == PUSHBUTTON_DROPDOWN_MENUBUTTON )
+            aSize.Width() += 4;
     }
     else if ( IsImage() && ! (ImplGetButtonState() & BUTTON_DRAW_NOIMAGE) )
         aSize = GetModeImage().GetSizePixel();
@@ -2334,9 +2351,8 @@ void RadioButton::ImplDrawRadioButtonState()
     // no native drawing for image radio buttons
     if ( !maImage && (bNativeOK=IsNativeControlSupported(CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL)) == TRUE )
     {
-        ImplControlValue            aControlValue( mbChecked ? BUTTONVALUE_ON : BUTTONVALUE_OFF, rtl::OUString(), 0 );
+        ImplControlValue            aControlValue( mbChecked ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
         Rectangle                   aCtrlRect( maStateRect.TopLeft(), maStateRect.GetSize() );
-        Region                      aCtrlRegion( aCtrlRect );
         ControlState                nState = 0;
 
         if ( ImplGetButtonState() & BUTTON_DRAW_PRESSED )   nState |= CTRL_STATE_PRESSED;
@@ -2347,7 +2363,7 @@ void RadioButton::ImplDrawRadioButtonState()
         if ( IsMouseOver() && maMouseRect.IsInside( GetPointerPosPixel() ) )
             nState |= CTRL_STATE_ROLLOVER;
 
-        bNativeOK = DrawNativeControl( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, nState,
+        bNativeOK = DrawNativeControl( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRect, nState,
                     aControlValue,rtl::OUString() );
 
     }
@@ -3198,17 +3214,16 @@ Size RadioButton::ImplGetRadioImageSize() const
     {
         ImplControlValue aControlValue;
         // #i45896# workaround gcc3.3 temporary problem
-        Region           aCtrlRegion = Region( Rectangle( Point( 0, 0 ), GetSizePixel() ) );
+        Rectangle        aCtrlRegion( Point( 0, 0 ), GetSizePixel() );
         ControlState     nState = CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED;
-        Region aBoundingRgn, aContentRgn;
+        Rectangle aBoundingRgn, aContentRgn;
 
         // get native size of a radio button
         if( pThis->GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion,
                                            nState, aControlValue, rtl::OUString(),
                                            aBoundingRgn, aContentRgn ) )
         {
-            Rectangle aCont(aContentRgn.GetBoundRect());
-            aSize = aCont.GetSize();
+            aSize = aContentRgn.GetSize();
             bDefaultSize = false;
         }
     }
@@ -3323,16 +3338,15 @@ void RadioButton::ImplSetMinimumNWFSize()
 
     ImplControlValue aControlValue;
     Size aCurSize( GetSizePixel() );
-    Region aCtrlRegion = Region( Rectangle( Point( 0, 0 ), aCurSize ) );
-    Region aBoundingRgn, aContentRgn;
+    Rectangle aCtrlRegion( Point( 0, 0 ), aCurSize );
+    Rectangle aBoundingRgn, aContentRgn;
 
     // get native size of a radiobutton
     if( GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion,
                                 CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
                                 aBoundingRgn, aContentRgn ) )
     {
-        Rectangle aCont(aContentRgn.GetBoundRect());
-        Size aSize = aCont.GetSize();
+        Size aSize = aContentRgn.GetSize();
 
         if( aSize.Height() > aCurSize.Height() )
         {
@@ -3509,8 +3523,8 @@ void CheckBox::ImplDrawCheckBoxState()
 
     if ( (bNativeOK=IsNativeControlSupported(CTRL_CHECKBOX, PART_ENTIRE_CONTROL)) == TRUE )
     {
-        ImplControlValue    aControlValue( meState == STATE_CHECK ? BUTTONVALUE_ON : BUTTONVALUE_OFF, rtl::OUString(), 0 );
-        Region              aCtrlRegion( maStateRect );
+        ImplControlValue    aControlValue( meState == STATE_CHECK ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
+        Rectangle           aCtrlRegion( maStateRect );
         ControlState        nState = 0;
 
         if ( HasFocus() )                       nState |= CTRL_STATE_FOCUSED;
@@ -3688,11 +3702,14 @@ void CheckBox::ImplCheck()
     else
         eNewState = STATE_NOCHECK;
     meState = eNewState;
-    ImplInvalidateOrDrawCheckBoxState();
 
     ImplDelData aDelData;
     ImplAddDel( &aDelData );
-    Toggle();
+    if( (GetStyle() & WB_EARLYTOGGLE) )
+        Toggle();
+    ImplInvalidateOrDrawCheckBoxState();
+    if( ! (GetStyle() & WB_EARLYTOGGLE) )
+        Toggle();
     if ( aDelData.IsDelete() )
         return;
     ImplRemoveDel( &aDelData );
@@ -4141,17 +4158,16 @@ Size CheckBox::ImplGetCheckImageSize() const
     {
         ImplControlValue aControlValue;
         // #i45896# workaround gcc3.3 temporary problem
-        Region           aCtrlRegion = Region( Rectangle( Point( 0, 0 ), GetSizePixel() ) );
+        Rectangle        aCtrlRegion( Point( 0, 0 ), GetSizePixel() );
         ControlState     nState = CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED;
-        Region aBoundingRgn, aContentRgn;
+        Rectangle aBoundingRgn, aContentRgn;
 
         // get native size of a check box
         if( pThis->GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
                                            nState, aControlValue, rtl::OUString(),
                                            aBoundingRgn, aContentRgn ) )
         {
-            Rectangle aCont(aContentRgn.GetBoundRect());
-            aSize = aCont.GetSize();
+            aSize = aContentRgn.GetSize();
             bDefaultSize = false;
         }
     }
@@ -4231,16 +4247,15 @@ void CheckBox::ImplSetMinimumNWFSize()
 
     ImplControlValue aControlValue;
     Size aCurSize( GetSizePixel() );
-    Region aCtrlRegion = Region( Rectangle( Point( 0, 0 ), aCurSize ) );
-    Region aBoundingRgn, aContentRgn;
+    Rectangle aCtrlRegion( Point( 0, 0 ), aCurSize );
+    Rectangle aBoundingRgn, aContentRgn;
 
     // get native size of a radiobutton
     if( GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
                                 CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
                                 aBoundingRgn, aContentRgn ) )
     {
-        Rectangle aCont(aContentRgn.GetBoundRect());
-        Size aSize = aCont.GetSize();
+        Size aSize = aContentRgn.GetSize();
 
         if( aSize.Height() > aCurSize.Height() )
         {
@@ -4441,8 +4456,8 @@ void DisclosureButton::ImplDrawCheckBoxState()
 
     Rectangle aStateRect( GetStateRect() );
 
-    ImplControlValue    aControlValue( GetState() == STATE_CHECK ? BUTTONVALUE_ON : BUTTONVALUE_OFF, rtl::OUString(), 0 );
-    Region              aCtrlRegion( aStateRect );
+    ImplControlValue    aControlValue( GetState() == STATE_CHECK ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
+    Rectangle           aCtrlRegion( aStateRect );
     ControlState        nState = 0;
 
     if ( HasFocus() )                       nState |= CTRL_STATE_FOCUSED;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index ebdfeae0f1d9..5b2e8755e5c8 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -139,8 +139,8 @@ void ComboBox::ImplCalcEditHeight()
     if ( !IsDropDownBox() )
         mnDDHeight += 4;
 
-    Region aCtrlRegion( Rectangle( (const Point&)Point(), Size( 10, 10 ) ) );
-    Region aBoundRegion, aContentRegion;
+    Rectangle aCtrlRegion( Point( 0, 0 ), Size( 10, 10 ) );
+    Rectangle aBoundRegion, aContentRegion;
     ImplControlValue aControlValue;
     ControlType aType = IsDropDownBox() ? CTRL_COMBOBOX : CTRL_EDITBOX;
     if( GetNativeControlRegion( aType, PART_ENTIRE_CONTROL,
@@ -149,7 +149,7 @@ void ComboBox::ImplCalcEditHeight()
                                 aControlValue, rtl::OUString(),
                                 aBoundRegion, aContentRegion ) )
     {
-        const long nNCHeight = aBoundRegion.GetBoundRect().GetHeight();
+        const long nNCHeight = aBoundRegion.GetHeight();
         if( mnDDHeight < nNCHeight )
             mnDDHeight = sal::static_int_cast<USHORT>( nNCHeight );
     }
@@ -629,10 +629,10 @@ void ComboBox::Resize()
         Window *pBorder = GetWindow( WINDOW_BORDER );
         ImplControlValue aControlValue;
         Point aPoint;
-        Region aContent, aBound;
+        Rectangle aContent, aBound;
 
         // use the full extent of the control
-        Region aArea( Rectangle(aPoint, pBorder->GetOutputSizePixel()) );
+        Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() );
 
         if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_BUTTON_DOWN,
                 aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
@@ -641,7 +641,7 @@ void ComboBox::Resize()
             aPoint = pBorder->ScreenToOutputPixel( OutputToScreenPixel( aPoint ) );
             aContent.Move(-aPoint.X(), -aPoint.Y());
 
-            mpBtn->SetPosSizePixel( aContent.GetBoundRect().Left(), nTop, aContent.GetBoundRect().getWidth(), (nBottom-nTop) );
+            mpBtn->SetPosSizePixel( aContent.Left(), nTop, aContent.getWidth(), (nBottom-nTop) );
 
             // adjust the size of the edit field
             if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_SUB_EDIT,
@@ -651,13 +651,12 @@ void ComboBox::Resize()
                 aContent.Move(-aPoint.X(), -aPoint.Y());
 
                 // use the themes drop down size
-                Rectangle aContentRect = aContent.GetBoundRect();
-                mpSubEdit->SetPosSizePixel( aContentRect.TopLeft(), aContentRect.GetSize() );
+                mpSubEdit->SetPosSizePixel( aContent.TopLeft(), aContent.GetSize() );
             }
             else
             {
                 // use the themes drop down size for the button
-                aOutSz.Width() -= aContent.GetBoundRect().getWidth();
+                aOutSz.Width() -= aContent.getWidth();
                 mpSubEdit->SetSizePixel( aOutSz );
             }
         }
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 0a29a627b8e3..c0e7b352642c 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2842,7 +2842,7 @@ Size Edit::CalcMinimumSize() const
     Size aMinSize ( CalcSize( 3 ) );
     if( aSize.Width() < aMinSize.Width() )
         aSize.Width() = aMinSize.Width();
-    // add some space between text entry an border
+    // add some space between text entry and border
     aSize.Height() += 4;
 
     aSize = CalcWindowSize( aSize );
@@ -2850,14 +2850,13 @@ Size Edit::CalcMinimumSize() const
     // ask NWF what if it has an opinion, too
     ImplControlValue aControlValue;
     Rectangle aRect( Point( 0, 0 ), aSize );
-    Region aContent, aBound;
+    Rectangle aContent, aBound;
     if( const_cast<Edit*>(this)->GetNativeControlRegion(
                    CTRL_EDITBOX, PART_ENTIRE_CONTROL,
                    aRect, 0, aControlValue, rtl::OUString(), aBound, aContent) )
     {
-        Rectangle aBoundRect( aContent.GetBoundRect() );
-        if( aBoundRect.GetHeight() > aSize.Height() )
-            aSize.Height() = aBoundRect.GetHeight();
+        if( aBound.GetHeight() > aSize.Height() )
+            aSize.Height() = aBound.GetHeight();
     }
     return aSize;
 }
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index ebccfdc1e6bb..02c8d2b5fcb3 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2819,7 +2819,7 @@ void ImplWin::ImplDraw( bool bLayout )
             sal_Int32 nLeft, nTop, nRight, nBottom;
             pWin->GetBorder( nLeft, nTop, nRight, nBottom );
             Point aPoint( -nLeft, -nTop );
-            Region aCtrlRegion( Rectangle( aPoint - GetPosPixel(), pWin->GetSizePixel() ) );
+            Rectangle aCtrlRegion( aPoint - GetPosPixel(), pWin->GetSizePixel() );
 
             BOOL bMouseOver = FALSE;
             if( GetParent() )
@@ -2838,8 +2838,7 @@ void ImplWin::ImplDraw( bool bLayout )
             if( ! (nParentStyle & WB_BORDER) || (nParentStyle & WB_NOBORDER) )
             {
                 Rectangle aParentRect( Point( 0, 0 ), pWin->GetSizePixel() );
-                Region aParentReg( aParentRect );
-                pWin->DrawNativeControl( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aParentReg,
+                pWin->DrawNativeControl( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aParentRect,
                                          nState, aControlValue, rtl::OUString() );
             }
 
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 6c7df5b106bf..03527bf083a7 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -44,9 +44,10 @@
 
 #include "tools/debug.hxx"
 
+#include <vcl/dndevdis.hxx>
+#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 
-
-// =======================================================================
+// =======================================================================
 
 ListBox::ListBox( WindowType nType ) : Control( nType )
 {
@@ -119,6 +120,8 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
     Control::ImplInit( pParent, nStyle, NULL );
     SetBackground();
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener> xDrop = new DNDEventDispatcher(this);
+
     if( nStyle & WB_DROPDOWN )
     {
         sal_Int32 nLeft, nTop, nRight, nBottom;
@@ -129,14 +132,14 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
             IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) )
         {
                 ImplControlValue aControlValue;
-                Region aCtrlRegion( Rectangle( (const Point&)Point(), Size( 20, mnDDHeight ) ) );
-                Region aBoundingRgn( aCtrlRegion );
-                Region aContentRgn( aCtrlRegion );
+                Rectangle aCtrlRegion( Point( 0, 0 ), Size( 20, mnDDHeight ) );
+                Rectangle aBoundingRgn( aCtrlRegion );
+                Rectangle aContentRgn( aCtrlRegion );
                 if( GetNativeControlRegion( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
                                             CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
                                             aBoundingRgn, aContentRgn ) )
                 {
-                    sal_Int32 nHeight = aBoundingRgn.GetBoundRect().GetHeight();
+                    sal_Int32 nHeight = aBoundingRgn.GetHeight();
                     if( nHeight > mnDDHeight )
                         mnDDHeight = static_cast<USHORT>(nHeight);
                 }
@@ -145,16 +148,19 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
         mpFloatWin = new ImplListBoxFloatingWindow( this );
         mpFloatWin->SetAutoWidth( TRUE );
         mpFloatWin->SetPopupModeEndHdl( LINK( this, ListBox, ImplPopupModeEndHdl ) );
+        mpFloatWin->GetDropTarget()->addDropTargetListener(xDrop);
 
         mpImplWin = new ImplWin( this, (nStyle & (WB_LEFT|WB_RIGHT|WB_CENTER))|WB_NOBORDER );
         mpImplWin->SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) );
         mpImplWin->SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl ) );
         mpImplWin->Show();
+        mpImplWin->GetDropTarget()->addDropTargetListener(xDrop);
 
         mpBtn = new ImplBtn( this, WB_NOLIGHTBORDER | WB_RECTSTYLE );
         ImplInitDropDownButton( mpBtn );
         mpBtn->SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) );
         mpBtn->Show();
+        mpBtn->GetDropTarget()->addDropTargetListener(xDrop);
 
     }
 
@@ -170,6 +176,9 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
     mpImplLB->SetPosPixel( Point() );
     mpImplLB->Show();
 
+    mpImplLB->GetDropTarget()->addDropTargetListener(xDrop);
+    mpImplLB->SetDropTraget(xDrop);
+
     if ( mpFloatWin )
     {
         mpFloatWin->SetImplListBox( mpImplLB );
@@ -652,10 +661,10 @@ void ListBox::Resize()
         Window *pBorder = GetWindow( WINDOW_BORDER );
         ImplControlValue aControlValue;
         Point aPoint;
-        Region aContent, aBound;
+        Rectangle aContent, aBound;
 
         // use the full extent of the control
-        Region aArea( Rectangle(aPoint, pBorder->GetOutputSizePixel()) );
+        Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() );
 
         if ( GetNativeControlRegion( CTRL_LISTBOX, PART_BUTTON_DOWN,
                     aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
@@ -665,8 +674,8 @@ void ListBox::Resize()
             aContent.Move( -aPoint.X(), -aPoint.Y() );
 
             // use the themes drop down size for the button
-            aOutSz.Width() = aContent.GetBoundRect().Left();
-            mpBtn->SetPosSizePixel( aContent.GetBoundRect().Left(), nTop, aContent.GetBoundRect().Right(), (nBottom-nTop) );
+            aOutSz.Width() = aContent.Left();
+            mpBtn->SetPosSizePixel( aContent.Left(), nTop, aContent.Right(), (nBottom-nTop) );
 
             // adjust the size of the edit field
             if ( GetNativeControlRegion( CTRL_LISTBOX, PART_SUB_EDIT,
@@ -676,7 +685,6 @@ void ListBox::Resize()
                 aContent.Move( -aPoint.X(), -aPoint.Y() );
 
                 // use the themes drop down size
-                Rectangle aContentRect = aContent.GetBoundRect();
                 if( ! (GetStyle() & WB_BORDER) && ImplGetSVData()->maNWFData.mbNoFocusRects )
                 {
                     // no border but focus ring behavior -> we have a problem; the
@@ -684,11 +692,11 @@ void ListBox::Resize()
                     // let's do the best we can and center vertically, so it doesn't look
                     // completely wrong.
                     Size aSz( GetOutputSizePixel() );
-                    long nDiff = aContentRect.Top() - (aSz.Height() - aContentRect.GetHeight())/2;
-                    aContentRect.Top() -= nDiff;
-                    aContentRect.Bottom() -= nDiff;
+                    long nDiff = aContent.Top() - (aSz.Height() - aContent.GetHeight())/2;
+                    aContent.Top() -= nDiff;
+                    aContent.Bottom() -= nDiff;
                 }
-                mpImplWin->SetPosSizePixel( aContentRect.TopLeft(), aContentRect.GetSize() );
+                mpImplWin->SetPosSizePixel( aContent.TopLeft(), aContent.GetSize() );
             }
             else
                 mpImplWin->SetSizePixel( aOutSz );
@@ -1327,15 +1335,14 @@ Size ListBox::CalcMinimumSize() const
         // see how large the edit area inside is to estimate what is needed for the dropdown
         ImplControlValue aControlValue;
         Point aPoint;
-        Region aContent, aBound;
+        Rectangle aContent, aBound;
         Size aTestSize( 100, 20 );
-        Region aArea( Rectangle( aPoint, aTestSize ) );
+        Rectangle aArea( aPoint, aTestSize );
         if( const_cast<ListBox*>(this)->GetNativeControlRegion(
                        CTRL_LISTBOX, PART_SUB_EDIT, aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
         {
             // use the themes drop down size
-            Rectangle aContentRect = aContent.GetBoundRect();
-            aSz.Width() += aTestSize.Width() - aContentRect.GetWidth();
+            aSz.Width() += aTestSize.Width() - aContent.GetWidth();
         }
         else
             aSz.Width() += GetSettings().GetStyleSettings().GetScrollBarSize();
@@ -1347,13 +1354,12 @@ Size ListBox::CalcMinimumSize() const
     {
         ImplControlValue aControlValue;
         Rectangle aRect( Point( 0, 0 ), aSz );
-        Region aContent, aBound;
+        Rectangle aContent, aBound;
         if( const_cast<ListBox*>(this)->GetNativeControlRegion(
                        CTRL_LISTBOX, PART_ENTIRE_CONTROL, aRect, 0, aControlValue, rtl::OUString(), aBound, aContent) )
         {
-            Rectangle aBoundRect( aBound.GetBoundRect() );
-            if( aBoundRect.GetHeight() > aSz.Height() )
-                aSz.Height() = aBoundRect.GetHeight();
+            if( aBound.GetHeight() > aSz.Height() )
+                aSz.Height() = aBound.GetHeight();
         }
     }
 
@@ -1615,7 +1621,6 @@ const Wallpaper& ListBox::GetDisplayBackground() const
 }
 
 // =======================================================================
-
 MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) :
     ListBox( WINDOW_MULTILISTBOX )
 {
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 94f61818ac92..1c83779da1a9 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -169,20 +169,27 @@ IMPL_LINK( MenuButton, ImplMenuTimeoutHdl, Timer*, EMPTYARG )
 
 void MenuButton::MouseButtonDown( const MouseEvent& rMEvt )
 {
+    bool bExecute = true;
     if ( mnMenuMode & MENUBUTTON_MENUMODE_TIMED )
     {
-        if ( !mpMenuTimer )
+        // if the separated dropdown symbol is hit,
+        // execute the popup immediately
+        if( ! ImplGetSymbolRect().IsInside( rMEvt.GetPosPixel() ) )
         {
-            mpMenuTimer = new Timer;
-            mpMenuTimer->SetTimeoutHdl( LINK( this, MenuButton, ImplMenuTimeoutHdl ) );
-        }
+            if ( !mpMenuTimer )
+            {
+                mpMenuTimer = new Timer;
+                mpMenuTimer->SetTimeoutHdl( LINK( this, MenuButton, ImplMenuTimeoutHdl ) );
+            }
 
-        mpMenuTimer->SetTimeout( GetSettings().GetMouseSettings().GetActionDelay() );
-        mpMenuTimer->Start();
+            mpMenuTimer->SetTimeout( GetSettings().GetMouseSettings().GetActionDelay() );
+            mpMenuTimer->Start();
 
-        PushButton::MouseButtonDown( rMEvt );
+            PushButton::MouseButtonDown( rMEvt );
+            bExecute = false;
+        }
     }
-    else
+    if( bExecute )
     {
         if ( PushButton::ImplHitTestPushButton( this, rMEvt.GetPosPixel() ) )
         {
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 54a1e0a97eab..9c82bb096dec 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -342,8 +342,8 @@ void ScrollBar::ImplCalc( BOOL bUpdate )
     Rectangle& maTrackRect = mpData->maTrackRect;  // TODO: remove when maTrackRect is no longer in mpData
     if ( mbCalcSize )
     {
-        const Region aControlRegion( Rectangle( (const Point&)Point(0,0), aSize ) );
-        Region aBtn1Region, aBtn2Region, aTrackRegion, aBoundingRegion;
+        const Rectangle aControlRegion( Point(0,0), aSize );
+        Rectangle aBtn1Region, aBtn2Region, aTrackRegion, aBoundingRegion;
 
         if ( GetStyle() & WB_HORZ )
         {
@@ -352,8 +352,8 @@ void ScrollBar::ImplCalc( BOOL bUpdate )
                  GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_RIGHT,
                         aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn2Region ) )
             {
-                maBtn1Rect = aBtn1Region.GetBoundRect();
-                maBtn2Rect = aBtn2Region.GetBoundRect();
+                maBtn1Rect = aBtn1Region;
+                maBtn2Rect = aBtn2Region;
             }
             else
             {
@@ -366,7 +366,7 @@ void ScrollBar::ImplCalc( BOOL bUpdate )
 
             if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_HORZ_AREA,
                      aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aTrackRegion ) )
-                maTrackRect = aTrackRegion.GetBoundRect();
+                maTrackRect = aTrackRegion;
             else
                 maTrackRect = Rectangle( maBtn1Rect.TopRight(), maBtn2Rect.BottomLeft() );
 
@@ -393,8 +393,8 @@ void ScrollBar::ImplCalc( BOOL bUpdate )
                  GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_DOWN,
                         aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn2Region ) )
             {
-                maBtn1Rect = aBtn1Region.GetBoundRect();
-                maBtn2Rect = aBtn2Region.GetBoundRect();
+                maBtn1Rect = aBtn1Region;
+                maBtn2Rect = aBtn2Region;
             }
             else
             {
@@ -407,7 +407,7 @@ void ScrollBar::ImplCalc( BOOL bUpdate )
 
             if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_VERT_AREA,
                      aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aTrackRegion ) )
-                maTrackRect = aTrackRegion.GetBoundRect();
+                maTrackRect = aTrackRegion;
             else
                 maTrackRect = Rectangle( maBtn1Rect.BottomLeft()+Point(0,1), maBtn2Rect.TopRight() );
 
@@ -524,7 +524,7 @@ void ScrollBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
 
 BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
 {
-    ImplControlValue aControlValue( BUTTONVALUE_DONTKNOW, rtl::OUString(), 0 );
+    ScrollbarValue scrValue;
 
     BOOL bNativeOK = IsNativeControlSupported(CTRL_SCROLLBAR, PART_ENTIRE_CONTROL);
     if( bNativeOK )
@@ -535,7 +535,6 @@ BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
         if( IsNativeControlSupported(CTRL_SCROLLBAR, bHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT) )
         {
             ControlState        nState = ( IsEnabled() ? CTRL_STATE_ENABLED : 0 ) | ( HasFocus() ? CTRL_STATE_FOCUSED : 0 );
-            ScrollbarValue  scrValue;
 
             scrValue.mnMin = mnMinRange;
             scrValue.mnMax = mnMaxRange;
@@ -570,20 +569,14 @@ BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
                 }
             }
 
-            aControlValue.setOptionalVal( (void *)(&scrValue) );
-
-#if 1
-            Region aCtrlRegion;
+            Rectangle aCtrlRegion;
             aCtrlRegion.Union( maBtn1Rect );
             aCtrlRegion.Union( maBtn2Rect );
             aCtrlRegion.Union( maPage1Rect );
             aCtrlRegion.Union( maPage2Rect );
             aCtrlRegion.Union( maThumbRect );
-#else
-            const Region aCtrlRegion( Rectangle( Point(0,0), GetOutputSizePixel() ) );
-#endif
             bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, (bHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT),
-                            aCtrlRegion, nState, aControlValue, rtl::OUString() );
+                            aCtrlRegion, nState, scrValue, rtl::OUString() );
         }
         else
       {
@@ -591,8 +584,8 @@ BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
         {
             sal_uInt32  part1 = bHorz ? PART_TRACK_HORZ_LEFT : PART_TRACK_VERT_UPPER;
             sal_uInt32  part2 = bHorz ? PART_TRACK_HORZ_RIGHT : PART_TRACK_VERT_LOWER;
-            Region      aCtrlRegion1( maPage1Rect );
-            Region      aCtrlRegion2( maPage2Rect );
+            Rectangle   aCtrlRegion1( maPage1Rect );
+            Rectangle   aCtrlRegion2( maPage2Rect );
             ControlState nState1 = (IsEnabled() ? CTRL_STATE_ENABLED : 0) | (HasFocus() ? CTRL_STATE_FOCUSED : 0);
             ControlState nState2 = nState1;
 
@@ -613,18 +606,18 @@ BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
 
             if ( nDrawFlags & SCRBAR_DRAW_PAGE1 )
                 bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1,
-                                aControlValue, rtl::OUString() );
+                                scrValue, rtl::OUString() );
 
             if ( nDrawFlags & SCRBAR_DRAW_PAGE2 )
                 bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2,
-                                aControlValue, rtl::OUString() );
+                                scrValue, rtl::OUString() );
         }
         if ( (nDrawFlags & SCRBAR_DRAW_BTN1) || (nDrawFlags & SCRBAR_DRAW_BTN2) )
         {
             sal_uInt32  part1 = bHorz ? PART_BUTTON_LEFT : PART_BUTTON_UP;
             sal_uInt32  part2 = bHorz ? PART_BUTTON_RIGHT : PART_BUTTON_DOWN;
-            Region      aCtrlRegion1( maBtn1Rect );
-            Region      aCtrlRegion2( maBtn2Rect );
+            Rectangle   aCtrlRegion1( maBtn1Rect );
+            Rectangle   aCtrlRegion2( maBtn2Rect );
             ControlState nState1 = HasFocus() ? CTRL_STATE_FOCUSED : 0;
             ControlState nState2 = nState1;
 
@@ -655,16 +648,16 @@ BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
 
             if ( nDrawFlags & SCRBAR_DRAW_BTN1 )
                 bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1,
-                                aControlValue, rtl::OUString() );
+                                scrValue, rtl::OUString() );
 
             if ( nDrawFlags & SCRBAR_DRAW_BTN2 )
                 bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2,
-                                aControlValue, rtl::OUString() );
+                                scrValue, rtl::OUString() );
         }
         if ( (nDrawFlags & SCRBAR_DRAW_THUMB) && !maThumbRect.IsEmpty() )
         {
             ControlState    nState = IsEnabled() ? CTRL_STATE_ENABLED : 0;
-            Region      aCtrlRegion( maThumbRect );
+            Rectangle       aCtrlRegion( maThumbRect );
 
             if ( mnStateFlags & SCRBAR_STATE_THUMB_DOWN )
                 nState |= CTRL_STATE_PRESSED;
@@ -683,7 +676,7 @@ BOOL ScrollBar::ImplDrawNative( USHORT nDrawFlags )
             }
 
             bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, (bHorz ? PART_THUMB_HORZ : PART_THUMB_VERT),
-                    aCtrlRegion, nState, aControlValue, rtl::OUString() );
+                    aCtrlRegion, nState, scrValue, rtl::OUString() );
         }
       }
     }
@@ -920,7 +913,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, BOOL bCallAction )
     BOOL    bIsInside = FALSE;
 
     Point aPoint( 0, 0 );
-    Region aControlRegion( Rectangle( aPoint, GetOutputSizePixel() ) );
+    Rectangle aControlRegion( aPoint, GetOutputSizePixel() );
 
     switch ( meScrollType )
     {
@@ -953,7 +946,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, BOOL bCallAction )
         case SCROLL_PAGEUP:
             // HitTestNativeControl, see remark at top of file
             if ( HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_TRACK_HORZ_LEFT: PART_TRACK_VERT_UPPER,
-                                       Region( maPage1Rect ), rMousePos, bIsInside )?
+                                       maPage1Rect, rMousePos, bIsInside )?
                     bIsInside:
                     maPage1Rect.IsInside( rMousePos ) )
             {
@@ -967,7 +960,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, BOOL bCallAction )
         case SCROLL_PAGEDOWN:
             // HitTestNativeControl, see remark at top of file
             if ( HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_TRACK_HORZ_RIGHT: PART_TRACK_VERT_LOWER,
-                                       Region( maPage2Rect ), rMousePos, bIsInside )?
+                                       maPage2Rect, rMousePos, bIsInside )?
                     bIsInside:
                     maPage2Rect.IsInside( rMousePos ) )
             {
@@ -1030,7 +1023,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
         BOOL            bDragToMouse = FALSE;
 
         Point aPoint( 0, 0 );
-        Region aControlRegion( Rectangle( aPoint, GetOutputSizePixel() ) );
+        Rectangle aControlRegion( aPoint, GetOutputSizePixel() );
 
         if ( HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_BUTTON_LEFT: PART_BUTTON_UP,
                     aControlRegion, rMousePos, bIsInside )?
@@ -1063,7 +1056,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
         else
         {
             bool bThumbHit = HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_THUMB_HORZ : PART_THUMB_VERT,
-                                                   Region( maThumbRect ), rMousePos, bIsInside )
+                                                   maThumbRect, rMousePos, bIsInside )
                              ? bIsInside : maThumbRect.IsInside( rMousePos );
             bool bDragHandling = rMEvt.IsMiddle() || bThumbHit || ImplGetSVData()->maNWFData.mbScrollbarJumpPage;
             if( bDragHandling )
@@ -1112,7 +1105,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
 
                 // HitTestNativeControl, see remark at top of file
                 if ( HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_TRACK_HORZ_LEFT : PART_TRACK_VERT_UPPER,
-                                           Region( maPage1Rect ), rMousePos, bIsInside )?
+                                           maPage1Rect, rMousePos, bIsInside )?
                     bIsInside:
                     maPage1Rect.IsInside( rMousePos ) )
                 {
@@ -1387,7 +1380,7 @@ Rectangle* ScrollBar::ImplFindPartRect( const Point& rPt )
     BOOL    bIsInside = FALSE;
 
     Point aPoint( 0, 0 );
-    Region aControlRegion( Rectangle( aPoint, GetOutputSizePixel() ) );
+    Rectangle aControlRegion( aPoint, GetOutputSizePixel() );
 
     if( HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_BUTTON_LEFT: PART_BUTTON_UP,
                 aControlRegion, rPt, bIsInside )?
@@ -1401,19 +1394,19 @@ Rectangle* ScrollBar::ImplFindPartRect( const Point& rPt )
         return &maBtn2Rect;
     // HitTestNativeControl, see remark at top of file
     else if( HitTestNativeControl( CTRL_SCROLLBAR,  bHorizontal ? PART_TRACK_HORZ_LEFT : PART_TRACK_VERT_UPPER,
-                Region( maPage1Rect ), rPt, bIsInside)?
+                maPage1Rect, rPt, bIsInside)?
             bIsInside:
             maPage1Rect.IsInside( rPt ) )
         return &maPage1Rect;
     // HitTestNativeControl, see remark at top of file
     else if( HitTestNativeControl( CTRL_SCROLLBAR,  bHorizontal ? PART_TRACK_HORZ_RIGHT : PART_TRACK_VERT_LOWER,
-                Region( maPage2Rect ), rPt, bIsInside)?
+                maPage2Rect, rPt, bIsInside)?
             bIsInside:
             maPage2Rect.IsInside( rPt ) )
         return &maPage2Rect;
     // HitTestNativeControl, see remark at top of file
     else if( HitTestNativeControl( CTRL_SCROLLBAR,  bHorizontal ? PART_THUMB_HORZ : PART_THUMB_VERT,
-                Region( maThumbRect ), rPt, bIsInside)?
+                maThumbRect, rPt, bIsInside)?
              bIsInside:
              maThumbRect.IsInside( rPt ) )
         return &maThumbRect;
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 2390a8e3e9a6..daf733a57a33 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -195,15 +195,14 @@ void Slider::ImplUpdateRects( BOOL bUpdate )
             else
                 maChannel2Rect.SetEmpty();
 
-            const Region aControlRegion( Rectangle( Point(0,0), Size( SLIDER_THUMB_SIZE, 10 ) ) );
-            Region aThumbBounds, aThumbContent;
+            const Rectangle aControlRegion( Rectangle( Point(0,0), Size( SLIDER_THUMB_SIZE, 10 ) ) );
+            Rectangle aThumbBounds, aThumbContent;
             if ( GetNativeControlRegion( CTRL_SLIDER, PART_THUMB_HORZ,
                                          aControlRegion, 0, ImplControlValue(), rtl::OUString(),
                                          aThumbBounds, aThumbContent ) )
             {
-                Rectangle aRect( aThumbBounds.GetBoundRect() );
-                maThumbRect.Left() = mnThumbPixPos - aRect.GetWidth()/2;
-                maThumbRect.Right() = maThumbRect.Left() + aRect.GetWidth() - 1;
+                maThumbRect.Left() = mnThumbPixPos - aThumbBounds.GetWidth()/2;
+                maThumbRect.Right() = maThumbRect.Left() + aThumbBounds.GetWidth() - 1;
                 bInvalidateAll = true;
             }
         }
@@ -230,15 +229,14 @@ void Slider::ImplUpdateRects( BOOL bUpdate )
             else
                 maChannel2Rect.SetEmpty();
 
-            const Region aControlRegion( Rectangle( Point(0,0), Size( 10, SLIDER_THUMB_SIZE ) ) );
-            Region aThumbBounds, aThumbContent;
+            const Rectangle aControlRegion( Rectangle( Point(0,0), Size( 10, SLIDER_THUMB_SIZE ) ) );
+            Rectangle aThumbBounds, aThumbContent;
             if ( GetNativeControlRegion( CTRL_SLIDER, PART_THUMB_VERT,
                                          aControlRegion, 0, ImplControlValue(), rtl::OUString(),
                                          aThumbBounds, aThumbContent ) )
             {
-                Rectangle aRect( aThumbBounds.GetBoundRect() );
-                maThumbRect.Top() = mnThumbPixPos - aRect.GetHeight()/2;
-                maThumbRect.Bottom() = maThumbRect.Top() + aRect.GetHeight() - 1;
+                maThumbRect.Top() = mnThumbPixPos - aThumbBounds.GetHeight()/2;
+                maThumbRect.Bottom() = maThumbRect.Top() + aThumbBounds.GetHeight() - 1;
                 bInvalidateAll = true;
             }
         }
@@ -388,7 +386,6 @@ void Slider::ImplDraw( USHORT nDrawFlags )
         ImplCalc( FALSE );
 
     ControlPart nPart = (GetStyle() & WB_HORZ) ? PART_TRACK_HORZ_AREA : PART_TRACK_VERT_AREA;
-    ImplControlValue aControlValue( BUTTONVALUE_DONTKNOW, rtl::OUString(), 0 );
     ControlState   nState = ( IsEnabled() ? CTRL_STATE_ENABLED : 0 ) | ( HasFocus() ? CTRL_STATE_FOCUSED : 0 );
     SliderValue    sldValue;
 
@@ -402,11 +399,10 @@ void Slider::ImplDraw( USHORT nDrawFlags )
         if( maThumbRect.IsInside( GetPointerPosPixel() ) )
             sldValue.mnThumbState |= CTRL_STATE_ROLLOVER;
     }
-    aControlValue.setOptionalVal( (void *)(&sldValue) );
 
-    const Region aCtrlRegion( Rectangle( Point(0,0), GetOutputSizePixel() ) );
+    const Rectangle aCtrlRegion( Point(0,0), GetOutputSizePixel() );
     bool bNativeOK = DrawNativeControl( CTRL_SLIDER, nPart,
-                                        aCtrlRegion, nState, aControlValue, rtl::OUString() );
+                                        aCtrlRegion, nState, sldValue, rtl::OUString() );
     if( bNativeOK )
         return;
 
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index d18a412e31cc..754270e9012f 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -88,15 +88,12 @@ BOOL ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonVa
         // there is just no useful native support for spinfields with dropdown
         !(pWin->GetStyle() & WB_DROPDOWN) )
     {
-        ImplControlValue aControlValue;
-        aControlValue.setOptionalVal( (void*) &rSpinbuttonValue );
-
         if( pWin->IsNativeControlSupported(CTRL_SPINBOX, rSpinbuttonValue.mnUpperPart) &&
             pWin->IsNativeControlSupported(CTRL_SPINBOX, rSpinbuttonValue.mnLowerPart) )
         {
             // only paint the embedded spin buttons, all buttons are painted at once
-            bNativeOK = pWin->DrawNativeControl( CTRL_SPINBOX, PART_ALL_BUTTONS, Region(), CTRL_STATE_ENABLED,
-                        aControlValue, rtl::OUString() );
+            bNativeOK = pWin->DrawNativeControl( CTRL_SPINBOX, PART_ALL_BUTTONS, Rectangle(), CTRL_STATE_ENABLED,
+                        rSpinbuttonValue, rtl::OUString() );
         }
         else
         {
@@ -115,17 +112,17 @@ BOOL ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonVa
 
             Point aPt;
             Size aSize( pBorder->GetOutputSizePixel() );    // the size of the border window, i.e., the whole control
-            Region aBound, aContent;
-            Region aNatRgn( Rectangle( aPt, aSize ) );
+            Rectangle aBound, aContent;
+            Rectangle aNatRgn( aPt, aSize );
             if( pBorder->GetNativeControlRegion(CTRL_SPINBOX, PART_ENTIRE_CONTROL,
-                    aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+                    aNatRgn, 0, rSpinbuttonValue, rtl::OUString(), aBound, aContent) )
             {
-                aSize = aContent.GetBoundRect().GetSize();
+                aSize = aContent.GetSize();
             }
 
-            Region aRgn( Rectangle( aPt, aSize ) );
+            Rectangle aRgn( aPt, aSize );
             bNativeOK = pBorder->DrawNativeControl( CTRL_SPINBOX, PART_ENTIRE_CONTROL, aRgn, CTRL_STATE_ENABLED,
-                        aControlValue, rtl::OUString() );
+                        rSpinbuttonValue, rtl::OUString() );
 
             pBorder->SetClipRegion( oldRgn );
         }
@@ -139,12 +136,9 @@ BOOL ImplDrawNativeSpinbuttons( Window *pWin, const SpinbuttonValue& rSpinbutton
 
     if( pWin->IsNativeControlSupported(CTRL_SPINBUTTONS, PART_ENTIRE_CONTROL) )
     {
-        ImplControlValue aControlValue;
-        aControlValue.setOptionalVal( (void*) &rSpinbuttonValue );
-
         // only paint the standalone spin buttons, all buttons are painted at once
-        bNativeOK = pWin->DrawNativeControl( CTRL_SPINBUTTONS, PART_ALL_BUTTONS, Region(), CTRL_STATE_ENABLED,
-                    aControlValue, rtl::OUString() );
+        bNativeOK = pWin->DrawNativeControl( CTRL_SPINBUTTONS, PART_ALL_BUTTONS, Rectangle(), CTRL_STATE_ENABLED,
+                    rSpinbuttonValue, rtl::OUString() );
     }
     return bNativeOK;
 }
@@ -705,7 +699,7 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec
             nBottom1--;
 
         BOOL bNativeRegionOK = FALSE;
-        Region aContentUp, aContentDown;
+        Rectangle aContentUp, aContentDown;
 
         if ( (pDev->GetOutDevType() == OUTDEV_WINDOW) &&
             // there is just no useful native support for spinfields with dropdown
@@ -717,11 +711,11 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec
 
             // get the system's spin button size
             ImplControlValue aControlValue;
-            Region aBound;
+            Rectangle aBound;
             Point aPoint;
 
             // use the full extent of the control
-            Region aArea( Rectangle( aPoint, pBorder->GetOutputSizePixel() ) );
+            Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() );
 
             bNativeRegionOK =
                 pWin->GetNativeControlRegion(CTRL_SPINBOX, PART_BUTTON_UP,
@@ -740,8 +734,8 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec
 
         if( bNativeRegionOK )
         {
-            rSpinUpArea = aContentUp.GetBoundRect();
-            rSpinDownArea = aContentDown.GetBoundRect();
+            rSpinUpArea = aContentUp;
+            rSpinDownArea = aContentDown;
         }
         else
         {
@@ -774,11 +768,11 @@ void SpinField::Resize()
 
             ImplControlValue aControlValue;
             Point aPoint;
-            Region aContent, aBound;
+            Rectangle aContent, aBound;
 
             // use the full extent of the control
             Window *pBorder = GetWindow( WINDOW_BORDER );
-            Region aArea( Rectangle(aPoint, pBorder->GetOutputSizePixel()) );
+            Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() );
 
             // adjust position and size of the edit field
             if ( GetNativeControlRegion(CTRL_SPINBOX, PART_SUB_EDIT,
@@ -789,10 +783,9 @@ void SpinField::Resize()
                 aContent.Move(-aPoint.X(), -aPoint.Y());
 
                 // use the themes drop down size
-                Rectangle aContentRect = aContent.GetBoundRect();
-                mpEdit->SetPosPixel( aContentRect.TopLeft() );
+                mpEdit->SetPosPixel( aContent.TopLeft() );
                 bSubEditPositioned = true;
-                aSize = aContentRect.GetSize();
+                aSize = aContent.GetSize();
             }
             else
             {
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 95f84626b582..c892b32534ec 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -411,15 +411,14 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth )
     aSize.Width()  += TAB_TABOFFSET_X*2;
     aSize.Height() += TAB_TABOFFSET_Y*2;
 
-    Region aCtrlRegion(  Rectangle( (const Point&)Point( 0, 0 ), aSize ) );
-    Region aBoundingRgn, aContentRgn;
-    const ImplControlValue aControlValue( BUTTONVALUE_DONTKNOW, rtl::OUString(), 0 );
+    Rectangle aCtrlRegion( Point( 0, 0 ), aSize );
+    Rectangle aBoundingRgn, aContentRgn;
+    const ImplControlValue aControlValue;
     if(GetNativeControlRegion( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, aCtrlRegion,
                                            CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
                                            aBoundingRgn, aContentRgn ) )
     {
-        Rectangle aCont(aContentRgn.GetBoundRect());
-        return aCont.GetSize();
+        return aContentRgn.GetSize();
     }
 
     // For systems without synthetic bold support
@@ -938,8 +937,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo
 
     if( !bLayout && (bNativeOK = IsNativeControlSupported(CTRL_TAB_ITEM, PART_ENTIRE_CONTROL)) == TRUE )
     {
-        ImplControlValue        aControlValue;
-        Region              aCtrlRegion( pItem->maRect );
+        Rectangle           aCtrlRegion( pItem->maRect );
         ControlState        nState = 0;
 
         if( pItem->mnId == mnCurPageId )
@@ -974,10 +972,9 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo
             tiValue.mnAlignment |= TABITEM_FIRST_IN_GROUP;
         if ( bLastInGroup )
             tiValue.mnAlignment |= TABITEM_LAST_IN_GROUP;
-        aControlValue.setOptionalVal( (void *)(&tiValue) );
 
         bNativeOK = DrawNativeControl( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, aCtrlRegion, nState,
-                    aControlValue, rtl::OUString() );
+                    tiValue, rtl::OUString() );
     }
 
     if( ! bLayout && !bNativeOK )
@@ -1236,7 +1233,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
     BOOL bNativeOK = FALSE;
     if( ! bLayout && (bNativeOK = IsNativeControlSupported( CTRL_TAB_PANE, PART_ENTIRE_CONTROL) ) == TRUE )
     {
-        const ImplControlValue aControlValue( BUTTONVALUE_DONTKNOW, rtl::OUString(), 0 );
+        const ImplControlValue aControlValue;
 
         ControlState nState = CTRL_STATE_ENABLED;
         int part = PART_ENTIRE_CONTROL;
@@ -1250,10 +1247,8 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
         if( !rRect.IsEmpty() )
             aClipRgn.Intersect( rRect );
 
-        Region aCtrlRegion( aRect );
-        Rectangle aClipRect( aClipRgn.GetBoundRect() );
-        if( !aClipRgn.IsEmpty() ) //&& aClipRect.getHeight() && aClipRect.getWidth() )
-            bNativeOK = DrawNativeControl( CTRL_TAB_PANE, part, aCtrlRegion, nState,
+        if( !aClipRgn.IsEmpty() )
+            bNativeOK = DrawNativeControl( CTRL_TAB_PANE, part, aRect, nState,
                 aControlValue, rtl::OUString() );
     }
     else
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 468d4be36b0a..43f24e5026ea 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1397,6 +1397,7 @@ static void FindCmap(TrueTypeFont *ttf)
     sal_uInt32 table_size = getTableSize(ttf, O_cmap);
     sal_uInt16 ncmaps = GetUInt16(table, 2, 1);
     unsigned int i;
+    sal_uInt32 AppleUni   = 0;              // Apple Unicode
     sal_uInt32 ThreeZero  = 0;              /* MS Symbol            */
     sal_uInt32 ThreeOne   = 0;              /* MS UCS-2             */
     sal_uInt32 ThreeTwo   = 0;              /* MS ShiftJIS          */
@@ -1423,7 +1424,7 @@ static void FindCmap(TrueTypeFont *ttf)
 
         /* Unicode tables in Apple fonts */
         if (pID == 0) {
-            ThreeOne   = offset; break;
+            AppleUni = offset;
         }
 
         if (pID == 3) {
@@ -1440,6 +1441,10 @@ static void FindCmap(TrueTypeFont *ttf)
         }
     }
 
+    // fall back to AppleUnicode if there are no ThreeOne/Threezero tables
+    if( AppleUni && !ThreeZero && !ThreeOne)
+        ThreeOne = AppleUni;
+
     if (ThreeOne) {
         ttf->cmapType = CMAP_MS_Unicode;
         ttf->cmap = table + ThreeOne;
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 4d32990f9335..60ad94a63273 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -28,6 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include <osl/file.h>
 #include <tools/vcompat.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
@@ -398,12 +399,10 @@ ImpSwap::ImpSwap( BYTE* pData, ULONG nDataSize ) :
     {
         ::utl::TempFile aTempFile;
 
-        maURL = INetURLObject(aTempFile.GetURL());
-
-        if( maURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() )
+        maURL = aTempFile.GetURL();
+        if( maURL.getLength() )
         {
-            SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( maURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE );
-
+            SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( maURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE );
             if( pOStm )
             {
                 pOStm->Write( pData, mnDataSize );
@@ -412,28 +411,8 @@ ImpSwap::ImpSwap( BYTE* pData, ULONG nDataSize ) :
 
                 if( bError )
                 {
-                    try
-                    {
-                        ::ucbhelper::Content aCnt( maURL.GetMainURL( INetURLObject::NO_DECODE ),
-                                             ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
-
-                        aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ),
-                                             ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
-                    }
-                    catch( const ::com::sun::star::ucb::ContentCreationException& )
-                    {
-                    }
-                    catch( const ::com::sun::star::uno::RuntimeException& )
-                    {
-                    }
-                    catch( const ::com::sun::star::ucb::CommandAbortedException& )
-                    {
-                    }
-                    catch( const ::com::sun::star::uno::Exception& )
-                    {
-                    }
-
-                    maURL = INetURLObject();
+                    osl_removeFile( maURL.pData );
+                    maURL = String();
                 }
             }
         }
@@ -445,28 +424,7 @@ ImpSwap::ImpSwap( BYTE* pData, ULONG nDataSize ) :
 ImpSwap::~ImpSwap()
 {
     if( IsSwapped() )
-    {
-        try
-        {
-            ::ucbhelper::Content aCnt( maURL.GetMainURL( INetURLObject::NO_DECODE ),
-                                 ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
-
-            aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ),
-                                 ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
-        }
-        catch( const ::com::sun::star::ucb::ContentCreationException& )
-        {
-        }
-        catch( const ::com::sun::star::uno::RuntimeException& )
-        {
-        }
-        catch( const ::com::sun::star::ucb::CommandAbortedException& )
-        {
-        }
-        catch( const ::com::sun::star::uno::Exception& )
-        {
-        }
-    }
+        osl_removeFile( maURL.pData );
 }
 
 // ------------------------------------------------------------------------
@@ -477,8 +435,7 @@ BYTE* ImpSwap::GetData() const
 
     if( IsSwapped() )
     {
-        SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( maURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE );
-
+        SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( maURL, STREAM_READWRITE );
         if( pIStm )
         {
             pData = new BYTE[ mnDataSize ];
diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk
index 430080643b95..77df20976c73 100755
--- a/vcl/source/gdi/makefile.mk
+++ b/vcl/source/gdi/makefile.mk
@@ -50,6 +50,7 @@ CDEFS+=-DENABLE_GRAPHITE
 EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
                     $(SLO)$/outdev.obj		\
                     $(SLO)$/outdev3.obj 	\
+                    $(SLO)$/outdevnative.obj 	\
                     $(SLO)$/gfxlink.obj		\
                     $(SLO)$/print.obj		\
                     $(SLO)$/print2.obj		\
@@ -105,7 +106,6 @@ SLOFILES=	$(EXCEPTIONSFILES)      \
             $(SLO)$/outdev4.obj 	\
             $(SLO)$/outdev5.obj 	\
             $(SLO)$/outdev6.obj 	\
-            $(SLO)$/outdevnative.obj 	\
             $(SLO)$/regband.obj 	\
             $(SLO)$/region.obj		\
             $(SLO)$/wall.obj		\
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index bb5e4e3ba36d..a011e4ee4a92 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2311,7 +2311,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
             aB2DPolyLine = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyLine);
         }
 
-        if(mpGraphics->DrawPolyLine(aB2DPolyLine, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, this))
+        if( mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, this))
         {
             return;
         }
@@ -2416,7 +2416,7 @@ void OutputDevice::impPaintLineGeometryWithEvtlExpand(
 
             if(bTryAA)
             {
-                bDone = mpGraphics->DrawPolyLine(aCandidate, basegfx::B2DVector(1.0, 1.0), basegfx::B2DLINEJOIN_NONE, this);
+                bDone = mpGraphics->DrawPolyLine( aCandidate, 0.0, basegfx::B2DVector(1.0,1.0), basegfx::B2DLINEJOIN_NONE, this);
             }
 
             if(!bDone)
@@ -2605,7 +2605,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly )
             aB2DPolyLine = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyLine);
         }
 
-        if(mpGraphics->DrawPolyLine(aB2DPolyLine, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, this))
+        if(mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, this))
         {
             return;
         }
@@ -2653,7 +2653,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly, const LineInfo& rLineInfo
     if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
         && LINE_SOLID == rLineInfo.GetStyle())
     {
-        DrawPolyLine(rPoly.getB2DPolygon(), (double)rLineInfo.GetWidth(), rLineInfo.GetLineJoin());
+        DrawPolyLine( rPoly.getB2DPolygon(), (double)rLineInfo.GetWidth(), rLineInfo.GetLineJoin());
         return;
     }
 
@@ -2785,7 +2785,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly )
                 aB2DPolygon = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolygon);
             }
 
-            bSuccess = mpGraphics->DrawPolyLine(aB2DPolygon, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, this);
+            bSuccess = mpGraphics->DrawPolyLine( aB2DPolygon, 0.0, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, this);
         }
 
         if(bSuccess)
@@ -2877,7 +2877,7 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly )
 
             for(sal_uInt32 a(0); bSuccess && a < aB2DPolyPolygon.count(); a++)
             {
-                bSuccess = mpGraphics->DrawPolyLine(aB2DPolyPolygon.getB2DPolygon(a), aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, this);
+                bSuccess = mpGraphics->DrawPolyLine( aB2DPolyPolygon.getB2DPolygon(a), 0.0, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, this);
             }
         }
 
@@ -3000,7 +3000,7 @@ void OutputDevice::ImpDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPo
 
             for(sal_uInt32 a(0);bSuccess && a < aB2DPolyPolygon.count(); a++)
             {
-                bSuccess = mpGraphics->DrawPolyLine(aB2DPolyPolygon.getB2DPolygon(a), aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, this);
+                bSuccess = mpGraphics->DrawPolyLine( aB2DPolyPolygon.getB2DPolygon(a), 0.0, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, this);
             }
         }
 
@@ -3047,7 +3047,7 @@ bool OutputDevice::ImpTryDrawPolyLineDirect(
     }
 
     // draw the polyline
-    return mpGraphics->DrawPolyLine(aB2DPolygon, aB2DLineWidth, eLineJoin, this);
+    return mpGraphics->DrawPolyLine( aB2DPolygon, 0.0, aB2DLineWidth, eLineJoin, this);
 }
 
 void OutputDevice::DrawPolyLine(
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 949d3df5275f..bf1cc2728bf1 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -1889,10 +1889,11 @@ ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( ULONG nSearchType,
             nTestMatch -= 1000000;
 
         // test font name substrings
-        if( (rSearchFamilyName.Len() && pData->maMatchFamilyName.Len())
+    // TODO: calculate name matching score using e.g. Levenstein distance
+        if( (rSearchFamilyName.Len() >= 4) && (pData->maMatchFamilyName.Len() >= 4)
         &&    ((rSearchFamilyName.Search( pData->maMatchFamilyName ) != STRING_NOTFOUND)
             || (pData->maMatchFamilyName.Search( rSearchFamilyName ) != STRING_NOTFOUND)) )
-                    nTestMatch += 100000*2;
+                    nTestMatch += 5000;
 
         // test SERIF attribute
         if( nSearchType & IMPL_FONT_ATTR_SERIF )
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index bef37284adbd..5b8d228bb141 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -184,18 +184,31 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
 
     if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
-        && ROP_OVERPAINT == GetRasterOp()
-        && IsFillColor())
+        && ROP_OVERPAINT == GetRasterOp() )
     {
         // b2dpolygon support not implemented yet on non-UNX platforms
         const ::basegfx::B2DHomMatrix aTransform = ImplGetDeviceTransformation();
         basegfx::B2DPolyPolygon aB2DPolyPolygon(rB2DPolyPoly);
 
-        // transform the polygon and ensure closed
-        aB2DPolyPolygon.transform(aTransform);
-        aB2DPolyPolygon.setClosed(true);
+        // transform the polygon into device space and ensure it is closed
+        aB2DPolyPolygon.transform( aTransform );
+        aB2DPolyPolygon.setClosed( true );
+
+        bool bDrawnOk = true;
+        if( IsFillColor() )
+            bDrawnOk = mpGraphics->DrawPolyPolygon( aB2DPolyPolygon, fTransparency, this );
+        if( bDrawnOk && IsLineColor() )
+        {
+            const basegfx::B2DVector aHairlineWidth(1,1);
+            const int nPolyCount = aB2DPolyPolygon.count();
+            for( int nPolyIdx = 0; nPolyIdx < nPolyCount; ++nPolyIdx )
+            {
+                const ::basegfx::B2DPolygon aOnePoly = aB2DPolyPolygon.getB2DPolygon( nPolyIdx );
+                mpGraphics->DrawPolyLine( aOnePoly, fTransparency, aHairlineWidth, ::basegfx::B2DLINEJOIN_NONE, this );
+            }
+        }
 
-        if(mpGraphics->DrawPolyPolygon(aB2DPolyPolygon, fTransparency, this))
+        if( bDrawnOk )
         {
 #if 0
             // MetaB2DPolyPolygonAction is not implemented yet:
@@ -287,14 +300,17 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
 
         // get the polygon in device coordinates
         basegfx::B2DPolyPolygon aB2DPolyPolygon( rPolyPoly.getB2DPolyPolygon() );
-        aB2DPolyPolygon.setClosed( true );
         const ::basegfx::B2DHomMatrix aTransform = ImplGetDeviceTransformation();
         aB2DPolyPolygon.transform( aTransform );
 
-        // draw the transparent polygon
-        bDrawn = mpGraphics->DrawPolyPolygon( aB2DPolyPolygon, nTransparencePercent*0.01, this );
+        const double fTransparency = 0.01 * nTransparencePercent;
+        if( mbFillColor )
+        {
+            // draw the transparent polygon
+            // NOTE: filled polygons are assumed to be drawn as if they were always closed
+            bDrawn = mpGraphics->DrawPolyPolygon( aB2DPolyPolygon, fTransparency, this );
+        }
 
-        // DrawTransparent() assumes that the border is NOT to be drawn transparently???
         if( mbLineColor )
         {
             // disable the fill color for now
@@ -305,7 +321,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
             for( int nPolyIdx = 0; nPolyIdx < nPolyCount; ++nPolyIdx )
             {
                 const ::basegfx::B2DPolygon& rPolygon = aB2DPolyPolygon.getB2DPolygon( nPolyIdx );
-                mpGraphics->DrawPolyLine( rPolygon, aLineWidths, ::basegfx::B2DLINEJOIN_NONE, this );
+                bDrawn = mpGraphics->DrawPolyLine( rPolygon, fTransparency, aLineWidths, ::basegfx::B2DLINEJOIN_NONE, this );
             }
             // prepare to restore the fill color
             mbInitFillColor = mbFillColor;
@@ -329,6 +345,12 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
 
         if( OUTDEV_PRINTER == meOutDevType )
         {
+            if(100 <= nTransparencePercent)
+            {
+                // #i112959# 100% transparent, draw nothing
+                return;
+            }
+
             Rectangle       aPolyRect( LogicToPixel( rPolyPoly ).GetBoundRect() );
             const Size      aDPISize( LogicToPixel( Size( 1, 1 ), MAP_INCH ) );
             const long      nBaseExtent = Max( FRound( aDPISize.Width() / 300. ), 1L );
@@ -343,30 +365,40 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
                 case( 25 ): nMove = nBaseExtent * 3; break;
                 case( 50 ): nMove = nBaseExtent * 4; break;
                 case( 75 ): nMove = nBaseExtent * 6; break;
-                            // TODO What is the correct VALUE???
+
+                // #i112959#  very transparent (88 < nTransparencePercent <= 99)
+                case( 100 ): nMove = nBaseExtent * 8; break;
+
+                // #i112959# not transparent (nTransparencePercent < 13)
                 default:    nMove = 0; break;
             }
 
             Push( PUSH_CLIPREGION | PUSH_LINECOLOR );
             IntersectClipRegion( rPolyPoly );
             SetLineColor( GetFillColor() );
-
-            Rectangle aRect( aPolyRect.TopLeft(), Size( aPolyRect.GetWidth(), nBaseExtent ) );
-
             const BOOL bOldMap = mbMap;
             EnableMapMode( FALSE );
 
-            while( aRect.Top() <= aPolyRect.Bottom() )
+            if(nMove)
             {
-                DrawRect( aRect );
-                aRect.Move( 0, nMove );
-            }
+                Rectangle aRect( aPolyRect.TopLeft(), Size( aPolyRect.GetWidth(), nBaseExtent ) );
+                while( aRect.Top() <= aPolyRect.Bottom() )
+                {
+                    DrawRect( aRect );
+                    aRect.Move( 0, nMove );
+                }
 
-            aRect = Rectangle( aPolyRect.TopLeft(), Size( nBaseExtent, aPolyRect.GetHeight() ) );
-            while( aRect.Left() <= aPolyRect.Right() )
+                aRect = Rectangle( aPolyRect.TopLeft(), Size( nBaseExtent, aPolyRect.GetHeight() ) );
+                while( aRect.Left() <= aPolyRect.Right() )
+                {
+                    DrawRect( aRect );
+                    aRect.Move( nMove, 0 );
+                }
+            }
+            else
             {
-                DrawRect( aRect );
-                aRect.Move( nMove, 0 );
+                // #i112959# if not transparent, draw full rectangle in clip region
+                DrawRect( aPolyRect );
             }
 
             EnableMapMode( bOldMap );
@@ -1119,7 +1151,7 @@ void OutputDevice::Erase()
         {
             ImplControlValue    aControlValue;
             Point               aGcc3WorkaroundTemporary;
-            Region              aCtrlRegion( Rectangle( aGcc3WorkaroundTemporary, GetOutputSizePixel() ) );
+            Rectangle           aCtrlRegion( aGcc3WorkaroundTemporary, GetOutputSizePixel() );
             ControlState        nState = 0;
 
             if( pWindow->IsEnabled() )              nState |= CTRL_STATE_ENABLED;
diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index fed41ec4de85..521f4d7ea62d 100644
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -59,6 +59,38 @@ static bool lcl_enableNativeWidget( const OutputDevice& i_rDevice )
     }
 }
 
+ImplControlValue::~ImplControlValue()
+{
+}
+
+ScrollbarValue::~ScrollbarValue()
+{
+}
+
+SliderValue::~SliderValue()
+{
+}
+
+TabitemValue::~TabitemValue()
+{
+}
+
+SpinbuttonValue::~SpinbuttonValue()
+{
+}
+
+ToolbarValue::~ToolbarValue()
+{
+}
+
+MenubarValue::~MenubarValue()
+{
+}
+
+PushButtonValue::~PushButtonValue()
+{
+}
+
 // -----------------------------------------------------------------------
 // These functions are mainly passthrough functions that allow access to
 // the SalFrame behind a Window object for native widget rendering purposes.
@@ -83,7 +115,7 @@ BOOL OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPar
 
 BOOL OutputDevice::HitTestNativeControl( ControlType nType,
                               ControlPart nPart,
-                              const Region& rControlRegion,
+                              const Rectangle& rControlRegion,
                               const Point& aPos,
                               BOOL& rIsInside )
 {
@@ -95,7 +127,7 @@ BOOL OutputDevice::HitTestNativeControl( ControlType nType,
             return FALSE;
 
     Point aWinOffs( mnOutOffX, mnOutOffY );
-    Region screenRegion( rControlRegion );
+    Rectangle screenRegion( rControlRegion );
     screenRegion.Move( aWinOffs.X(), aWinOffs.Y());
 
     return( mpGraphics->HitTestNativeControl(nType, nPart, screenRegion, Point( aPos.X() + mnOutOffX, aPos.Y() + mnOutOffY ),
@@ -104,47 +136,117 @@ BOOL OutputDevice::HitTestNativeControl( ControlType nType,
 
 // -----------------------------------------------------------------------
 
-static void lcl_moveControlValue( ControlType nType, const ImplControlValue& aValue, const Point& rDelta )
+static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const ImplControlValue& rVal, OutputDevice& rDev )
 {
-    if( aValue.getOptionalVal() )
+    boost::shared_ptr< ImplControlValue > aResult;
+    switch( rVal.getType() )
     {
-        switch( nType )
+    case CTRL_SLIDER:
         {
-            case CTRL_SLIDER:
-            {
-                SliderValue* pSlVal = reinterpret_cast<SliderValue*>(aValue.getOptionalVal());
-                pSlVal->maThumbRect.Move( rDelta.X(), rDelta.Y() );
-            }
-            break;
-            case CTRL_SCROLLBAR:
-            {
-                ScrollbarValue* pScVal = reinterpret_cast<ScrollbarValue*>(aValue.getOptionalVal());
-                pScVal->maThumbRect.Move( rDelta.X(), rDelta.Y() );
-                pScVal->maButton1Rect.Move( rDelta.X(), rDelta.Y() );
-                pScVal->maButton2Rect.Move( rDelta.X(), rDelta.Y() );
-            }
-            break;
-            case CTRL_SPINBOX:
-            case CTRL_SPINBUTTONS:
-            {
-                SpinbuttonValue* pSpVal = reinterpret_cast<SpinbuttonValue*>(aValue.getOptionalVal());
-                pSpVal->maUpperRect.Move( rDelta.X(), rDelta.Y() );
-                pSpVal->maLowerRect.Move( rDelta.X(), rDelta.Y() );
-            }
-            break;
-            case CTRL_TOOLBAR:
-            {
-                ToolbarValue* pTVal = reinterpret_cast<ToolbarValue*>(aValue.getOptionalVal());
-                pTVal->maGripRect.Move( rDelta.X(), rDelta.Y() );
-            }
+            const SliderValue* pSlVal = static_cast<const SliderValue*>(&rVal);
+            SliderValue* pNew = new SliderValue( *pSlVal );
+            aResult.reset( pNew );
+            pNew->maThumbRect = rDev.ImplLogicToDevicePixel( pSlVal->maThumbRect );
+        }
+        break;
+    case CTRL_SCROLLBAR:
+        {
+            const ScrollbarValue* pScVal = static_cast<const ScrollbarValue*>(&rVal);
+            ScrollbarValue* pNew = new ScrollbarValue( *pScVal );
+            aResult.reset( pNew );
+            pNew->maThumbRect = rDev.ImplLogicToDevicePixel( pScVal->maThumbRect );
+            pNew->maButton1Rect = rDev.ImplLogicToDevicePixel( pScVal->maButton1Rect );
+            pNew->maButton2Rect = rDev.ImplLogicToDevicePixel( pScVal->maButton2Rect );
+        }
+        break;
+    case CTRL_SPINBUTTONS:
+        {
+            const SpinbuttonValue* pSpVal = static_cast<const SpinbuttonValue*>(&rVal);
+            SpinbuttonValue* pNew = new SpinbuttonValue( *pSpVal );
+            aResult.reset( pNew );
+            pNew->maUpperRect = rDev.ImplLogicToDevicePixel( pSpVal->maUpperRect );
+            pNew->maLowerRect = rDev.ImplLogicToDevicePixel( pSpVal->maLowerRect );
+        }
+        break;
+    case CTRL_TOOLBAR:
+        {
+            const ToolbarValue* pTVal = static_cast<const ToolbarValue*>(&rVal);
+            ToolbarValue* pNew = new ToolbarValue( *pTVal );
+            aResult.reset( pNew );
+            pNew->maGripRect = rDev.ImplLogicToDevicePixel( pTVal->maGripRect );
+        }
+        break;
+    case CTRL_TAB_ITEM:
+        {
+            const TabitemValue* pTIVal = static_cast<const TabitemValue*>(&rVal);
+            TabitemValue* pNew = new TabitemValue( *pTIVal );
+            aResult.reset( pNew );
+        }
+        break;
+    case CTRL_MENUBAR:
+        {
+            const MenubarValue* pMVal = static_cast<const MenubarValue*>(&rVal);
+            MenubarValue* pNew = new MenubarValue( *pMVal );
+            aResult.reset( pNew );
+        }
+        break;
+    case CTRL_PUSHBUTTON:
+        {
+            const PushButtonValue* pBVal = static_cast<const PushButtonValue*>(&rVal);
+            PushButtonValue* pNew = new PushButtonValue( *pBVal );
+            aResult.reset( pNew );
+        }
+        break;
+    case CTRL_GENERIC:
+            aResult.reset( new ImplControlValue( rVal ) );
             break;
+    default:
+        OSL_ENSURE( 0, "unknown ImplControlValue type !" );
+        break;
+    }
+    return aResult;
+}
+
+#if 0
+static void lcl_moveControlValue( ControlType nType, const ImplControlValue& aValue, const Point& rDelta )
+{
+    switch( aValue.getType() )
+    {
+        case CTRL_SLIDER:
+        {
+            SliderValue* pSlVal = static_cast<SliderValue*>(const_cast<ImplControlValue*>(&aValue));
+            pSlVal->maThumbRect.Move( rDelta.X(), rDelta.Y() );
+        }
+        break;
+        case CTRL_SCROLLBAR:
+        {
+            ScrollbarValue* pScVal = static_cast<ScrollbarValue*>(const_cast<ImplControlValue*>(&aValue));
+            pScVal->maThumbRect.Move( rDelta.X(), rDelta.Y() );
+            pScVal->maButton1Rect.Move( rDelta.X(), rDelta.Y() );
+            pScVal->maButton2Rect.Move( rDelta.X(), rDelta.Y() );
+        }
+        break;
+        case CTRL_SPINBOX:
+        case CTRL_SPINBUTTONS:
+        {
+            SpinbuttonValue* pSpVal = static_cast<SpinbuttonValue*>(const_cast<ImplControlValue*>(&aValue));
+            pSpVal->maUpperRect.Move( rDelta.X(), rDelta.Y() );
+            pSpVal->maLowerRect.Move( rDelta.X(), rDelta.Y() );
+        }
+        break;
+        case CTRL_TOOLBAR:
+        {
+            ToolbarValue* pTVal = static_cast<ToolbarValue*>(const_cast<ImplControlValue*>(&aValue));
+            pTVal->maGripRect.Move( rDelta.X(), rDelta.Y() );
         }
+        break;
     }
 }
+#endif
 
 BOOL OutputDevice::DrawNativeControl( ControlType nType,
                             ControlPart nPart,
-                            const Region& rControlRegion,
+                            const Rectangle& rControlRegion,
                             ControlState nState,
                             const ImplControlValue& aValue,
                             ::rtl::OUString aCaption )
@@ -183,22 +285,15 @@ BOOL OutputDevice::DrawNativeControl( ControlType nType,
 
     // Convert the coordinates from relative to Window-absolute, so we draw
     // in the correct place in platform code
-    Point aWinOffs( mnOutOffX, mnOutOffY );
-    Region screenRegion( rControlRegion );
-    screenRegion.Move( aWinOffs.X(), aWinOffs.Y());
-
-    // do so for ImplControlValue members, also
-    lcl_moveControlValue( nType, aValue, aWinOffs );
+    boost::shared_ptr< ImplControlValue > aScreenCtrlValue( lcl_transformControlValue( aValue, *this ) );
+    Rectangle screenRegion( ImplLogicToDevicePixel( rControlRegion ) );
 
     Region aTestRegion( GetActiveClipRegion() );
     aTestRegion.Intersect( rControlRegion );
     if( aTestRegion == rControlRegion )
         nState |= CTRL_CACHING_ALLOWED;   // control is not clipped, caching allowed
 
-    BOOL bRet = mpGraphics->DrawNativeControl(nType, nPart, screenRegion, nState, aValue, aCaption, this );
-
-    // transform back ImplControlValue members
-    lcl_moveControlValue( nType, aValue, Point()-aWinOffs );
+    BOOL bRet = mpGraphics->DrawNativeControl(nType, nPart, screenRegion, nState, *aScreenCtrlValue, aCaption, this );
 
     return bRet;
 }
@@ -208,7 +303,7 @@ BOOL OutputDevice::DrawNativeControl( ControlType nType,
 
 BOOL OutputDevice::DrawNativeControlText(ControlType nType,
                             ControlPart nPart,
-                            const Region& rControlRegion,
+                            const Rectangle& rControlRegion,
                             ControlState nState,
                             const ImplControlValue& aValue,
                             ::rtl::OUString aCaption )
@@ -233,15 +328,10 @@ BOOL OutputDevice::DrawNativeControlText(ControlType nType,
 
     // Convert the coordinates from relative to Window-absolute, so we draw
     // in the correct place in platform code
-    Point aWinOffs( mnOutOffX, mnOutOffY );
-    Region screenRegion( rControlRegion );
-    screenRegion.Move( aWinOffs.X(), aWinOffs.Y());
-    lcl_moveControlValue( nType, aValue, aWinOffs );
-
-    BOOL bRet = mpGraphics->DrawNativeControlText(nType, nPart, screenRegion, nState, aValue, aCaption, this );
+    boost::shared_ptr< ImplControlValue > aScreenCtrlValue( lcl_transformControlValue( aValue, *this ) );
+    Rectangle screenRegion( ImplLogicToDevicePixel( rControlRegion ) );
 
-    // transform back ImplControlValue members
-    lcl_moveControlValue( nType, aValue, Point()-aWinOffs );
+    BOOL bRet = mpGraphics->DrawNativeControlText(nType, nPart, screenRegion, nState, *aScreenCtrlValue, aCaption, this );
 
     return bRet;
 }
@@ -251,12 +341,12 @@ BOOL OutputDevice::DrawNativeControlText(ControlType nType,
 
 BOOL OutputDevice::GetNativeControlRegion(  ControlType nType,
                                 ControlPart nPart,
-                                const Region& rControlRegion,
+                                const Rectangle& rControlRegion,
                                 ControlState nState,
                                 const ImplControlValue& aValue,
                                 ::rtl::OUString aCaption,
-                                Region &rNativeBoundingRegion,
-                                Region &rNativeContentRegion )
+                                Rectangle &rNativeBoundingRegion,
+                                Rectangle &rNativeContentRegion )
 {
     if( !lcl_enableNativeWidget( *this ) )
         return FALSE;
@@ -267,22 +357,18 @@ BOOL OutputDevice::GetNativeControlRegion(  ControlType nType,
 
     // Convert the coordinates from relative to Window-absolute, so we draw
     // in the correct place in platform code
-    Point aWinOffs( mnOutOffX, mnOutOffY );
-    Region screenRegion( rControlRegion );
-    screenRegion.Move( aWinOffs.X(), aWinOffs.Y());
-    lcl_moveControlValue( nType, aValue, aWinOffs );
+    boost::shared_ptr< ImplControlValue > aScreenCtrlValue( lcl_transformControlValue( aValue, *this ) );
+    Rectangle screenRegion( ImplLogicToDevicePixel( rControlRegion ) );
 
-    BOOL bRet = mpGraphics->GetNativeControlRegion(nType, nPart, screenRegion, nState, aValue,
+    BOOL bRet = mpGraphics->GetNativeControlRegion(nType, nPart, screenRegion, nState, *aScreenCtrlValue,
                                 aCaption, rNativeBoundingRegion,
                                 rNativeContentRegion, this );
     if( bRet )
     {
         // transform back native regions
-        rNativeBoundingRegion.Move( -aWinOffs.X(), -aWinOffs.Y() );
-        rNativeContentRegion.Move( -aWinOffs.X(), -aWinOffs.Y() );
+        rNativeBoundingRegion = ImplDevicePixelToLogic( rNativeBoundingRegion );
+        rNativeContentRegion = ImplDevicePixelToLogic( rNativeContentRegion );
     }
-    // transform back ImplControlValue members
-    lcl_moveControlValue( nType, aValue, Point()-aWinOffs );
 
     return bRet;
 }
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 77f7f74fc10e..7b7f3bbcb4d3 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -32,6 +32,7 @@
 #include <math.h>
 #include <algorithm>
 
+#include <tools/urlobj.hxx>
 #include <pdfwriter_impl.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -4081,15 +4082,15 @@ bool PDFWriterImpl::emitFonts()
                 }
                 else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::TYPE1_PFB) != 0 ) // TODO: also support PFA?
                 {
-                    unsigned char* pBuffer = new unsigned char[ (int)nLength1 ];
+                    boost::shared_array<unsigned char> pBuffer( new unsigned char[ nLength1 ] );
 
                     sal_uInt64 nBytesRead = 0;
-                    CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, pBuffer, nLength1, &nBytesRead ) ) );
+                    CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, pBuffer.get(), nLength1, &nBytesRead ) ) );
                     DBG_ASSERT( nBytesRead==nLength1, "PDF-FontSubset read incomplete!" );
                     CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) );
                     // get the PFB-segment lengths
                     ThreeInts aSegmentLengths = {0,0,0};
-                    getPfbSegmentLengths( pBuffer, (int)nBytesRead, aSegmentLengths );
+                    getPfbSegmentLengths( pBuffer.get(), (int)nBytesRead, aSegmentLengths );
                     // the lengths below are mandatory for PDF-exported Type1 fonts
                     // because the PFB segment headers get stripped! WhyOhWhy.
                     aLine.append( (sal_Int32)aSegmentLengths[0] );
@@ -4106,11 +4107,9 @@ bool PDFWriterImpl::emitFonts()
                     // emit PFB-sections without section headers
                     beginCompression();
                     checkAndEnableStreamEncryption( nFontStream );
-                    CHECK_RETURN( writeBuffer( pBuffer+ 6, aSegmentLengths[0] ) );
-                    CHECK_RETURN( writeBuffer( pBuffer+12 + aSegmentLengths[0], aSegmentLengths[1] ) );
-                    CHECK_RETURN( writeBuffer( pBuffer+18 + aSegmentLengths[0] + aSegmentLengths[1], aSegmentLengths[2] ) );
-
-                    delete[] pBuffer;
+                    CHECK_RETURN( writeBuffer( &pBuffer[6], aSegmentLengths[0] ) );
+                    CHECK_RETURN( writeBuffer( &pBuffer[12] + aSegmentLengths[0], aSegmentLengths[1] ) );
+                    CHECK_RETURN( writeBuffer( &pBuffer[18] + aSegmentLengths[0] + aSegmentLengths[1], aSegmentLengths[2] ) );
                 }
                 else
                 {
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 84e45979d679..97e11c5a6aa4 100644..100755
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -405,6 +405,7 @@ void    SalGraphics::DrawRect( long nX, long nY, long nWidth, long nHeight, cons
 }
 bool SalGraphics::drawPolyLine(
     const basegfx::B2DPolygon& /*rPolyPolygon*/,
+    double /*fTransparency*/,
     const basegfx::B2DVector& /*rLineWidths*/,
     basegfx::B2DLineJoin /*eLineJoin*/)
 {
@@ -536,7 +537,7 @@ sal_Bool SalGraphics::DrawPolyPolygonBezier( sal_uInt32 i_nPoly, const sal_uInt3
     return bRet;
 }
 
-bool SalGraphics::DrawPolyLine( const ::basegfx::B2DPolygon& i_rPolygon,
+bool SalGraphics::DrawPolyLine( const ::basegfx::B2DPolygon& i_rPolygon, double fTransparency,
     const ::basegfx::B2DVector& i_rLineWidth, basegfx::B2DLineJoin i_eLineJoin,
     const OutputDevice* i_pOutDev )
 {
@@ -544,10 +545,10 @@ bool SalGraphics::DrawPolyLine( const ::basegfx::B2DPolygon& i_rPolygon,
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) )
     {
         basegfx::B2DPolygon aMirror( mirror( i_rPolygon, i_pOutDev ) );
-        bRet = drawPolyLine( aMirror, i_rLineWidth, i_eLineJoin );
+        bRet = drawPolyLine( aMirror, fTransparency, i_rLineWidth, i_eLineJoin );
     }
     else
-        bRet = drawPolyLine( i_rPolygon, i_rLineWidth, i_eLineJoin );
+        bRet = drawPolyLine( i_rPolygon, fTransparency, i_rLineWidth, i_eLineJoin );
     return bRet;
 }
 
@@ -668,13 +669,13 @@ BOOL    SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, void*
     return drawEPS( nX, nY, nWidth, nHeight,  pPtr, nSize );
 }
 
-BOOL SalGraphics::HitTestNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+BOOL SalGraphics::HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                 const Point& aPos, BOOL& rIsInside, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
         Point pt( aPos );
-        Region rgn( rControlRegion );
+        Rectangle rgn( rControlRegion );
         mirror( pt.X(), pOutDev );
         mirror( rgn, pOutDev );
         return hitTestNativeControl( nType, nPart, rgn, pt, rIsInside );
@@ -683,51 +684,48 @@ BOOL SalGraphics::HitTestNativeControl( ControlType nType, ControlPart nPart, co
         return hitTestNativeControl( nType, nPart, rControlRegion, aPos, rIsInside );
 }
 
-void SalGraphics::mirror( ControlType nType, const ImplControlValue& rVal, const OutputDevice* pOutDev, bool bBack ) const
+void SalGraphics::mirror( ControlType , const ImplControlValue& rVal, const OutputDevice* pOutDev, bool bBack ) const
 {
-    if( rVal.getOptionalVal() )
+    switch( rVal.getType() )
     {
-        switch( nType )
+        case CTRL_SLIDER:
         {
-            case CTRL_SLIDER:
-            {
-                SliderValue* pSlVal = reinterpret_cast<SliderValue*>(rVal.getOptionalVal());
-                mirror(pSlVal->maThumbRect,pOutDev,bBack);
-            }
-            break;
-            case CTRL_SCROLLBAR:
-            {
-                ScrollbarValue* pScVal = reinterpret_cast<ScrollbarValue*>(rVal.getOptionalVal());
-                mirror(pScVal->maThumbRect,pOutDev,bBack);
-                mirror(pScVal->maButton1Rect,pOutDev,bBack);
-                mirror(pScVal->maButton2Rect,pOutDev,bBack);
-            }
-            break;
-            case CTRL_SPINBOX:
-            case CTRL_SPINBUTTONS:
-            {
-                SpinbuttonValue* pSpVal = reinterpret_cast<SpinbuttonValue*>(rVal.getOptionalVal());
-                mirror(pSpVal->maUpperRect,pOutDev,bBack);
-                mirror(pSpVal->maLowerRect,pOutDev,bBack);
-            }
-            break;
-            case CTRL_TOOLBAR:
-            {
-                ToolbarValue* pTVal = reinterpret_cast<ToolbarValue*>(rVal.getOptionalVal());
-                mirror(pTVal->maGripRect,pOutDev,bBack);
-            }
-            break;
+            SliderValue* pSlVal = static_cast<SliderValue*>(const_cast<ImplControlValue*>(&rVal));
+            mirror(pSlVal->maThumbRect,pOutDev,bBack);
+        }
+        break;
+        case CTRL_SCROLLBAR:
+        {
+            ScrollbarValue* pScVal = static_cast<ScrollbarValue*>(const_cast<ImplControlValue*>(&rVal));
+            mirror(pScVal->maThumbRect,pOutDev,bBack);
+            mirror(pScVal->maButton1Rect,pOutDev,bBack);
+            mirror(pScVal->maButton2Rect,pOutDev,bBack);
+        }
+        break;
+        case CTRL_SPINBOX:
+        case CTRL_SPINBUTTONS:
+        {
+            SpinbuttonValue* pSpVal = static_cast<SpinbuttonValue*>(const_cast<ImplControlValue*>(&rVal));
+            mirror(pSpVal->maUpperRect,pOutDev,bBack);
+            mirror(pSpVal->maLowerRect,pOutDev,bBack);
+        }
+        break;
+        case CTRL_TOOLBAR:
+        {
+            ToolbarValue* pTVal = static_cast<ToolbarValue*>(const_cast<ImplControlValue*>(&rVal));
+            mirror(pTVal->maGripRect,pOutDev,bBack);
         }
+        break;
     }
 }
 
-BOOL SalGraphics::DrawNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+BOOL SalGraphics::DrawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                 ControlState nState, const ImplControlValue& aValue,
                                                 const OUString& aCaption, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
-        Region rgn( rControlRegion );
+        Rectangle rgn( rControlRegion );
         mirror( rgn, pOutDev );
         mirror( nType, aValue, pOutDev );
         BOOL bRet = drawNativeControl( nType, nPart, rgn, nState, aValue, aCaption );
@@ -738,13 +736,13 @@ BOOL SalGraphics::DrawNativeControl( ControlType nType, ControlPart nPart, const
         return drawNativeControl( nType, nPart, rControlRegion, nState, aValue, aCaption );
 }
 
-BOOL SalGraphics::DrawNativeControlText( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+BOOL SalGraphics::DrawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                 ControlState nState, const ImplControlValue& aValue,
                                                 const OUString& aCaption, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
-        Region rgn( rControlRegion );
+        Rectangle rgn( rControlRegion );
         mirror( rgn, pOutDev );
         mirror( nType, aValue, pOutDev );
         BOOL bRet = drawNativeControlText( nType, nPart, rgn, nState, aValue, aCaption );
@@ -755,13 +753,13 @@ BOOL SalGraphics::DrawNativeControlText( ControlType nType, ControlPart nPart, c
         return drawNativeControlText( nType, nPart, rControlRegion, nState, aValue, aCaption );
 }
 
-BOOL SalGraphics::GetNativeControlRegion( ControlType nType, ControlPart nPart, const Region& rControlRegion, ControlState nState,
+BOOL SalGraphics::GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const OUString& aCaption,
-                                                Region &rNativeBoundingRegion, Region &rNativeContentRegion, const OutputDevice *pOutDev )
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion, const OutputDevice *pOutDev )
 {
     if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
     {
-        Region rgn( rControlRegion );
+        Rectangle rgn( rControlRegion );
         mirror( rgn, pOutDev );
         mirror( nType, aValue, pOutDev );
         if( getNativeControlRegion( nType, nPart, rgn, nState, aValue, aCaption,
diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx
index 7faf12d062fe..8aa0e47f1a35 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.cxx
@@ -58,7 +58,7 @@ BOOL SalGraphics::IsNativeControlSupported( ControlType, ControlPart )
  */
 BOOL SalGraphics::hitTestNativeControl( ControlType,
                               ControlPart,
-                              const Region&,
+                              const Rectangle&,
                               const Point&,
                               BOOL& )
 {
@@ -77,7 +77,7 @@ BOOL SalGraphics::hitTestNativeControl( ControlType,
  */
 BOOL SalGraphics::drawNativeControl(    ControlType,
                             ControlPart,
-                            const Region&,
+                            const Rectangle&,
                             ControlState,
                             const ImplControlValue&,
                             const OUString& )
@@ -98,7 +98,7 @@ BOOL SalGraphics::drawNativeControl(    ControlType,
  */
 BOOL SalGraphics::drawNativeControlText(    ControlType,
                                 ControlPart,
-                                const Region&,
+                                const Rectangle&,
                                 ControlState,
                                 const ImplControlValue&,
                                 const OUString& )
@@ -122,12 +122,12 @@ BOOL SalGraphics::drawNativeControlText(    ControlType,
  */
 BOOL SalGraphics::getNativeControlRegion(  ControlType,
                                 ControlPart,
-                                const Region&,
+                                const Rectangle&,
                                 ControlState,
                                 const ImplControlValue&,
                                 const OUString&,
-                                Region &,
-                                Region & )
+                                Rectangle &,
+                                Rectangle & )
 {
     return( FALSE );
 }
diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx
index f66f5b48e39e..f82e3afe39c8 100644
--- a/vcl/source/glyphs/graphite_adaptors.cxx
+++ b/vcl/source/glyphs/graphite_adaptors.cxx
@@ -99,12 +99,18 @@ FontProperties::FontProperties(const FreetypeServerFont &font) throw()
             fItalic = false;
     }
 
-    // Get the font name.
+    // Get the font name, but prefix with file name hash in case
+    // there are 2 fonts on the system with the same face name
+    sal_Int32 nHashCode = font.GetFontFileName()->hashCode();
+    ::rtl::OUStringBuffer nHashFaceName;
+    nHashFaceName.append(nHashCode, 16);
     const sal_Unicode    * name = font.GetFontSelData().maName.GetBuffer();
-    const size_t          name_sz = std::min(sizeof szFaceName/sizeof(wchar_t)-1,
-                    size_t(font.GetFontSelData().maName.Len()));
+    nHashFaceName.append(name);
 
-    std::copy(name, name + name_sz, szFaceName);
+    const size_t name_sz = std::min(sizeof szFaceName/sizeof(wchar_t)-1,
+                    static_cast<size_t>(nHashFaceName.getLength()));
+
+    std::copy(nHashFaceName.getStr(), nHashFaceName.getStr() + name_sz, szFaceName);
     szFaceName[name_sz] = '\0';
 }
 
@@ -120,13 +126,13 @@ GraphiteFontAdaptor::GraphiteFontAdaptor(ServerFont & sfont, const sal_Int32 dpi
     mfEmUnits(static_cast<FreetypeServerFont &>(sfont).GetMetricsFT().y_ppem),
     mpFeatures(NULL)
 {
-    //std::wstring face_name(maFontProperties.szFaceName);
     const rtl::OString aLang = MsLangId::convertLanguageToIsoByteString( sfont.GetFontSelData().meLanguage );
-#ifdef DEBUG
-    printf("GraphiteFontAdaptor %lx\n", (long)this);
-#endif
     rtl::OString name = rtl::OUStringToOString(
         sfont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 );
+#ifdef DEBUG
+    printf("GraphiteFontAdaptor %lx %s italic=%u bold=%u\n", (long)this, name.getStr(),
+           maFontProperties.fItalic, maFontProperties.fBold);
+#endif
     sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1;
     if (nFeat > 0)
     {
@@ -259,21 +265,24 @@ const void * GraphiteFontAdaptor::getTable(gr::fontTableId32 table_id, size_t *
 // Return the glyph's metrics in pixels.
 void GraphiteFontAdaptor::getGlyphMetrics(gr::gid16 nGlyphId, gr::Rect & aBounding, gr::Point & advances)
 {
-    // Graphite gets really confused if the glyphs have been transformed, so
-    // if orientation has been set we can't use the font's glyph cache
-    // unfortunately the font selection data, doesn't always have the orientation
-    // set, even if it was when the glyphs were cached, so we use our own cache.
-
-//         const GlyphMetric & metric = mrFont.GetGlyphMetric(nGlyphId);
-//
-//         aBounding.right  = aBounding.left = metric.GetOffset().X();
-//         aBounding.bottom = aBounding.top  = -metric.GetOffset().Y();
-//         aBounding.right  += metric.GetSize().Width();
-//         aBounding.bottom -= metric.GetSize().Height();
-//
-//         advances.x = metric.GetDelta().X();
-//         advances.y = -metric.GetDelta().Y();
-
+    // There used to be problems when orientation was set however, this no
+    // longer seems to be the case and the Glyph Metric cache in
+    // FreetypeServerFont is more efficient since it lasts between calls to VCL
+#if 1
+    const GlyphMetric & metric = mrFont.GetGlyphMetric(nGlyphId);
+
+    aBounding.right  = aBounding.left = metric.GetOffset().X();
+    aBounding.bottom = aBounding.top  = -metric.GetOffset().Y();
+    aBounding.right  += metric.GetSize().Width();
+    aBounding.bottom -= metric.GetSize().Height();
+
+    advances.x = metric.GetDelta().X();
+    advances.y = -metric.GetDelta().Y();
+
+#else
+    // The problem with the code below is that the cache only lasts
+    // as long as the life time of the GraphiteFontAdaptor, which
+    // is created once per call to X11SalGraphics::GetTextLayout
     GlyphMetricMap::const_iterator gm_itr = maGlyphMetricMap.find(nGlyphId);
     if (gm_itr != maGlyphMetricMap.end())
     {
@@ -321,6 +330,7 @@ void GraphiteFontAdaptor::getGlyphMetrics(gr::gid16 nGlyphId, gr::Rect & aBoundi
         // Now add an entry to our metrics map.
         maGlyphMetricMap[nGlyphId] = std::make_pair(aBounding, advances);
     }
+#endif
 }
 
 #endif
diff --git a/vcl/source/glyphs/graphite_cache.cxx b/vcl/source/glyphs/graphite_cache.cxx
index 64bbb0a38d60..389accd631f0 100644
--- a/vcl/source/glyphs/graphite_cache.cxx
+++ b/vcl/source/glyphs/graphite_cache.cxx
@@ -105,7 +105,7 @@ GrSegRecord * GraphiteSegmentCache::cacheSegment(TextSourceAdaptor * adapter, gr
     // when the next key is added, the record for the prevKey's m_nextKey field
     // is updated to the newest key so that m_oldestKey can be updated to the
     // next oldest key when the record for m_oldestKey is deleted
-    if (m_segMap.size() > SEG_CACHE_SIZE)
+    if (m_segMap.size() > m_nSegCacheSize)
     {
       GraphiteSegMap::iterator oldestPair = m_segMap.find(reinterpret_cast<long>(m_oldestKey));
       // oldest record may no longer exist if a buffer was changed
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index ff2fd8f306b1..ae7ec8246e33 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -56,6 +56,10 @@
 #include <svsys.h>
 #endif
 
+#ifdef UNX
+#include <vcl/graphite_adaptors.hxx>
+#endif
+
 #include <vcl/salgdi.hxx>
 
 #include <unicode/uchar.h>
@@ -175,7 +179,8 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs,
     glyph_range_t iGlyphs = rSegment.glyphs();
     int nGlyphs = iGlyphs.second - iGlyphs.first;
     gr::GlyphIterator prevBase = iGlyphs.second;
-    float fMinX = rSegment.advanceWidth();
+    float fSegmentAdvance = rSegment.advanceWidth();
+    float fMinX = fSegmentAdvance;
     float fMaxX = 0.0f;
     rGlyph2Char.assign(nGlyphs, -1);
     long nDxOffset = 0;
@@ -222,7 +227,8 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs,
                         nFirstGlyphInCluster != nGlyphIndex)
                     {
                         std::pair <float,float> aBounds =
-                            appendCluster(rSegment, rArgs, bRtl, nFirstCharInCluster,
+                            appendCluster(rSegment, rArgs, bRtl,
+                            fSegmentAdvance, nFirstCharInCluster,
                             nNextChar, nFirstGlyphInCluster, nGlyphIndex, fScaling,
                             rChar2Base, rGlyph2Char, rCharDxs, nDxOffset);
                         fMinX = std::min(aBounds.first, fMinX);
@@ -285,7 +291,8 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs,
         nFirstGlyphInCluster != nGlyphIndex)
     {
         std::pair <float,float> aBounds =
-            appendCluster(rSegment, rArgs, bRtl, nFirstCharInCluster, nNextChar,
+            appendCluster(rSegment, rArgs, bRtl, fSegmentAdvance,
+                          nFirstCharInCluster, nNextChar,
                           nFirstGlyphInCluster, nGlyphIndex, fScaling,
                           rChar2Base, rGlyph2Char, rCharDxs, nDxOffset);
         fMinX = std::min(aBounds.first, fMinX);
@@ -334,11 +341,11 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs,
     }
 }
 
-std::pair<float,float> GraphiteLayout::Glyphs::appendCluster(gr::Segment & rSeg,
-    ImplLayoutArgs & rArgs, bool bRtl, int nFirstCharInCluster, int nNextChar,
-    int nFirstGlyphInCluster, int nNextGlyph, float fScaling,
-    std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char,
-    std::vector<int> & rCharDxs, long & rDXOffset)
+std::pair<float,float> GraphiteLayout::Glyphs::appendCluster(gr::Segment& rSeg,
+    ImplLayoutArgs & rArgs, bool bRtl,float fSegmentAdvance,
+    int nFirstCharInCluster, int nNextChar, int nFirstGlyphInCluster,
+    int nNextGlyph, float fScaling, std::vector<int> & rChar2Base,
+    std::vector<int> & rGlyph2Char, std::vector<int> & rCharDxs, long & rDXOffset)
 {
     glyph_range_t iGlyphs = rSeg.glyphs();
     int nGlyphs = iGlyphs.second - iGlyphs.first;
@@ -402,9 +409,9 @@ std::pair<float,float> GraphiteLayout::Glyphs::appendCluster(gr::Segment & rSeg,
         gr::GlyphInfo aGlyph = *(iGlyphs.first + j);
         if (j + nDelta >= nGlyphs || j + nDelta < 0) // at rhs ltr,rtl
         {
-            fNextOrigin = rSeg.advanceWidth();
-            nNextOrigin = round(rSeg.advanceWidth() * fScaling + rDXOffset);
-            aBounds.second = std::max(rSeg.advanceWidth(), aBounds.second);
+            fNextOrigin = fSegmentAdvance;
+            nNextOrigin = round(fSegmentAdvance * fScaling + rDXOffset);
+            aBounds.second = std::max(fSegmentAdvance, aBounds.second);
         }
         else
         {
@@ -546,7 +553,7 @@ GraphiteLayout::GraphiteLayout(const gr::Font & font, const grutils::GrFeaturePa
     // If true, it can cause end of line spaces to be hidden e.g. Doulos SIL
     maLayout.setStartOfLine(false);
     maLayout.setEndOfLine(false);
-//    maLayout.setDumbFallback(false);
+    maLayout.setDumbFallback(true);
     // trailing ws doesn't seem to always take affect if end of line is true
     maLayout.setTrailingWs(gr::ktwshAll);
 #ifdef GRLAYOUT_DEBUG
@@ -598,6 +605,8 @@ bool GraphiteLayout::LayoutText(ImplLayoutArgs & rArgs)
     else delete pSegment;
 #else
     gr::Segment * pSegment = CreateSegment(rArgs);
+    if (!pSegment)
+        return false;
     bool success = LayoutGlyphs(rArgs, pSegment);
     delete pSegment;
 #endif
@@ -649,7 +658,19 @@ public:
 #endif
         return hash;
     };
-
+protected:
+    virtual void UniqueCacheInfo(std::wstring & stuFace, bool & fBold, bool & fItalic)
+    {
+#ifdef WIN32
+        dynamic_cast<GraphiteWinFont&>(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic);
+#else
+#ifdef UNX
+        dynamic_cast<GraphiteFontAdaptor&>(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic);
+#else
+#error Unknown base type for gr::Font::UniqueCacheInfo
+#endif
+#endif
+    }
 private:
     gr::Font & mrRealFont;
 };
@@ -738,6 +759,14 @@ gr::Segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
         }
         else
         {
+#ifdef GRLAYOUT_DEBUG
+            fprintf(grLog(), "Gr::LayoutText failed: ");
+            for (int i = mnMinCharPos; i < limit; i++)
+            {
+                fprintf(grLog(), "%04x ", rArgs.mpStr[i]);
+            }
+            fprintf(grLog(), "\n");
+#endif
             clear();
             return NULL;
         }
@@ -897,7 +926,7 @@ long GraphiteLayout::FillDXArray( sal_Int32* pDXArray ) const
                 if (i > 0) pDXArray[i] -= mvCharDxs[i-1];
             }
 #ifdef GRLAYOUT_DEBUG
-            fprintf(grLog(),"%d,%d,%ld ", (int)i, (int)mvCharDxs[i], pDXArray[i]);
+            fprintf(grLog(),"%d,%d,%d ", (int)i, (int)mvCharDxs[i], pDXArray[i]);
 #endif
         }
         //std::adjacent_difference(mvCharDxs.begin(), mvCharDxs.end(), pDXArray);
@@ -1020,7 +1049,7 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector<int> & rDelt
 
 #ifdef GRLAYOUT_DEBUG
     for (size_t iDx = 0; iDx < mvCharDxs.size(); iDx++)
-         fprintf(grLog(),"%d,%d,%ld ", (int)iDx, (int)mvCharDxs[iDx], args.mpDXArray[iDx]);
+         fprintf(grLog(),"%d,%d,%d ", (int)iDx, (int)mvCharDxs[iDx], args.mpDXArray[iDx]);
     fprintf(grLog(),"ApplyDx\n");
 #endif
     bool bRtl = mnLayoutFlags & SAL_LAYOUT_BIDI_RTL;
@@ -1090,7 +1119,7 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector<int> & rDelt
             }
             long nDWidth = nNewClusterWidth - nOrigClusterWidth;
 #ifdef GRLAYOUT_DEBUG
-            fprintf(grLog(), "c%d last glyph %d/%d\n", i, nLastGlyph, mvGlyphs.size());
+            fprintf(grLog(), "c%lu last glyph %d/%lu\n", i, nLastGlyph, mvGlyphs.size());
 #endif
             assert((nLastGlyph > -1) && (nLastGlyph < (signed)mvGlyphs.size()));
             mvGlyphs[nLastGlyph].mnNewWidth += nDWidth;
@@ -1128,7 +1157,7 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector<int> & rDelt
     std::copy(args.mpDXArray, args.mpDXArray + nChars,
       mvCharDxs.begin() + (args.mnMinCharPos - mnMinCharPos));
 #ifdef GRLAYOUT_DEBUG
-    fprintf(grLog(),"ApplyDx %ld(%ld)\n", args.mpDXArray[nChars - 1], mnWidth);
+    fprintf(grLog(),"ApplyDx %d(%ld)\n", args.mpDXArray[nChars - 1], mnWidth);
 #endif
     mnWidth = args.mpDXArray[nChars - 1];
 }
@@ -1170,7 +1199,7 @@ void GraphiteLayout::kashidaJustify(std::vector<int>& rDeltaWidths, sal_GlyphId
         }
         nKashidaCount = 1 + (nGapWidth / nKashidaWidth);
 #ifdef GRLAYOUT_DEBUG
-        printf("inserting %d kashidas at %ld\n", nKashidaCount, (*i).mnGlyphIndex);
+        printf("inserting %d kashidas at %u\n", nKashidaCount, (*i).mnGlyphIndex);
 #endif
         GlyphItem glyphItem = *i;
         Point aPos(0, 0);
@@ -1309,7 +1338,7 @@ void GraphiteLayout::GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
             pCaretXArray[i] = pCaretXArray[i+1] = 0;
         }
 #ifdef GRLAYOUT_DEBUG
-        fprintf(grLog(),"%d,%ld-%ld\t", nCharSlot, pCaretXArray[i], pCaretXArray[i+1]);
+        fprintf(grLog(),"%d,%d-%d\t", nCharSlot, pCaretXArray[i], pCaretXArray[i+1]);
 #endif
     }
 #ifdef GRLAYOUT_DEBUG
diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx
index 2b9c705a5ea7..3912977cc9be 100644
--- a/vcl/source/glyphs/graphite_textsrc.hxx
+++ b/vcl/source/glyphs/graphite_textsrc.hxx
@@ -93,6 +93,7 @@ public:
         virtual ext_std::pair<gr::toffset, gr::toffset> propertyRange(gr::toffset ich);
         virtual size_t  getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset);
         virtual bool    sameSegment(gr::toffset ich1, gr::toffset ich2);
+        virtual bool featureVariations() { return false; }
 
         operator ImplLayoutArgs & () throw();
         void setFeatures(const grutils::GrFeatureParser * pFeatures);
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 8eedf76043da..b221d1f7d928 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1151,15 +1151,13 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
             if( mbNWFBorder )
             {
                 ImplControlValue aControlValue;
-                Region aCtrlRegion( Rectangle( (const Point&)Point(), Size( mnWidth < 10 ? 10 : mnWidth, mnHeight < 10 ? 10 : mnHeight ) ) );
-                Region aBoundingRgn( aCtrlRegion );
-                Region aContentRgn( aCtrlRegion );
+                Rectangle aCtrlRegion( (const Point&)Point(), Size( mnWidth < 10 ? 10 : mnWidth, mnHeight < 10 ? 10 : mnHeight ) );
+                Rectangle aBounds( aCtrlRegion );
+                Rectangle aContent( aCtrlRegion );
                 if( pWin->GetNativeControlRegion( aCtrlType, PART_ENTIRE_CONTROL, aCtrlRegion,
                                                   CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
-                                                  aBoundingRgn, aContentRgn ) )
+                                                  aBounds, aContent ) )
                 {
-                    Rectangle aBounds( aBoundingRgn.GetBoundRect() );
-                    Rectangle aContent( aContentRgn.GetBoundRect() );
                     mnLeftBorder    = aContent.Left() - aBounds.Left();
                     mnRightBorder   = aBounds.Right() - aContent.Right();
                     mnTopBorder     = aContent.Top() - aBounds.Top();
@@ -1346,13 +1344,14 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co
             nState |= CTRL_STATE_ROLLOVER;
 
         Point aPoint;
-        Region aCtrlRegion( Rectangle( aPoint, Size( mnWidth, mnHeight ) ) );
+        Rectangle aCtrlRegion( aPoint, Size( mnWidth, mnHeight ) );
 
-        Region aBoundingRgn( Rectangle( aPoint, Size( mnWidth, mnHeight ) ) );
-        Region aContentRgn=aCtrlRegion;
+        Rectangle aBoundingRgn( aPoint, Size( mnWidth, mnHeight ) );
+        Rectangle aContentRgn( aCtrlRegion );
         if(pWin->GetNativeControlRegion( aCtrlType, aCtrlPart, aCtrlRegion,
-            nState, aControlValue, rtl::OUString(), aBoundingRgn, aContentRgn )) {
-                        aCtrlRegion=aContentRgn;
+            nState, aControlValue, rtl::OUString(), aBoundingRgn, aContentRgn ))
+        {
+            aCtrlRegion=aContentRgn;
         }
 
         bNativeOK = pWin->DrawNativeControl( aCtrlType, aCtrlPart, aCtrlRegion, nState,
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index a32790cfb0d4..e5c3dc525cec 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -877,12 +877,12 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
         if( pWin->GetType() == WINDOW_BORDERWINDOW )
             nValueStyle |= FRAME_DRAW_BORDERWINDOWBORDER;
         ImplControlValue aControlValue( nValueStyle );
-        Region aBound, aContent;
-        Region aNatRgn( rRect );
+        Rectangle aBound, aContent;
+        Rectangle aNatRgn( rRect );
         if(pWin && pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
             aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
         {
-            rRect = aContent.GetBoundRect();
+            rRect = aContent;
         }
         else if ( nStyle & FRAME_DRAW_MONO )
             ImplDrawDPILineRect( pDev, rRect, NULL, bRound );
@@ -922,15 +922,15 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
             if( pWin->GetType() == WINDOW_BORDERWINDOW )
                 nValueStyle |= FRAME_DRAW_BORDERWINDOWBORDER;
             ImplControlValue aControlValue( nValueStyle );
-            Region aBound, aContent;
-            Region aNatRgn( rRect );
+            Rectangle aBound, aContent;
+            Rectangle aNatRgn( rRect );
             if( pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
                 aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
             {
                 if( pWin->DrawNativeControl( CTRL_FRAME, PART_BORDER, aContent, CTRL_STATE_ENABLED,
                              aControlValue, rtl::OUString()) )
                 {
-                    rRect = aContent.GetBoundRect();
+                    rRect = aContent;
                     return;
                 }
             }
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index efc49be6fbf8..e4d5a8c4c0eb 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <dndevdis.hxx>
-#include <dndlcon.hxx>
+#include <vcl/dndevdis.hxx>
+#include <vcl/dndlcon.hxx>
 #include <vcl/window.h>
 
 #include <vos/mutex.hxx>
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index c5d78dd6bae3..07819e76f957 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include<dndlcon.hxx>
+#include <vcl/dndlcon.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 95e6c6113c45..9ea407e52ee3 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -152,23 +152,21 @@ void DockingAreaWindow::Paint( const Rectangle& )
     EnableNativeWidget( TRUE ); // only required because the toolkit curently switches this flag off
     if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) )
     {
-        ImplControlValue    aControlValue;
-        ToolbarValue        aToolbarValue;
+        ToolbarValue        aControlValue;
 
         if( GetAlign() == WINDOWALIGN_TOP && ImplGetSVData()->maNWFData.mbMenuBarDockingAreaCommonBG )
         {
             // give NWF a hint that this dockingarea is adjacent to the menubar
             // useful for special gradient effects that should cover both windows
-            aToolbarValue.mbIsTopDockingArea = TRUE;
+            aControlValue.mbIsTopDockingArea = TRUE;
         }
-        aControlValue.setOptionalVal( (void *)(&aToolbarValue) );
         ControlState        nState = CTRL_STATE_ENABLED;
 
         if( !ImplGetSVData()->maNWFData.mbDockingAreaSeparateTB )
         {
             // draw a single toolbar background covering the whole docking area
             Point tmp;
-            Region aCtrlRegion( Rectangle( tmp, GetOutputSizePixel() ) );
+            Rectangle aCtrlRegion( tmp, GetOutputSizePixel() );
 
             DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT,
                                aCtrlRegion, nState, aControlValue, rtl::OUString() );
@@ -231,7 +229,7 @@ void DockingAreaWindow::Paint( const Rectangle& )
                     aTBRect.Bottom()    = aOutSz.Height() - 1;
                 }
                 DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT,
-                                   Region( aTBRect), nState, aControlValue, rtl::OUString() );
+                                   aTBRect, nState, aControlValue, rtl::OUString() );
             }
         }
     }
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index cebe1d1f596c..81676eba3be4 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -938,6 +938,14 @@ Menu::~Menu()
     if ( nEventId )
         Application::RemoveUserEvent( nEventId );
 
+    // Notify deletion of this menu
+    ImplMenuDelData* pDelData = mpFirstDel;
+    while ( pDelData )
+    {
+        pDelData->mpMenu = NULL;
+        pDelData = pDelData->mpNext;
+    }
+
     bKilled = TRUE;
 
     delete pItemList;
@@ -970,7 +978,7 @@ void Menu::ImplInit()
     bInCallback     = FALSE;
     bKilled         = FALSE;
     mpLayoutData    = NULL;
-
+    mpFirstDel      = NULL;         // Dtor notification list
     // Native-support: returns NULL if not supported
     mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu( bIsMenuBar );
 }
@@ -1034,19 +1042,29 @@ void Menu::CreateAutoMnemonics()
 void Menu::Activate()
 {
     bInCallback = TRUE;
+
+    ImplMenuDelData aDelData( this );
+
     ImplCallEventListeners( VCLEVENT_MENU_ACTIVATE, ITEMPOS_INVALID );
-    if ( !aActivateHdl.Call( this ) )
+
+    if( !aDelData.isDeleted() )
     {
-        Menu* pStartMenu = ImplGetStartMenu();
-        if ( pStartMenu && ( pStartMenu != this ) )
+        if ( !aActivateHdl.Call( this ) )
         {
-            pStartMenu->bInCallback = TRUE;
-            // MT 11/01: Call EventListener here? I don't know...
-            pStartMenu->aActivateHdl.Call( this );
-            pStartMenu->bInCallback = FALSE;
+            if( !aDelData.isDeleted() )
+            {
+                Menu* pStartMenu = ImplGetStartMenu();
+                if ( pStartMenu && ( pStartMenu != this ) )
+                {
+                    pStartMenu->bInCallback = TRUE;
+                    // MT 11/01: Call EventListener here? I don't know...
+                    pStartMenu->aActivateHdl.Call( this );
+                    pStartMenu->bInCallback = FALSE;
+                }
+            }
         }
+        bInCallback = FALSE;
     }
-    bInCallback = FALSE;
 }
 
 void Menu::Deactivate()
@@ -1059,33 +1077,49 @@ void Menu::Deactivate()
     }
 
     bInCallback = TRUE;
+
+    ImplMenuDelData aDelData( this );
+
     Menu* pStartMenu = ImplGetStartMenu();
     ImplCallEventListeners( VCLEVENT_MENU_DEACTIVATE, ITEMPOS_INVALID );
-    if ( !aDeactivateHdl.Call( this ) )
+
+    if( !aDelData.isDeleted() )
     {
-        if ( pStartMenu && ( pStartMenu != this ) )
+        if ( !aDeactivateHdl.Call( this ) )
         {
-            pStartMenu->bInCallback = TRUE;
-            pStartMenu->aDeactivateHdl.Call( this );
-            pStartMenu->bInCallback = FALSE;
+            if( !aDelData.isDeleted() )
+            {
+                if ( pStartMenu && ( pStartMenu != this ) )
+                {
+                    pStartMenu->bInCallback = TRUE;
+                    pStartMenu->aDeactivateHdl.Call( this );
+                    pStartMenu->bInCallback = FALSE;
+                }
+            }
         }
     }
-    bInCallback = FALSE;
 
-    if ( this == pStartMenu )
-        GetpApp()->HideHelpStatusText();
+    if( !aDelData.isDeleted() )
+    {
+        bInCallback = FALSE;
+
+        if ( this == pStartMenu )
+            GetpApp()->HideHelpStatusText();
+    }
 }
 
 void Menu::Highlight()
 {
+    ImplMenuDelData aDelData( this );
+
     Menu* pStartMenu = ImplGetStartMenu();
-    if ( !aHighlightHdl.Call( this ) )
+    if ( !aHighlightHdl.Call( this ) && !aDelData.isDeleted() )
     {
         if ( pStartMenu && ( pStartMenu != this ) )
             pStartMenu->aHighlightHdl.Call( this );
     }
 
-    if ( GetCurItemId() )
+    if ( !aDelData.isDeleted() && GetCurItemId() )
         GetpApp()->ShowHelpStatusText( GetHelpText( GetCurItemId() ) );
 }
 
@@ -1112,14 +1146,19 @@ void Menu::ImplSelect()
 
 void Menu::Select()
 {
+    ImplMenuDelData aDelData( this );
+
     ImplCallEventListeners( VCLEVENT_MENU_SELECT, GetItemPos( GetCurItemId() ) );
-    if ( !aSelectHdl.Call( this ) )
+    if ( !aDelData.isDeleted() && !aSelectHdl.Call( this ) )
     {
-        Menu* pStartMenu = ImplGetStartMenu();
-        if ( pStartMenu && ( pStartMenu != this ) )
+        if( !aDelData.isDeleted() )
         {
-            pStartMenu->nSelectedId = nSelectedId;
-            pStartMenu->aSelectHdl.Call( this );
+            Menu* pStartMenu = ImplGetStartMenu();
+            if ( pStartMenu && ( pStartMenu != this ) )
+            {
+                pStartMenu->nSelectedId = nSelectedId;
+                pStartMenu->aSelectHdl.Call( this );
+            }
         }
     }
 }
@@ -1141,6 +1180,8 @@ void Menu::RequestHelp( const HelpEvent& )
 
 void Menu::ImplCallEventListeners( ULONG nEvent, USHORT nPos )
 {
+    ImplMenuDelData aDelData( this );
+
     VclMenuEvent aEvent( this, nEvent, nPos );
 
     // This is needed by atk accessibility bridge
@@ -1149,16 +1190,22 @@ void Menu::ImplCallEventListeners( ULONG nEvent, USHORT nPos )
         ImplGetSVData()->mpApp->ImplCallEventListeners( &aEvent );
     }
 
-    if ( !maEventListeners.empty() )
+    if ( !aDelData.isDeleted() && !maEventListeners.empty() )
         maEventListeners.Call( &aEvent );
 
-    Menu* pMenu = this;
-    while ( pMenu )
+    if( !aDelData.isDeleted() )
     {
-        if ( !maChildEventListeners.empty() )
-            maChildEventListeners.Call( &aEvent );
+        Menu* pMenu = this;
+        while ( pMenu )
+        {
+            if ( !maChildEventListeners.empty() )
+                maChildEventListeners.Call( &aEvent );
 
-        pMenu = ( pMenu->pStartedFrom != pMenu ) ? pMenu->pStartedFrom : NULL;
+            if( aDelData.isDeleted() )
+                break;
+
+            pMenu = ( pMenu->pStartedFrom != pMenu ) ? pMenu->pStartedFrom : NULL;
+        }
     }
 }
 
@@ -2221,10 +2268,10 @@ long Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, lon
     if( ! bIsMenuBar )
     {
         ImplControlValue aVal;
-        Region aNativeBounds;
-        Region aNativeContent;
+        Rectangle aNativeBounds;
+        Rectangle aNativeContent;
         Point tmp( 0, 0 );
-        Region aCtrlRegion( Rectangle( tmp, Size( 100, 15 ) ) );
+        Rectangle aCtrlRegion( Rectangle( tmp, Size( 100, 15 ) ) );
         if( pWin->IsNativeControlSupported( CTRL_MENU_POPUP, PART_MENU_ITEM_CHECK_MARK ) )
         {
             if( pWin->GetNativeControlRegion( ControlType(CTRL_MENU_POPUP),
@@ -2237,8 +2284,8 @@ long Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, lon
                                               aNativeContent )
             )
             {
-                rCheckHeight = aNativeBounds.GetBoundRect().GetHeight();
-                rMaxWidth = aNativeContent.GetBoundRect().GetWidth();
+                rCheckHeight = aNativeBounds.GetHeight();
+                rMaxWidth = aNativeContent.GetWidth();
             }
         }
         if( pWin->IsNativeControlSupported( CTRL_MENU_POPUP, PART_MENU_ITEM_RADIO_MARK ) )
@@ -2253,14 +2300,50 @@ long Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, lon
                                               aNativeContent )
             )
             {
-                rRadioHeight = aNativeBounds.GetBoundRect().GetHeight();
-                rMaxWidth = Max (rMaxWidth, aNativeContent.GetBoundRect().GetWidth());
+                rRadioHeight = aNativeBounds.GetHeight();
+                rMaxWidth = Max (rMaxWidth, aNativeContent.GetWidth());
             }
         }
     }
     return (rCheckHeight > rRadioHeight) ? rCheckHeight : rRadioHeight;
 }
 
+// -----------------------------------------------------------------------
+
+void Menu::ImplAddDel( ImplMenuDelData& rDel )
+{
+    DBG_ASSERT( !rDel.mpMenu, "Menu::ImplAddDel(): cannot add ImplMenuDelData twice !" );
+    if( !rDel.mpMenu )
+    {
+        rDel.mpMenu = this;
+        rDel.mpNext = mpFirstDel;
+        mpFirstDel = &rDel;
+    }
+}
+
+// -----------------------------------------------------------------------
+
+void Menu::ImplRemoveDel( ImplMenuDelData& rDel )
+{
+    rDel.mpMenu = NULL;
+    if ( mpFirstDel == &rDel )
+    {
+        mpFirstDel = rDel.mpNext;
+    }
+    else
+    {
+        ImplMenuDelData* pData = mpFirstDel;
+        while ( pData && (pData->mpNext != &rDel) )
+            pData = pData->mpNext;
+
+        DBG_ASSERT( pData, "Menu::ImplRemoveDel(): ImplMenuDelData not registered !" );
+        if( pData )
+            pData->mpNext = rDel.mpNext;
+    }
+}
+
+// -----------------------------------------------------------------------
+
 Size Menu::ImplCalcSize( Window* pWin )
 {
     // | Checked| Image| Text| Accel/Popup|
@@ -2433,10 +2516,10 @@ Size Menu::ImplCalcSize( Window* pWin )
         if( pWindow->IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL ) )
         {
             ImplControlValue aVal;
-            Region aNativeBounds;
-            Region aNativeContent;
+            Rectangle aNativeBounds;
+            Rectangle aNativeContent;
             Point tmp( 0, 0 );
-            Region aCtrlRegion( Rectangle( tmp, Size( 100, 15 ) ) );
+            Rectangle aCtrlRegion( tmp, Size( 100, 15 ) );
             if( pWindow->GetNativeControlRegion( ControlType(CTRL_MENUBAR),
                                                  ControlPart(PART_ENTIRE_CONTROL),
                                                  aCtrlRegion,
@@ -2447,7 +2530,7 @@ Size Menu::ImplCalcSize( Window* pWin )
                                                  aNativeContent )
             )
             {
-                int nNativeHeight = aNativeBounds.GetBoundRect().GetHeight();
+                int nNativeHeight = aNativeBounds.GetHeight();
                 if( nNativeHeight > aSz.Height() )
                     aSz.Height() = nNativeHeight;
             }
@@ -2472,7 +2555,7 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec
     if( i_pWindow->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) )
     {
         ImplControlValue    aControlValue;
-        Region              aCtrlRegion( i_rRect );
+        Rectangle           aCtrlRegion( i_rRect );
         ControlState        nState = CTRL_STATE_PRESSED | CTRL_STATE_ENABLED;
 
         aControlValue.setTristateVal( BUTTONVALUE_ON );
@@ -2606,7 +2689,7 @@ void Menu::ImplPaint( Window* pWin, USHORT nBorder, long nStartY, MenuItemData*
 
                             Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) );
                             pWin->DrawNativeControl( CTRL_MENU_POPUP, nPart,
-                                                     Region( aCheckRect ),
+                                                     aCheckRect,
                                                      nState,
                                                      ImplControlValue(),
                                                      OUString() );
@@ -2790,13 +2873,19 @@ Menu* Menu::ImplGetStartMenu()
 
 void Menu::ImplCallHighlight( USHORT nHighlightedItem )
 {
+    ImplMenuDelData aDelData( this );
+
     nSelectedId = 0;
     MenuItemData* pData = pItemList->GetDataFromPos( nHighlightedItem );
     if ( pData )
         nSelectedId = pData->nId;
     ImplCallEventListeners( VCLEVENT_MENU_HIGHLIGHT, GetItemPos( GetCurItemId() ) );
-    Highlight();
-    nSelectedId = 0;
+
+    if( !aDelData.isDeleted() )
+    {
+        Highlight();
+        nSelectedId = 0;
+    }
 }
 
 IMPL_LINK( Menu, ImplCallSelect, Menu*, EMPTYARG )
@@ -3292,10 +3381,14 @@ BOOL MenuBar::HandleMenuActivateEvent( Menu *pMenu ) const
 {
     if( pMenu )
     {
+        ImplMenuDelData aDelData( this );
+
         pMenu->pStartedFrom = (Menu*)this;
         pMenu->bInCallback = TRUE;
         pMenu->Activate();
-        pMenu->bInCallback = FALSE;
+
+        if( !aDelData.isDeleted() )
+            pMenu->bInCallback = FALSE;
     }
     return TRUE;
 }
@@ -3304,10 +3397,13 @@ BOOL MenuBar::HandleMenuDeActivateEvent( Menu *pMenu ) const
 {
     if( pMenu )
     {
+        ImplMenuDelData aDelData( this );
+
         pMenu->pStartedFrom = (Menu*)this;
         pMenu->bInCallback = TRUE;
         pMenu->Deactivate();
-        pMenu->bInCallback = FALSE;
+        if( !aDelData.isDeleted() )
+            pMenu->bInCallback = FALSE;
     }
     return TRUE;
 }
@@ -3318,13 +3414,18 @@ BOOL MenuBar::HandleMenuHighlightEvent( Menu *pMenu, USHORT nHighlightEventId )
         pMenu = ((Menu*) this)->ImplFindMenu( nHighlightEventId );
     if( pMenu )
     {
+        ImplMenuDelData aDelData( pMenu );
+
         if( mnHighlightedItemPos != ITEMPOS_INVALID )
             pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, mnHighlightedItemPos );
 
-        pMenu->mnHighlightedItemPos = pMenu->GetItemPos( nHighlightEventId );
-        pMenu->nSelectedId = nHighlightEventId;
-        pMenu->pStartedFrom = (Menu*)this;
-        pMenu->ImplCallHighlight( pMenu->mnHighlightedItemPos );
+        if( !aDelData.isDeleted() )
+        {
+            pMenu->mnHighlightedItemPos = pMenu->GetItemPos( nHighlightEventId );
+            pMenu->nSelectedId = nHighlightEventId;
+            pMenu->pStartedFrom = (Menu*)this;
+            pMenu->ImplCallHighlight( pMenu->mnHighlightedItemPos );
+        }
         return TRUE;
     }
     else
@@ -4578,7 +4679,7 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
                     IntersectClipRegion( Rectangle( Point( nX, nY ), Size( aSz.Width(), pData->aSz.Height() ) ) );
                     Rectangle aCtrlRect( Point( nX, 0 ), Size( aPxSize.Width()-nX, aPxSize.Height() ) );
                     DrawNativeControl( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL,
-                                       Region( aCtrlRect ),
+                                       aCtrlRect,
                                        CTRL_STATE_ENABLED,
                                        ImplControlValue(),
                                        OUString() );
@@ -4587,7 +4688,7 @@ void MenuFloatingWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
                     {
                         bDrawItemRect = false;
                         if( FALSE == DrawNativeControl( CTRL_MENU_POPUP, PART_MENU_ITEM,
-                                                        Region( aItemRect ),
+                                                        aItemRect,
                                                         CTRL_STATE_SELECTED | ( pData->bEnabled? CTRL_STATE_ENABLED: 0 ),
                                                         ImplControlValue(),
                                                         OUString() ) )
@@ -4925,7 +5026,7 @@ void MenuFloatingWindow::Paint( const Rectangle& )
         Size aPxSize( GetOutputSizePixel() );
         aPxSize.Width() -= nX;
         DrawNativeControl( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL,
-                           Region( Rectangle( Point( nX, 0 ), aPxSize ) ),
+                           Rectangle( Point( nX, 0 ), aPxSize ),
                            CTRL_STATE_ENABLED,
                            ImplControlValue(),
                            OUString() );
@@ -5439,23 +5540,21 @@ void MenuBarWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
                         IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL ) )
                     {
                         // draw background (transparency)
-                        ImplControlValue aControlValue;
-                        MenubarValue aMenubarValue;
-                        aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
-                        aControlValue.setOptionalVal( (void *)(&aMenubarValue) );
+                        MenubarValue aControlValue;
+                        aControlValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
 
                         Point tmp(0,0);
-                        Region aBgRegion( Rectangle( tmp, GetOutputSizePixel() ) );
+                        Rectangle aBgRegion( tmp, GetOutputSizePixel() );
                         DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL,
                                            aBgRegion,
                                            CTRL_STATE_ENABLED,
                                            aControlValue,
                                            OUString() );
-                        ImplAddNWFSeparator( this, aMenubarValue );
+                        ImplAddNWFSeparator( this, aControlValue );
 
                         // draw selected item
                         DrawNativeControl( CTRL_MENUBAR, PART_MENU_ITEM,
-                                           Region( aRect ),
+                                           aRect,
                                            CTRL_STATE_ENABLED | CTRL_STATE_SELECTED,
                                            aControlValue,
                                            OUString() );
@@ -5471,18 +5570,15 @@ void MenuBarWindow::HighlightItem( USHORT nPos, BOOL bHighlight )
                 {
                     if( IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL) )
                     {
-                        ImplControlValue aControlValue;
                         MenubarValue aMenubarValue;
                         aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
-                        aControlValue.setOptionalVal( (void *)(&aMenubarValue) );
 
                         // use full window size to get proper gradient
                         // but clip accordingly
                         Point aPt;
                         Rectangle aCtrlRect( aPt, GetOutputSizePixel() );
-                        Region aCtrlRegion( aCtrlRect );
 
-                        DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, aControlValue, rtl::OUString() );
+                        DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, aMenubarValue, rtl::OUString() );
                         ImplAddNWFSeparator( this, aMenubarValue );
                     }
                     else
@@ -5713,14 +5809,12 @@ void MenuBarWindow::Paint( const Rectangle& )
     if( IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL) )
     {
         Point aPt;
-        Region              aCtrlRegion( Rectangle( aPt, GetOutputSizePixel() ) );
+        Rectangle aCtrlRegion( aPt, GetOutputSizePixel() );
 
-        ImplControlValue aControlValue;
         MenubarValue aMenubarValue;
         aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
-        aControlValue.setOptionalVal( (void *)(&aMenubarValue) );
 
-        DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, aControlValue, rtl::OUString() );
+        DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, aMenubarValue, rtl::OUString() );
         ImplAddNWFSeparator( this, aMenubarValue );
     }
     SetFillColor( GetSettings().GetStyleSettings().GetMenuColor() );
@@ -5989,3 +6083,17 @@ bool MenuBarWindow::HandleMenuButtonEvent( USHORT i_nButtonId )
     }
     return FALSE;
 }
+
+ImplMenuDelData::ImplMenuDelData( const Menu* pMenu )
+: mpNext( 0 )
+, mpMenu( 0 )
+{
+    if( pMenu )
+        const_cast< Menu* >( pMenu )->ImplAddDel( *this );
+}
+
+ImplMenuDelData::~ImplMenuDelData()
+{
+    if( mpMenu )
+        const_cast< Menu* >( mpMenu )->ImplRemoveDel( *this );
+}
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 35077b1cff0e..52f54db0e50e 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -2514,13 +2514,13 @@ void PrintProgressDialog::implCalcProgressRect()
     if( IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
     {
         ImplControlValue aValue;
-        Region aControlRegion( Rectangle( Point(), Size( 100, mnProgressHeight ) ) );
-        Region aNativeControlRegion, aNativeContentRegion;
+        Rectangle aControlRegion( Point(), Size( 100, mnProgressHeight ) );
+        Rectangle aNativeControlRegion, aNativeContentRegion;
         if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
                                     CTRL_STATE_ENABLED, aValue, rtl::OUString(),
                                     aNativeControlRegion, aNativeContentRegion ) )
         {
-            mnProgressHeight = aNativeControlRegion.GetBoundRect().GetHeight();
+            mnProgressHeight = aNativeControlRegion.GetHeight();
         }
         mbNativeProgress = true;
     }
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index c139ae1ffb30..385dd241c770 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -544,7 +544,7 @@ void DrawProgress( Window* pWindow, const Point& rPos,
         long nPerc = (nPercent2 > 10000) ? 10000 : nPercent2;
         ImplControlValue aValue( nFullWidth * (long)nPerc / 10000 );
         Rectangle aDrawRect( rPos, Size( nFullWidth, nPrgsHeight ) );
-        Region aControlRegion( aDrawRect );
+        Rectangle aControlRegion( aDrawRect );
         if( bNeedErase )
         {
             Window* pEraseWindow = pWindow;
@@ -711,13 +711,13 @@ void StatusBar::ImplCalcProgressRect()
     if( IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
     {
         ImplControlValue aValue;
-        Region aControlRegion( Rectangle( (const Point&)Point(), maPrgsFrameRect.GetSize() ) );
-        Region aNativeControlRegion, aNativeContentRegion;
+        Rectangle aControlRegion( Rectangle( (const Point&)Point(), maPrgsFrameRect.GetSize() ) );
+        Rectangle aNativeControlRegion, aNativeContentRegion;
         if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
                                                  CTRL_STATE_ENABLED, aValue, rtl::OUString(),
                                                  aNativeControlRegion, aNativeContentRegion ) ) != FALSE )
         {
-            long nProgressHeight = aNativeControlRegion.GetBoundRect().GetHeight();
+            long nProgressHeight = aNativeControlRegion.GetHeight();
             if( nProgressHeight > maPrgsFrameRect.GetHeight() )
             {
                 long nDelta = nProgressHeight - maPrgsFrameRect.GetHeight();
@@ -1723,13 +1723,13 @@ Size StatusBar::CalcWindowSizePixel() const
     if( pThis->IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
     {
         ImplControlValue aValue;
-        Region aControlRegion( Rectangle( (const Point&)Point(), Size( nCalcWidth, nMinHeight ) ) );
-        Region aNativeControlRegion, aNativeContentRegion;
+        Rectangle aControlRegion( (const Point&)Point(), Size( nCalcWidth, nMinHeight ) );
+        Rectangle aNativeControlRegion, aNativeContentRegion;
         if( pThis->GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
                                            CTRL_STATE_ENABLED, aValue, rtl::OUString(),
                                            aNativeControlRegion, aNativeContentRegion ) )
         {
-            nProgressHeight = aNativeControlRegion.GetBoundRect().GetHeight();
+            nProgressHeight = aNativeControlRegion.GetHeight();
         }
     }
 
@@ -1737,14 +1737,13 @@ Size StatusBar::CalcWindowSizePixel() const
         pThis->IsNativeControlSupported( CTRL_FRAME, PART_BORDER ) )
     {
         ImplControlValue aControlValue( FRAME_DRAW_NODRAW );
-        Region aBound, aContent;
-        Region aNatRgn( Rectangle( Point( 0, 0 ), Size( 150, 50 ) ) );
+        Rectangle aBound, aContent;
+        Rectangle aNatRgn( Point( 0, 0 ), Size( 150, 50 ) );
         if( pThis->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
             aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
         {
             mpImplData->mnItemBorderWidth =
-                ( aBound.GetBoundRect().GetHeight() -
-                  aContent.GetBoundRect().GetHeight() ) / 2;
+                ( aBound.GetHeight() - aContent.GetHeight() ) / 2;
         }
     }
 
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 7bfd115af8f9..0589d57009f4 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -149,7 +149,7 @@ void TabPage::Paint( const Rectangle& )
     // draw native tabpage only inside tabcontrols, standalone tabpages look ugly (due to bad dialog design)
     if( IsNativeControlSupported(CTRL_TAB_BODY, PART_ENTIRE_CONTROL) && GetParent() && (GetParent()->GetType() == WINDOW_TABCONTROL) )
     {
-        const ImplControlValue aControlValue( BUTTONVALUE_DONTKNOW, rtl::OUString(), 0 );
+        const ImplControlValue aControlValue;
 
         ControlState nState = CTRL_STATE_ENABLED;
         int part = PART_ENTIRE_CONTROL;
@@ -160,7 +160,7 @@ void TabPage::Paint( const Rectangle& )
         Point aPoint;
         // pass the whole window region to NWF as the tab body might be a gradient or bitmap
         // that has to be scaled properly, clipping makes sure that we do not paint too much
-        Region aCtrlRegion( Rectangle( aPoint, GetOutputSizePixel() ) );
+        Rectangle aCtrlRegion( aPoint, GetOutputSizePixel() );
         DrawNativeControl( CTRL_TAB_BODY, part, aCtrlRegion, nState,
                 aControlValue, rtl::OUString() );
     }
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 9ad0b8734437..cde91a8dcd97 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -215,13 +215,13 @@ int ToolBox::ImplGetDragWidth( ToolBox* pThis )
 
         ImplControlValue aControlValue;
         Point aPoint;
-        Region aContent, aBound;
-        Region aArea( Rectangle(aPoint, pThis->GetOutputSizePixel()) );
+        Rectangle aContent, aBound;
+        Rectangle aArea( aPoint, pThis->GetOutputSizePixel() );
 
         if ( pThis->GetNativeControlRegion(CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_VERT : PART_THUMB_HORZ,
                 aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
         {
-                width = pThis->mbHorz ? aContent.GetBoundRect().GetWidth() : aContent.GetBoundRect().GetHeight();
+            width = pThis->mbHorz ? aContent.GetWidth() : aContent.GetHeight();
         }
     }
     return width;
@@ -338,16 +338,14 @@ void ToolBox::ImplDrawGrip( ToolBox* pThis )
         BOOL bNativeOk = FALSE;
         if( pThis->IsNativeControlSupported( CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_HORZ : PART_THUMB_VERT ) )
         {
-            ImplControlValue    aControlValue;
             ToolbarValue        aToolbarValue;
             aToolbarValue.maGripRect = pWrapper->GetDragArea();
-            aControlValue.setOptionalVal( (void *)(&aToolbarValue) );
             Point aPt;
-            Region              aCtrlRegion( Rectangle( aPt, pThis->GetOutputSizePixel() ) );
+            Rectangle           aCtrlRegion( aPt, pThis->GetOutputSizePixel() );
             ControlState        nState = CTRL_STATE_ENABLED;
 
             bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_VERT : PART_THUMB_HORZ,
-                                            aCtrlRegion, nState, aControlValue, rtl::OUString() );
+                                            aCtrlRegion, nState, aToolbarValue, rtl::OUString() );
         }
 
         if( bNativeOk )
@@ -557,7 +555,7 @@ BOOL ToolBox::ImplDrawNativeBackground( ToolBox* pThis, const Region & )
 {
     // use NWF
     Point aPt;
-    Region        aCtrlRegion( Rectangle( aPt, pThis->GetOutputSizePixel() ) );
+    Rectangle aCtrlRegion( aPt, pThis->GetOutputSizePixel() );
     ControlState  nState = CTRL_STATE_ENABLED;
 
     return pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT,
@@ -1918,9 +1916,9 @@ BOOL ToolBox::ImplCalcItem()
     // determine minimum size necessary in NWF
     {
         Rectangle aRect( Point( 0, 0 ), Size( nMinWidth, nMinHeight ) );
-        Region aReg = aRect;
+        Rectangle aReg( aRect );
         ImplControlValue aVal;
-        Region aNativeBounds, aNativeContent;
+        Rectangle aNativeBounds, aNativeContent;
         if( IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) )
         {
             if( GetNativeControlRegion( CTRL_TOOLBAR, PART_BUTTON,
@@ -1929,7 +1927,7 @@ BOOL ToolBox::ImplCalcItem()
                                         aVal, OUString(),
                                         aNativeBounds, aNativeContent ) )
             {
-                aRect = aNativeBounds.GetBoundRect();
+                aRect = aNativeBounds;
                 if( aRect.GetWidth() > nMinWidth )
                     nMinWidth = aRect.GetWidth();
                 if( aRect.GetHeight() > nMinHeight )
@@ -1954,7 +1952,7 @@ BOOL ToolBox::ImplCalcItem()
                                     aVal, OUString(),
                                     aNativeBounds, aNativeContent ) )
         {
-            aRect = aNativeBounds.GetBoundRect();
+            aRect = aNativeBounds;
             if( aRect.GetHeight() > mnWinHeight )
                 mnWinHeight = aRect.GetHeight();
         }
@@ -1966,7 +1964,7 @@ BOOL ToolBox::ImplCalcItem()
                                     aVal, OUString(),
                                     aNativeBounds, aNativeContent ) )
         {
-            aRect = aNativeBounds.GetBoundRect();
+            aRect = aNativeBounds;
             if( aRect.GetHeight() > mnWinHeight )
                 mnWinHeight = aRect.GetHeight();
         }
@@ -1978,7 +1976,7 @@ BOOL ToolBox::ImplCalcItem()
                                     aVal, OUString(),
                                     aNativeBounds, aNativeContent ) )
         {
-            aRect = aNativeBounds.GetBoundRect();
+            aRect = aNativeBounds;
             if( aRect.GetHeight() > mnWinHeight )
                 mnWinHeight = aRect.GetHeight();
         }
@@ -3418,7 +3416,6 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, USHORT highl
     if( !bIsWindow && pThis->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) )
     {
         ImplControlValue    aControlValue;
-        Region              aCtrlRegion( rRect );
         ControlState        nState = 0;
 
         if ( highlight == 1 )   nState |= CTRL_STATE_PRESSED;
@@ -3429,7 +3426,7 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, USHORT highl
 
 
         bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON,
-                                        aCtrlRegion, nState, aControlValue, rtl::OUString() );
+                                              rRect, nState, aControlValue, rtl::OUString() );
     }
 
     if( !bNativeOk )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index ca92d9ed6c5b..adedbde4c0f2 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -88,8 +88,8 @@
 
 #include "vcl/dialog.hxx"
 #include "vcl/unowrap.hxx"
-#include "dndlcon.hxx"
-#include "dndevdis.hxx"
+#include "vcl/dndlcon.hxx"
+#include "vcl/dndevdis.hxx"
 #include "vcl/impbmpconv.hxx"
 #include "unotools/confignode.hxx"
 #include "vcl/gdimtf.hxx"
@@ -243,18 +243,17 @@ void Window::ImplInitAppFontData( Window* pWindow )
         // of control sizes, if yes, make app font scalings larger
         // so dialog positioning is not completely off
         ImplControlValue aControlValue;
-        Region aCtrlRegion( (const Rectangle&)Rectangle( Point(), Size( nTextWidth < 10 ? 10 : nTextWidth, nTextHeight < 10 ? 10 : nTextHeight ) ) );
-        Region aBoundingRgn( aCtrlRegion );
-        Region aContentRgn( aCtrlRegion );
+        Rectangle aCtrlRegion( Point(), Size( nTextWidth < 10 ? 10 : nTextWidth, nTextHeight < 10 ? 10 : nTextHeight ) );
+        Rectangle aBoundingRgn( aCtrlRegion );
+        Rectangle aContentRgn( aCtrlRegion );
         if( pWindow->GetNativeControlRegion( CTRL_EDITBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
                                              CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
                                              aBoundingRgn, aContentRgn ) )
         {
-            Rectangle aContentRect( aContentRgn.GetBoundRect() );
             // comment: the magical +6 is for the extra border in bordered
             // (which is the standard) edit fields
-            if( aContentRect.GetHeight() - nTextHeight > (nTextHeight+4)/4 )
-                pSVData->maGDIData.mnAppFontY = (aContentRect.GetHeight()-4) * 10;
+            if( aContentRgn.GetHeight() - nTextHeight > (nTextHeight+4)/4 )
+                pSVData->maGDIData.mnAppFontY = (aContentRgn.GetHeight()-4) * 10;
         }
     }
 
@@ -8650,7 +8649,10 @@ Reference< XClipboard > Window::GetClipboard()
 
                 if( xFactory.is() )
                 {
-                    mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ) ), UNO_QUERY );
+                    mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboardExt" ) ), UNO_QUERY );
+
+                    if( !mpWindowImpl->mpFrameData->mxClipboard.is() )
+                        mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ) ), UNO_QUERY );
 
 #if defined(UNX) && !defined(QUARTZ)          // unix clipboard needs to be initialized
                     if( mpWindowImpl->mpFrameData->mxClipboard.is() )
@@ -8713,6 +8715,9 @@ Reference< XClipboard > Window::GetPrimarySelection()
                     static Reference< XClipboard >  s_xSelection;
 
                     if ( !s_xSelection.is() )
+                         s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboardExt" ) ), UNO_QUERY );
+
+                    if ( !s_xSelection.is() )
                          s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ) ), UNO_QUERY );
 
                     mpWindowImpl->mpFrameData->mxSelection = s_xSelection;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 7b0512a1320b..c964ad0d739b 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -62,7 +62,7 @@
 #include <vcl/salgdi.hxx>
 #include <vcl/menu.hxx>
 
-#include <dndlcon.hxx>
+#include <vcl/dndlcon.hxx>
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
 
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index cdc72485ae6c..9d3ce6b137cd 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -617,7 +617,7 @@ BOOL GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
  */
 BOOL GtkSalGraphics::hitTestNativeControl( ControlType      nType,
                                 ControlPart     nPart,
-                                const Region&       rControlRegion,
+                                const Rectangle&        rControlRegion,
                                 const Point&        aPos,
                                 BOOL&           rIsInside )
 {
@@ -654,8 +654,8 @@ BOOL GtkSalGraphics::hitTestNativeControl( ControlType      nType,
         else if ( nPart == PART_BUTTON_RIGHT )
             nCounterPart = PART_BUTTON_LEFT;
 
-        aBackward = NWGetScrollButtonRect( m_nScreen, nPart, rControlRegion.GetBoundRect() );
-        aForward = NWGetScrollButtonRect( m_nScreen, nCounterPart, rControlRegion.GetBoundRect() );
+        aBackward = NWGetScrollButtonRect( m_nScreen, nPart, rControlRegion );
+        aForward = NWGetScrollButtonRect( m_nScreen, nCounterPart, rControlRegion );
 
         if ( has_backward && has_forward2 )
         {
@@ -727,7 +727,7 @@ BOOL GtkSalGraphics::hitTestNativeControl( ControlType      nType,
  */
 BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
                             ControlPart nPart,
-                            const Region& rControlRegion,
+                            const Rectangle& rControlRegion,
                             ControlState nState,
                             const ImplControlValue& aValue,
                             const OUString& rCaption )
@@ -753,7 +753,7 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
         GtkSalGraphics::bThemeChanged = FALSE;
     }
 
-    Rectangle aCtrlRect = rControlRegion.GetBoundRect();
+    Rectangle aCtrlRect( rControlRegion );
     Region aClipRegion( m_aClipRegion );
     if( aClipRegion.IsNull() )
         aClipRegion = aCtrlRect;
@@ -897,7 +897,7 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
 
 BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
                                                 ControlPart nPart,
-                                                const Region& rControlRegion,
+                                                const Rectangle& rControlRegion,
                                                 ControlState nState,
                                                 const ImplControlValue& aValue,
                                                 const OUString& rCaption )
@@ -908,7 +908,7 @@ BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
     bool bOldNeedPixmapPaint = bNeedPixmapPaint;
     bNeedPixmapPaint = true;
 
-    Rectangle aCtrlRect = rControlRegion.GetBoundRect();
+    Rectangle aCtrlRect = rControlRegion;
     BOOL      returnVal = FALSE;
     SelectFont();
 
@@ -956,7 +956,7 @@ BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
  */
 BOOL GtkSalGraphics::drawNativeControlText( ControlType,
                                 ControlPart,
-                                const Region&,
+                                const Rectangle&,
                                 ControlState,
                                 const ImplControlValue&,
                                 const OUString& )
@@ -980,20 +980,20 @@ BOOL GtkSalGraphics::drawNativeControlText( ControlType,
  */
 BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                                 ControlPart nPart,
-                                const Region& rControlRegion,
+                                const Rectangle& rControlRegion,
                                 ControlState nState,
                                 const ImplControlValue& aValue,
                                 const OUString& rCaption,
-                                Region &rNativeBoundingRegion,
-                                Region &rNativeContentRegion )
+                                Rectangle &rNativeBoundingRegion,
+                                Rectangle &rNativeContentRegion )
 {
     BOOL returnVal = FALSE;
 
     if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL)
-        && (rControlRegion.GetBoundRect().GetWidth() > 16)
-    && (rControlRegion.GetBoundRect().GetHeight() > 16) )
+        && (rControlRegion.GetWidth() > 16)
+    && (rControlRegion.GetHeight() > 16) )
     {
-        rNativeBoundingRegion = NWGetButtonArea( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(),
+        rNativeBoundingRegion = NWGetButtonArea( m_nScreen, nType, nPart, rControlRegion,
         nState, aValue, rCaption );
         rNativeContentRegion = rControlRegion;
 
@@ -1001,7 +1001,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
     }
     if ( (nType==CTRL_COMBOBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
     {
-        rNativeBoundingRegion = NWGetComboBoxButtonRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState,
+        rNativeBoundingRegion = NWGetComboBoxButtonRect( m_nScreen, nType, nPart, rControlRegion, nState,
         aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
 
@@ -1010,7 +1010,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
     if ( (nType==CTRL_SPINBOX) && ((nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
     {
 
-        rNativeBoundingRegion = NWGetSpinButtonRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState,
+        rNativeBoundingRegion = NWGetSpinButtonRect( m_nScreen, nType, nPart, rControlRegion, nState,
         aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
 
@@ -1018,7 +1018,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
     }
     if ( (nType==CTRL_LISTBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
     {
-        rNativeBoundingRegion = NWGetListBoxButtonRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState,
+        rNativeBoundingRegion = NWGetListBoxButtonRect( m_nScreen, nType, nPart, rControlRegion, nState,
         aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
 
@@ -1032,14 +1032,14 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         (nPart==PART_BUTTON)
         ))
     {
-        rNativeBoundingRegion = NWGetToolbarRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState, aValue, rCaption );
+        rNativeBoundingRegion = NWGetToolbarRect( m_nScreen, nType, nPart, rControlRegion, nState, aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
         returnVal = TRUE;
     }
     if ( (nType==CTRL_SCROLLBAR) && ((nPart==PART_BUTTON_LEFT) || (nPart==PART_BUTTON_RIGHT) ||
         (nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN)  ) )
     {
-        rNativeBoundingRegion = NWGetScrollButtonRect( m_nScreen, nPart, rControlRegion.GetBoundRect() );
+        rNativeBoundingRegion = NWGetScrollButtonRect( m_nScreen, nPart, rControlRegion );
         rNativeContentRegion = rNativeBoundingRegion;
 
         returnVal = TRUE;
@@ -1049,10 +1049,10 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         NWEnsureGTKMenubar( m_nScreen );
         GtkRequisition aReq;
         gtk_widget_size_request( gWidgetData[m_nScreen].gMenubarWidget, &aReq );
-        Rectangle aMenuBarRect = rControlRegion.GetBoundRect();
+        Rectangle aMenuBarRect = rControlRegion;
         aMenuBarRect = Rectangle( aMenuBarRect.TopLeft(),
                                   Size( aMenuBarRect.GetWidth(), aReq.height+1 ) );
-        rNativeBoundingRegion = Region( aMenuBarRect );
+        rNativeBoundingRegion = aMenuBarRect;
         rNativeContentRegion = rNativeBoundingRegion;
         returnVal = TRUE;
     }
@@ -1071,9 +1071,9 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                                   (char *)NULL );
             rNativeBoundingRegion = rControlRegion;
             Rectangle aIndicatorRect( Point( 0,
-                                             (rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
+                                             (rControlRegion.GetHeight()-indicator_size)/2),
                                       Size( indicator_size, indicator_size ) );
-            rNativeContentRegion = Region( aIndicatorRect );
+            rNativeContentRegion = aIndicatorRect;
             returnVal = TRUE;
         }
     }
@@ -1090,9 +1090,9 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         indicator_size += 2*indicator_spacing; // guess overpaint of theme
         rNativeBoundingRegion = rControlRegion;
         Rectangle aIndicatorRect( Point( 0,
-                                         (rControlRegion.GetBoundRect().GetHeight()-indicator_size)/2),
+                                         (rControlRegion.GetHeight()-indicator_size)/2),
                                   Size( indicator_size, indicator_size ) );
-        rNativeContentRegion = Region( aIndicatorRect );
+        rNativeContentRegion = aIndicatorRect;
         returnVal = TRUE;
     }
     if( (nType == CTRL_EDITBOX || nType == CTRL_SPINBOX) && nPart == PART_ENTIRE_CONTROL )
@@ -1101,10 +1101,10 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         GtkWidget* widget = gWidgetData[m_nScreen].gEditBoxWidget;
         GtkRequisition aReq;
         gtk_widget_size_request( widget, &aReq );
-        Rectangle aEditRect = rControlRegion.GetBoundRect();
+        Rectangle aEditRect = rControlRegion;
         aEditRect = Rectangle( aEditRect.TopLeft(),
                                Size( aEditRect.GetWidth(), aReq.height+1 ) );
-        rNativeBoundingRegion = Region( aEditRect );
+        rNativeBoundingRegion = aEditRect;
         rNativeContentRegion = rNativeBoundingRegion;
         returnVal = TRUE;
     }
@@ -1118,7 +1118,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                               "slider-width", &slider_width,
                               "slider-length", &slider_length,
                               (char *)NULL);
-        Rectangle aRect( rControlRegion.GetBoundRect() );
+        Rectangle aRect( rControlRegion );
         if( nPart == PART_THUMB_HORZ )
         {
             aRect.Right() = aRect.Left() + slider_length - 1;
@@ -1129,7 +1129,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
             aRect.Bottom() = aRect.Top() + slider_length - 1;
             aRect.Right() = aRect.Left() + slider_width - 1;
         }
-        rNativeBoundingRegion = rNativeContentRegion = Region( aRect );
+        rNativeBoundingRegion = rNativeContentRegion = aRect;
         returnVal = TRUE;
     }
 
@@ -1432,7 +1432,8 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
                                           const ImplControlValue& aValue,
                                           const OUString& )
 {
-    ScrollbarValue* pScrollbarVal = (ScrollbarValue *)(aValue.getOptionalVal());
+    OSL_ASSERT( aValue.getType() == CTRL_SCROLLBAR );
+    const ScrollbarValue* pScrollbarVal = static_cast<const ScrollbarValue *>(&aValue);
     GdkPixmap*      pixmap = NULL;
     Rectangle       pixmapRect, scrollbarRect;
     GtkStateType    stateType;
@@ -1979,7 +1980,7 @@ BOOL GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
     Rectangle           pixmapRect;
     GtkStateType        stateType;
     GtkShadowType       shadowType;
-    SpinbuttonValue *   pSpinVal = (SpinbuttonValue *)(aValue.getOptionalVal());
+    const SpinbuttonValue * pSpinVal = (aValue.getType() == CTRL_SPINBUTTONS) ? static_cast<const SpinbuttonValue *>(&aValue) : NULL;
     Rectangle           upBtnRect;
     ControlPart     upBtnPart = PART_BUTTON_UP;
     ControlState        upBtnState = CTRL_STATE_ENABLED;
@@ -2290,10 +2291,11 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
                                         const ImplControlValue& aValue,
                                         const OUString& )
 {
+    OSL_ASSERT( aValue.getType() == CTRL_TAB_ITEM );
     GdkPixmap * pixmap;
     Rectangle       pixmapRect;
     Rectangle       tabRect;
-    TabitemValue *  pTabitemValue = (TabitemValue *)(aValue.getOptionalVal());
+    const TabitemValue *    pTabitemValue = static_cast<const TabitemValue *>(&aValue);
     GtkStateType    stateType;
     GtkShadowType   shadowType;
     if( ! gWidgetData[ m_nScreen ].gCacheTabItems )
@@ -2571,9 +2573,9 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
         gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(gWidgetData[m_nScreen].gHandleBoxWidget), shadowType );
 
         // evaluate grip rect
-        ToolbarValue* pVal = (ToolbarValue*)aValue.getOptionalVal();
-        if( pVal )
+        if( aValue.getType() == CTRL_TOOLBAR )
         {
+            const ToolbarValue* pVal = static_cast<const ToolbarValue*>(&aValue);
             g_x = pVal->maGripRect.Left();
             g_y = pVal->maGripRect.Top();
             g_w = pVal->maGripRect.GetWidth();
@@ -3044,20 +3046,19 @@ BOOL GtkSalGraphics::NWPaintGTKSlider(
             ControlState nState, const ImplControlValue& rValue,
             const OUString& )
 {
+    OSL_ASSERT( rValue.getType() == CTRL_SLIDER );
     NWEnsureGTKSlider( m_nScreen );
 
     gint            w, h;
     w = rControlRectangle.GetWidth();
     h = rControlRectangle.GetHeight();
 
-    SliderValue* pVal = (SliderValue*)rValue.getOptionalVal();
+    const SliderValue* pVal = static_cast<const SliderValue*>(&rValue);
 
     GdkPixmap* pixmap = NWGetPixmapFromScreen( rControlRectangle );
     if( ! pixmap )
         return FALSE;
 
-    (void)pVal;
-
     GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap );
     GtkWidget* pWidget = (nPart == PART_TRACK_HORZ_AREA)
                          ? GTK_WIDGET(gWidgetData[m_nScreen].gHScale)
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 11d567c85098..c6ff16f8395b 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3757,8 +3757,21 @@ gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint
     if (xText.is())
     {
         sal_uInt32 nPosition = xText->getCaretPosition();
-    xText->deleteText(nPosition + offset, nPosition + offset + nchars);
-    return TRUE;
+        // --> OD 2010-06-04 #i111768# - apply patch from kstribley:
+        // range checking
+//        xText->deleteText(nPosition + offset, nPosition + offset + nchars);
+        sal_Int32 nDeletePos = nPosition + offset;
+        sal_Int32 nDeleteEnd = nDeletePos + nchars;
+        if (nDeletePos < 0)
+            nDeletePos = 0;
+        if (nDeleteEnd < 0)
+            nDeleteEnd = 0;
+        if (nDeleteEnd > xText->getCharacterCount())
+            nDeleteEnd = xText->getCharacterCount();
+
+        xText->deleteText(nDeletePos, nDeleteEnd);
+        // <--
+        return TRUE;
     }
 
     return FALSE;
diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx
index e65c9faf1432..68d8be7cb4eb 100644
--- a/vcl/unx/headless/svpgdi.cxx
+++ b/vcl/unx/headless/svpgdi.cxx
@@ -382,7 +382,7 @@ void SvpSalGraphics::drawPolyPolygon( sal_uInt32        nPoly,
     dbgOut( m_aDevice );
 }
 
-bool SvpSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& /*rLineWidths*/, basegfx::B2DLineJoin /*eJoin*/ )
+bool SvpSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, double /*fTransparency*/, const ::basegfx::B2DVector& /*rLineWidths*/, basegfx::B2DLineJoin /*eJoin*/ )
 {
         // TODO: implement and advertise OutDevSupport_B2DDraw support
         return false;
diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx
index 132dafaa9adf..ca1af87f8862 100644
--- a/vcl/unx/headless/svpgdi.hxx
+++ b/vcl/unx/headless/svpgdi.hxx
@@ -121,7 +121,7 @@ public:
     virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 );
     virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
+    virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
     virtual void            drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
     virtual void            drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index 7f551051c1a7..6da09b38023c 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.cxx
@@ -323,7 +323,7 @@ void PspGraphics::drawPolyPolygon( sal_uInt32           nPoly,
     m_pPrinterGfx->DrawPolyPolygon (nPoly, pPoints, (const Point**)pPtAry);
 }
 
-bool PspGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& /*rLineWidths*/, basegfx::B2DLineJoin /*eJoin*/ )
+bool PspGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, double /*fTransparency*/, const ::basegfx::B2DVector& /*rLineWidths*/, basegfx::B2DLineJoin /*eJoin*/ )
 {
         // TODO: implement and advertise OutDevSupport_B2DDraw support
         return false;
diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx
index 82ba613615cb..063dff34c3c2 100644
--- a/vcl/unx/headless/svppspgraphics.hxx
+++ b/vcl/unx/headless/svppspgraphics.hxx
@@ -142,7 +142,7 @@ public:
     virtual void            drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
     virtual void            drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
+    virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
index 065b5435eeb0..7544a566d8ae 100644
--- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
@@ -63,17 +63,17 @@ public:
 
     // native widget methods
     virtual BOOL        IsNativeControlSupported( ControlType nType, ControlPart nPart );
-    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                               const Point& aPos, BOOL& rIsInside );
-    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& rCaption );
-    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                const rtl::OUString& rCaption );
-    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Region& rControlRegion, ControlState nState,
+    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& rCaption,
-                                                Region &rNativeBoundingRegion, Region &rNativeContentRegion );
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 
     //helper methods for frame's UpdateSettings
     void updateSettings( AllSettings& rSettings );
@@ -179,7 +179,7 @@ protected:
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
 
-    BOOL drawNativeMixedStateCheck( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    BOOL drawNativeMixedStateCheck( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                     ControlState nState, const ImplControlValue& aValue,
                                     const rtl::OUString& rCaption );
 };
diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h
index 2eae73cdaa86..4b1ac12116a3 100644
--- a/vcl/unx/inc/pspgraphics.h
+++ b/vcl/unx/inc/pspgraphics.h
@@ -142,7 +142,7 @@ public:
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual bool            drawPolyLine( const basegfx::B2DPolygon&, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin);
+    virtual bool            drawPolyLine( const basegfx::B2DPolygon&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin);
     virtual sal_Bool        drawPolyLineBezier( ULONG nPoints,
                                                 const SalPoint* pPtAry,
                                                 const BYTE* pFlgAry );
diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h
index 6f962c9a13b3..ed173e61fe61 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/unx/inc/salframe.h
@@ -108,6 +108,8 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame
     bool            m_bXEmbed;
     int             nVisibility_;
     int             m_nWorkArea;
+    bool            m_bSetFocusOnMap;
+
 
     int             nScreenSaversTimeout_;
     Rectangle       maPaintRegion;
diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h
index 6ccea2c4a00c..42d9c5592317 100644
--- a/vcl/unx/inc/salgdi.h
+++ b/vcl/unx/inc/salgdi.h
@@ -294,7 +294,7 @@ public:
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
+    virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
     virtual bool            drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency );
 
 #if 1 // TODO: remove these obselete methods
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 3adc9f5c679a..29d79f88ffb3 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -255,19 +255,19 @@ class WidgetPainter
 
         @return valid push button.
     */
-    QPushButton  *pushButton( const Region& rControlRegion, BOOL bDefault );
+    QPushButton  *pushButton( const Rectangle& rControlRegion, BOOL bDefault );
 
     /** 'Get' method for radio button.
 
         @see pushButton()
     */
-    QRadioButton *radioButton( const Region& rControlRegion );
+    QRadioButton *radioButton( const Rectangle& rControlRegion );
 
     /** 'Get' method for check box.
 
         @see pushButton()
     */
-    QCheckBox    *checkBox( const Region& rControlRegion );
+    QCheckBox    *checkBox( const Rectangle& rControlRegion );
 
     /** 'Get' method for combo box.
 
@@ -276,74 +276,74 @@ class WidgetPainter
 
         @see pushButton(), m_pEditableComboBox
     */
-    QComboBox    *comboBox( const Region& rControlRegion, BOOL bEditable );
+    QComboBox    *comboBox( const Rectangle& rControlRegion, BOOL bEditable );
 
     /** 'Get' method for line edit box.
 
         @see pushButton()
     */
-    QLineEdit    *lineEdit( const Region& rControlRegion );
+    QLineEdit    *lineEdit( const Rectangle& rControlRegion );
 
     /** 'Get' method for spin box.
 
         @see pushButton()
     */
-    QSpinWidget  *spinWidget( const Region& rControlRegion );
+    QSpinWidget  *spinWidget( const Rectangle& rControlRegion );
 
     /** 'Get' method for tab bar.
 
         @see pushButton()
     */
-    QTabBar      *tabBar( const Region& rControlRegion );
+    QTabBar      *tabBar( const Rectangle& rControlRegion );
 
     /** 'Get' method for tab widget.
 
         @see pushButton()
     */
-    QTabWidget   *tabWidget( const Region& rControlRegion );
+    QTabWidget   *tabWidget( const Rectangle& rControlRegion );
 
     /** 'Get' method for list view.
 
         @see pushButton()
     */
-    QListView    *listView( const Region& rControlRegion );
+    QListView    *listView( const Rectangle& rControlRegion );
 
     /** 'Get' method for scroll bar.
 
         @see pushButton()
     */
-    QScrollBar   *scrollBar( const Region& rControlRegion,
+    QScrollBar   *scrollBar( const Rectangle& rControlRegion,
         BOOL bHorizontal, const ImplControlValue& aValue );
 
     /** 'Get' method for tool bar.
 
       @see pushButton()
     */
-    QToolBar     *toolBar( const Region& rControlRegion, BOOL bHorizontal );
+    QToolBar     *toolBar( const Rectangle& rControlRegion, BOOL bHorizontal );
 
     /** 'Get' method for tool button.
 
       @see pushButton()
     */
-    QToolButton  *toolButton( const Region& rControlRegion );
+    QToolButton  *toolButton( const Rectangle& rControlRegion );
 
     /** 'Get' method for menu bar.
 
       @see pushButton()
     */
-    QMenuBar     *menuBar( const Region& rControlRegion );
+    QMenuBar     *menuBar( const Rectangle& rControlRegion );
 
     /** 'Get' method for popup menu.
 
       @see pushButton()
     */
-    QPopupMenu   *popupMenu( const Region& rControlRegion );
+    QPopupMenu   *popupMenu( const Rectangle& rControlRegion );
 
     /** 'Get' method for progress bar
 
       @see pushButton()
     */
-    QProgressBar *progressBar( const Region& rControlRegion );
+    QProgressBar *progressBar( const Rectangle& rControlRegion );
 
     // TODO other widgets
 
@@ -363,7 +363,7 @@ class WidgetPainter
     QStyle::SFlags vclStateValue2SFlags( ControlState nState, const ImplControlValue& aValue );
 
     public:
-    /** Convert VCL Region to QRect.
+    /** Convert VCL Rectangle to QRect.
 
         @param rControlRegion
         The region to convert.
@@ -371,7 +371,7 @@ class WidgetPainter
         @return
         The bounding box of the region.
     */
-    static QRect region2QRect( const Region& rControlRegion );
+    static QRect region2QRect( const Rectangle& rControlRegion );
 };
 
 WidgetPainter::WidgetPainter( void )
@@ -525,7 +525,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     }
     else if ( strcmp( "QSpinWidget", pClassName ) == 0 )
     {
-    SpinbuttonValue *pValue = static_cast<SpinbuttonValue *> ( aValue.getOptionalVal() );
+    const SpinbuttonValue *pValue = static_cast<const SpinbuttonValue *> ( &aValue );
 
     // Is any of the buttons pressed?
     QStyle::SCFlags eActive = QStyle::SC_None;
@@ -576,7 +576,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     }
     else if ( strcmp( "QTabBar", pClassName ) == 0 )
     {
-    TabitemValue *pValue = static_cast<TabitemValue *> ( aValue.getOptionalVal() );
+    const TabitemValue *pValue = static_cast<const TabitemValue *> ( &aValue );
 
     QTab *pTab = NULL;
     if ( pValue )
@@ -614,7 +614,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     }
     else if ( strcmp( "QScrollBar", pClassName ) == 0 )
     {
-    ScrollbarValue *pValue = static_cast<ScrollbarValue *> ( aValue.getOptionalVal() );
+    const ScrollbarValue *pValue = static_cast<const ScrollbarValue *> ( &aValue );
 
     QStyle::SCFlags eActive = QStyle::SC_None;
     if ( pValue )
@@ -695,7 +695,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
 
         if ( nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT )
         {
-            ToolbarValue *pValue = static_cast< ToolbarValue * >( aValue.getOptionalVal() );
+            const ToolbarValue *pValue = static_cast< const ToolbarValue * >( &aValue );
 
             QRect qThumbRect = region2QRect( pValue->maGripRect );
             qThumbRect.moveBy( -qWidgetPos.x(), -qWidgetPos.y() );
@@ -795,7 +795,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     return TRUE;
 }
 
-QPushButton *WidgetPainter::pushButton( const Region& rControlRegion,
+QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion,
     BOOL bDefault )
 {
     if ( !m_pPushButton )
@@ -832,7 +832,7 @@ QPushButton *WidgetPainter::pushButton( const Region& rControlRegion,
     return m_pPushButton;
 }
 
-QRadioButton *WidgetPainter::radioButton( const Region& rControlRegion )
+QRadioButton *WidgetPainter::radioButton( const Rectangle& rControlRegion )
 {
     if ( !m_pRadioButton )
     m_pRadioButton = new QRadioButton( NULL, "radio_button" );
@@ -861,7 +861,7 @@ QRadioButton *WidgetPainter::radioButton( const Region& rControlRegion )
     return m_pRadioButton;
 }
 
-QCheckBox *WidgetPainter::checkBox( const Region& rControlRegion )
+QCheckBox *WidgetPainter::checkBox( const Rectangle& rControlRegion )
 {
     if ( !m_pCheckBox )
     m_pCheckBox = new QCheckBox( NULL, "check_box" );
@@ -890,7 +890,7 @@ QCheckBox *WidgetPainter::checkBox( const Region& rControlRegion )
     return m_pCheckBox;
 }
 
-QComboBox *WidgetPainter::comboBox( const Region& rControlRegion,
+QComboBox *WidgetPainter::comboBox( const Rectangle& rControlRegion,
     BOOL bEditable )
 {
     QComboBox *pComboBox = NULL;
@@ -915,7 +915,7 @@ QComboBox *WidgetPainter::comboBox( const Region& rControlRegion,
     return pComboBox;
 }
 
-QLineEdit *WidgetPainter::lineEdit( const Region& rControlRegion )
+QLineEdit *WidgetPainter::lineEdit( const Rectangle& rControlRegion )
 {
     if ( !m_pLineEdit )
     m_pLineEdit = new QLineEdit( NULL, "line_edit" );
@@ -928,7 +928,7 @@ QLineEdit *WidgetPainter::lineEdit( const Region& rControlRegion )
     return m_pLineEdit;
 }
 
-QSpinWidget *WidgetPainter::spinWidget( const Region& rControlRegion )
+QSpinWidget *WidgetPainter::spinWidget( const Rectangle& rControlRegion )
 {
     if ( !m_pSpinWidget )
     {
@@ -947,7 +947,7 @@ QSpinWidget *WidgetPainter::spinWidget( const Region& rControlRegion )
     return m_pSpinWidget;
 }
 
-QTabBar *WidgetPainter::tabBar( const Region& rControlRegion )
+QTabBar *WidgetPainter::tabBar( const Rectangle& rControlRegion )
 {
     if ( !m_pTabBar )
     {
@@ -976,7 +976,7 @@ QTabBar *WidgetPainter::tabBar( const Region& rControlRegion )
     return m_pTabBar;
 }
 
-QTabWidget *WidgetPainter::tabWidget( const Region& rControlRegion )
+QTabWidget *WidgetPainter::tabWidget( const Rectangle& rControlRegion )
 {
     if ( !m_pTabWidget )
     m_pTabWidget = new QTabWidget( NULL, "tab_widget" );
@@ -990,7 +990,7 @@ QTabWidget *WidgetPainter::tabWidget( const Region& rControlRegion )
     return m_pTabWidget;
 }
 
-QListView *WidgetPainter::listView( const Region& rControlRegion )
+QListView *WidgetPainter::listView( const Rectangle& rControlRegion )
 {
     if ( !m_pListView )
     m_pListView = new QListView( NULL, "list_view" );
@@ -1003,7 +1003,7 @@ QListView *WidgetPainter::listView( const Region& rControlRegion )
     return m_pListView;
 }
 
-QScrollBar *WidgetPainter::scrollBar( const Region& rControlRegion,
+QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion,
     BOOL bHorizontal, const ImplControlValue& aValue )
 {
     if ( !m_pScrollBar )
@@ -1019,7 +1019,7 @@ QScrollBar *WidgetPainter::scrollBar( const Region& rControlRegion,
     m_pScrollBar->resize( qRect.size() );
     m_pScrollBar->setOrientation( bHorizontal? Qt::Horizontal: Qt::Vertical );
 
-    ScrollbarValue *pValue = static_cast<ScrollbarValue *> ( aValue.getOptionalVal() );
+    const ScrollbarValue *pValue = static_cast<const ScrollbarValue *> ( &aValue );
     if ( pValue )
     {
     m_pScrollBar->setMinValue( pValue->mnMin );
@@ -1031,7 +1031,7 @@ QScrollBar *WidgetPainter::scrollBar( const Region& rControlRegion,
     return m_pScrollBar;
 }
 
-QToolBar *WidgetPainter::toolBar( const Region& rControlRegion, BOOL bHorizontal )
+QToolBar *WidgetPainter::toolBar( const Rectangle& rControlRegion, BOOL bHorizontal )
 {
     if ( !m_pMainWindow )
         m_pMainWindow = new QMainWindow( NULL, "main_window" );
@@ -1064,7 +1064,7 @@ QToolBar *WidgetPainter::toolBar( const Region& rControlRegion, BOOL bHorizontal
     return pToolBar;
 }
 
-QToolButton *WidgetPainter::toolButton( const Region& rControlRegion)
+QToolButton *WidgetPainter::toolButton( const Rectangle& rControlRegion)
 {
     if ( !m_pToolButton )
     m_pToolButton = new QToolButton( NULL, "tool_button" );
@@ -1077,7 +1077,7 @@ QToolButton *WidgetPainter::toolButton( const Region& rControlRegion)
     return m_pToolButton;
 }
 
-QMenuBar *WidgetPainter::menuBar( const Region& rControlRegion)
+QMenuBar *WidgetPainter::menuBar( const Rectangle& rControlRegion)
 {
     if ( !m_pMenuBar )
     {
@@ -1098,7 +1098,7 @@ QMenuBar *WidgetPainter::menuBar( const Region& rControlRegion)
     return m_pMenuBar;
 }
 
-QPopupMenu *WidgetPainter::popupMenu( const Region& rControlRegion)
+QPopupMenu *WidgetPainter::popupMenu( const Rectangle& rControlRegion)
 {
     if ( !m_pPopupMenu )
     {
@@ -1119,7 +1119,7 @@ QPopupMenu *WidgetPainter::popupMenu( const Region& rControlRegion)
     return m_pPopupMenu;
 }
 
-QProgressBar *WidgetPainter::progressBar( const Region& rControlRegion )
+QProgressBar *WidgetPainter::progressBar( const Rectangle& rControlRegion )
 {
     if ( !m_pProgressBar )
     m_pProgressBar = new QProgressBar( NULL, "progress_bar" );
@@ -1155,12 +1155,10 @@ QStyle::SFlags WidgetPainter::vclStateValue2SFlags( ControlState nState,
     return nStyle;
 }
 
-QRect WidgetPainter::region2QRect( const Region& rControlRegion )
+QRect WidgetPainter::region2QRect( const Rectangle& rControlRegion )
 {
-    Rectangle aRect = rControlRegion.GetBoundRect();
-
-    return QRect( QPoint( aRect.Left(), aRect.Top() ),
-          QPoint( aRect.Right(), aRect.Bottom() ) );
+    return QRect( QPoint( rControlRegion.Left(), rControlRegion.Top() ),
+                  QPoint( rControlRegion.Right(), rControlRegion.Bottom() ) );
 }
 
 /** Instance of WidgetPainter.
@@ -1176,21 +1174,21 @@ class KDESalGraphics : public X11SalGraphics
     virtual ~KDESalGraphics() {}
     virtual BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart );
     virtual BOOL hitTestNativeControl( ControlType nType, ControlPart nPart,
-                                       const Region& rControlRegion, const Point& aPos,
+                                       const Rectangle& rControlRegion, const Point& aPos,
                                        BOOL& rIsInside );
     virtual BOOL drawNativeControl( ControlType nType, ControlPart nPart,
-                                    const Region& rControlRegion, ControlState nState,
+                                    const Rectangle& rControlRegion, ControlState nState,
                                     const ImplControlValue& aValue,
                                     const OUString& aCaption );
     virtual BOOL drawNativeControlText( ControlType nType, ControlPart nPart,
-                                        const Region& rControlRegion, ControlState nState,
+                                        const Rectangle& rControlRegion, ControlState nState,
                                         const ImplControlValue& aValue,
                                         const OUString& aCaption );
     virtual BOOL getNativeControlRegion( ControlType nType, ControlPart nPart,
-                                         const Region& rControlRegion, ControlState nState,
+                                         const Rectangle& rControlRegion, ControlState nState,
                                          const ImplControlValue& aValue,
                                          const OUString& aCaption,
-                                         Region &rNativeBoundingRegion, Region &rNativeContentRegion );
+                                         Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 };
 
 /** What widgets can be drawn the native way.
@@ -1241,13 +1239,13 @@ BOOL KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
     nType/nPart combination.
 */
 BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
-                                           const Region& rControlRegion, const Point& rPos,
+                                           const Rectangle& rControlRegion, const Point& rPos,
                                            BOOL& rIsInside )
 {
     if ( nType == CTRL_SCROLLBAR )
     {
     // make position relative to rControlRegion
-    Point aPos = rPos - rControlRegion.GetBoundRect().TopLeft();
+    Point aPos = rPos - rControlRegion.TopLeft();
     rIsInside = FALSE;
 
     BOOL bHorizontal = ( nPart == PART_BUTTON_LEFT || nPart == PART_BUTTON_RIGHT );
@@ -1348,7 +1346,7 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
     A caption or title string (like button text etc.)
 */
 BOOL KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
-                                        const Region& rControlRegion, ControlState nState,
+                                        const Rectangle& rControlRegion, ControlState nState,
                                         const ImplControlValue& aValue,
                                         const OUString& )
 {
@@ -1490,7 +1488,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
     A caption or title string (like button text etc.)
 */
 BOOL KDESalGraphics::drawNativeControlText( ControlType, ControlPart,
-                                            const Region&, ControlState,
+                                            const Rectangle&, ControlState,
                                             const ImplControlValue&,
                                             const OUString& )
 {
@@ -1515,10 +1513,10 @@ BOOL KDESalGraphics::drawNativeControlText( ControlType, ControlPart,
     A caption or title string (like button text etc.)
 */
 BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart,
-                                             const Region& rControlRegion, ControlState nState,
+                                             const Rectangle& rControlRegion, ControlState nState,
                                              const ImplControlValue&,
                                              const OUString&,
-                                             Region &rNativeBoundingRegion, Region &rNativeContentRegion )
+                                             Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
 {
     BOOL bReturn = FALSE;
     QRect qBoundingRect = WidgetPainter::region2QRect( rControlRegion );
@@ -1697,12 +1695,12 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
     // Bounding region
     Point aBPoint( qBoundingRect.x(), qBoundingRect.y() );
     Size aBSize( qBoundingRect.width(), qBoundingRect.height() );
-    rNativeBoundingRegion = Region( Rectangle( aBPoint, aBSize ) );
+    rNativeBoundingRegion = Rectangle( aBPoint, aBSize );
 
     // Region of the content
     Point aPoint( qRect.x(), qRect.y() );
     Size  aSize( qRect.width(), qRect.height() );
-    rNativeContentRegion = Region( Rectangle( aPoint, aSize ) );
+    rNativeContentRegion = Rectangle( aPoint, aSize );
     }
 
     return bReturn;
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 5f8b5d2ae59e..2c04af384c51 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -80,15 +80,13 @@ QStyle::State vclStateValue2StateFlag( ControlState nControlState,
 }
 
 /**
- Convert VCL Region to QRect.
- @param rControlRegion The region to convert.
- @return The bounding box of the region.
+ Convert VCL Rectangle to QRect.
+ @param rControlRegion The Rectangle to convert.
+ @return The matching QRect
 */
-QRect region2QRect( const Region& rControlRegion )
+QRect region2QRect( const Rectangle& rControlRegion )
 {
-    Rectangle aRect = rControlRegion.GetBoundRect();
-
-    return QRect(aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight());
+    return QRect(rControlRegion.Left(), rControlRegion.Top(), rControlRegion.GetWidth(), rControlRegion.GetHeight());
 }
 
 KDESalGraphics::KDESalGraphics() :
@@ -157,7 +155,7 @@ BOOL KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par
 }
 
 BOOL KDESalGraphics::hitTestNativeControl( ControlType, ControlPart,
-                                           const Region&, const Point&,
+                                           const Rectangle&, const Point&,
                                            BOOL& )
 {
     return FALSE;
@@ -195,6 +193,22 @@ namespace
         kapp->style()->drawComplexControl(element, option, &painter);
     }
 
+    int getFrameWidth()
+    {
+        static int s_nFrameWidth = -1;
+        if( s_nFrameWidth < 0 )
+        {
+            // fill in a default
+            s_nFrameWidth = 2;
+            QFrame aFrame( NULL );
+            aFrame.setFrameRect( QRect(0, 0, 100, 30) );
+            aFrame.setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
+            aFrame.ensurePolished();
+            s_nFrameWidth = aFrame.frameWidth();
+        }
+        return s_nFrameWidth;
+    }
+
     void lcl_drawFrame(QStyle::PrimitiveElement element, QImage* image, QStyle::State state)
     {
     #if ( QT_VERSION >= QT_VERSION_CHECK( 4, 5, 0 ) )
@@ -219,7 +233,7 @@ namespace
 }
 
 BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
-                                        const Region& rControlRegion, ControlState nControlState,
+                                        const Rectangle& rControlRegion, ControlState nControlState,
                                         const ImplControlValue& value,
                                         const OUString& )
 {
@@ -236,7 +250,8 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         type = CTRL_SPINBUTTONS;
     if( type == CTRL_SPINBUTTONS )
     {
-        SpinbuttonValue* pSpinVal = (SpinbuttonValue *)(value.getOptionalVal());
+        OSL_ASSERT( value.getType() != CTRL_SPINBUTTONS );
+        const SpinbuttonValue* pSpinVal = static_cast<const SpinbuttonValue *>(&value);
         Rectangle aButtonRect( pSpinVal->maUpperRect);
         aButtonRect.Union( pSpinVal->maLowerRect );;
         widgetRect = QRect( aButtonRect.Left(), aButtonRect.Top(),
@@ -409,7 +424,8 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         if ((part == PART_DRAW_BACKGROUND_VERT) || (part == PART_DRAW_BACKGROUND_HORZ))
         {
             QStyleOptionSlider option;
-            ScrollbarValue* sbVal = static_cast<ScrollbarValue *> ( value.getOptionalVal() );
+            OSL_ASSERT( value.getType() == CTRL_SCROLLBAR );
+            const ScrollbarValue* sbVal = static_cast<const ScrollbarValue *>(&value);
 
             //if the scroll bar is active (aka not degenrate...allow for hover events
             if (sbVal->mnVisibleSize < sbVal->mnMax)
@@ -445,9 +461,9 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         QStyleOptionSpinBox option;
 
         // determine active control
-        SpinbuttonValue* pSpinVal = (SpinbuttonValue *)(value.getOptionalVal());
-        if( pSpinVal )
+        if( value.getType() == CTRL_SPINBUTTONS )
         {
+            const SpinbuttonValue* pSpinVal = static_cast<const SpinbuttonValue *>(&value);
             if( (pSpinVal->mnUpperState & CTRL_STATE_PRESSED) )
                 option.activeSubControls |= QStyle::SC_SpinBoxUp;
             if( (pSpinVal->mnLowerState & CTRL_STATE_PRESSED) )
@@ -480,18 +496,25 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         lcl_drawFrame( QStyle::PE_Frame, m_image,
                        vclStateValue2StateFlag(nControlState, value) );
 
-        int size = kapp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
+        // draw just the border, see http://qa.openoffice.org/issues/show_bug.cgi?id=107945
+        int nFrameWidth = getFrameWidth();
         pTempClipRegion = XCreateRegion();
         XRectangle xRect = { widgetRect.left(), widgetRect.top(), widgetRect.width(), widgetRect.height() };
         XUnionRectWithRegion( &xRect, pTempClipRegion, pTempClipRegion );
-        XLIB_Region pSubtract = XCreateRegion();
-        xRect.x += size;
-        xRect.y += size;
-        xRect.width -= 2* size;
-        xRect.height -= 2*size;
-        XUnionRectWithRegion( &xRect, pSubtract, pSubtract );
-        XSubtractRegion( pTempClipRegion, pSubtract, pTempClipRegion );
-        XDestroyRegion( pSubtract );
+        xRect.x += nFrameWidth;
+        xRect.y += nFrameWidth;
+
+        // do not crash for too small widgets, see http://qa.openoffice.org/issues/show_bug.cgi?id=112102
+        if( xRect.width > 2*nFrameWidth && xRect.height > 2*nFrameWidth )
+        {
+            xRect.width -= 2*nFrameWidth;
+            xRect.height -= 2*nFrameWidth;
+
+            XLIB_Region pSubtract = XCreateRegion();
+            XUnionRectWithRegion( &xRect, pSubtract, pSubtract );
+            XSubtractRegion( pTempClipRegion, pSubtract, pTempClipRegion );
+            XDestroyRegion( pSubtract );
+        }
     }
     else if (type == CTRL_FIXEDBORDER)
     {
@@ -513,7 +536,8 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
     }
     else if (type == CTRL_SLIDER && (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA))
     {
-        SliderValue* slVal = static_cast<SliderValue *> ( value.getOptionalVal() );
+        OSL_ASSERT( value.getType() == CTRL_SLIDER );
+        const SliderValue* slVal = static_cast<const SliderValue *>(&value);
         QStyleOptionSlider option;
 
         option.rect = QRect(0, 0, widgetRect.width(), widgetRect.height());
@@ -566,10 +590,10 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
 }
 
 BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
-                                             const Region& controlRegion, ControlState controlState,
+                                             const Rectangle& controlRegion, ControlState controlState,
                                              const ImplControlValue& val,
                                              const OUString&,
-                                             Region &nativeBoundingRegion, Region &nativeContentRegion )
+                                             Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )
 {
     bool retVal = false;
 
@@ -744,14 +768,14 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
         {
             if( part == PART_BORDER )
             {
-                int size = kapp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+                int nFrameWidth = getFrameWidth();
                 USHORT nStyle = val.getNumericVal();
                 if( nStyle & FRAME_DRAW_NODRAW )
                 {
                     // in this case the question is: how thick would a frame be
                     // see brdwin.cxx, decoview.cxx
                     // most probably the behavior in decoview.cxx is wrong.
-                    contentRect.adjust(size, size, -size, -size);
+                    contentRect.adjust(nFrameWidth, nFrameWidth, -nFrameWidth, -nFrameWidth);
                 }
                 retVal = true;
             }
@@ -869,12 +893,12 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
         // Bounding region
         Point aBPoint( boundingRect.x(), boundingRect.y() );
         Size aBSize( boundingRect.width(), boundingRect.height() );
-        nativeBoundingRegion = Region( Rectangle( aBPoint, aBSize ) );
+        nativeBoundingRegion = Rectangle( aBPoint, aBSize );
 
         // Region of the content
         Point aPoint( contentRect.x(), contentRect.y() );
         Size  aSize( contentRect.width(), contentRect.height() );
-        nativeContentRegion = Region( Rectangle( aPoint, aSize ) );
+        nativeContentRegion = Rectangle( aPoint, aSize );
     }
 
     return retVal;
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 5661d743e0cd..0bce1700f1fc 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -58,12 +58,12 @@ class KDESalGraphics : public X11SalGraphics
             type/part combination.
         */
         virtual BOOL hitTestNativeControl( ControlType type, ControlPart part,
-                                        const Region& rControlRegion, const Point& aPos,
+                                        const Rectangle& rControlRegion, const Point& aPos,
                                         BOOL& rIsInside );
         /** Draw the requested control described by part/nControlState.
 
             @param rControlRegion
-            The bounding region of the complete control in VCL frame coordinates.
+            The bounding Rectangle of the complete control in VCL frame coordinates.
 
             @param aValue
             An optional value (tristate/numerical/string).
@@ -72,7 +72,7 @@ class KDESalGraphics : public X11SalGraphics
             A caption or title string (like button text etc.)
         */
         virtual BOOL drawNativeControl( ControlType type, ControlPart part,
-                                        const Region& rControlRegion, ControlState nControlState,
+                                        const Rectangle& rControlRegion, ControlState nControlState,
                                         const ImplControlValue& aValue,
                                         const rtl::OUString& aCaption );
 
@@ -85,7 +85,7 @@ class KDESalGraphics : public X11SalGraphics
             @param aCaption A caption or title string (like button text etc.)
         */
         virtual BOOL drawNativeControlText( ControlType, ControlPart,
-                                            const Region&, ControlState,
+                                            const Rectangle&, ControlState,
                                             const ImplControlValue&,
                                             const rtl::OUString& ) { return false; }
         /** Check if the bounding regions match.
@@ -106,8 +106,8 @@ class KDESalGraphics : public X11SalGraphics
             A caption or title string (like button text etc.)
         */
         virtual BOOL getNativeControlRegion( ControlType type, ControlPart part,
-                                            const Region& rControlRegion, ControlState nControlState,
+                                            const Rectangle& rControlRegion, ControlState nControlState,
                                             const ImplControlValue& aValue,
                                             const rtl::OUString& aCaption,
-                                            Region &rNativeBoundingRegion, Region &rNativeContentRegion );
+                                            Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 };
\ No newline at end of file
diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx
index cf7f7e082e69..c9515f016433 100644
--- a/vcl/unx/source/app/keysymnames.cxx
+++ b/vcl/unx/source/app/keysymnames.cxx
@@ -637,6 +637,7 @@ const char* SalDisplay::GetKeyboardName( BOOL bRefresh )
                         }
                     }
                 }
+                close(kbd);
             }
         }
 #else
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index aa2afab93657..13a0d1093c8e 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -59,9 +59,7 @@
 
 #ifdef USE_XINERAMA
 #ifdef USE_XINERAMA_XORG
-#if defined(X86) || defined(X86_64)
 #include <X11/extensions/Xinerama.h>
-#endif
 #elif defined USE_XINERAMA_XSUN
 #if defined(SOLARIS) && defined(INTEL) // missing extension header in standard installation
 #define MAXFRAMEBUFFERS       16
@@ -2638,7 +2636,7 @@ void SalDisplay::InitXinerama()
         if( result > 0 && nFramebuffers > 1 )
         {
             m_bXinerama = true;
-            m_aXineramaScreens = std::vector<Rectangle>( nFramebuffers );
+            m_aXineramaScreens = std::vector<Rectangle>();
             for( int i = 0; i < nFramebuffers; i++ )
                 addXineramaScreenUnique( pFramebuffers[i].x,
                                          pFramebuffers[i].y,
@@ -2647,7 +2645,6 @@ void SalDisplay::InitXinerama()
         }
     }
 #elif defined(USE_XINERAMA_XORG)
-#if defined( X86 ) || defined( X86_64 )
 if( XineramaIsActive( pDisp_ ) )
 {
     int nFramebuffers = 1;
@@ -2670,7 +2667,6 @@ if( XineramaIsActive( pDisp_ ) )
     }
 }
 #endif
-#endif
 #if OSL_DEBUG_LEVEL > 1
     if( m_bXinerama )
     {
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index dbaa278a780b..959d6af5912d 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.cxx
@@ -159,6 +159,10 @@ class ICEConnectionObserver
     static int nWakeupFiles[2];
     static oslMutex ICEMutex;
     static oslThread ICEThread;
+#ifdef USE_SM_EXTENSION
+    static IceIOErrorHandler origIOErrorHandler;
+    static IceErrorHandler origErrorHandler;
+#endif
 public:
 
     static void activate();
@@ -179,6 +183,19 @@ oslMutex            ICEConnectionObserver::ICEMutex                 = NULL;
 oslThread           ICEConnectionObserver::ICEThread                = NULL;
 int                 ICEConnectionObserver::nWakeupFiles[2]          = { 0, 0 };
 
+#ifdef USE_SM_EXTENSION
+IceIOErrorHandler ICEConnectionObserver::origIOErrorHandler = NULL;
+IceErrorHandler ICEConnectionObserver::origErrorHandler = NULL;
+
+static void IgnoreIceErrors(IceConn, Bool, int, unsigned long, int, int, IcePointer)
+{
+}
+
+static void IgnoreIceIOErrors(IceConn)
+{
+}
+#endif
+
 // HACK
 bool SessionManagerClient::bDocSaveDone = false;
 
@@ -591,6 +608,12 @@ void ICEConnectionObserver::activate()
         ICEMutex = osl_createMutex();
         bIsWatching = TRUE;
 #ifdef USE_SM_EXTENSION
+        /*
+         * Default handlers call exit, we don't care that strongly if something
+         * happens to fail
+         */
+        origIOErrorHandler = IceSetIOErrorHandler( IgnoreIceIOErrors );
+        origErrorHandler = IceSetErrorHandler( IgnoreIceErrors );
         IceAddConnectionWatch( ICEWatchProc, NULL );
 #endif
     }
@@ -604,6 +627,8 @@ void ICEConnectionObserver::deactivate()
         bIsWatching = FALSE;
 #ifdef USE_SM_EXTENSION
         IceRemoveConnectionWatch( ICEWatchProc, NULL );
+        IceSetErrorHandler( origErrorHandler );
+        IceSetIOErrorHandler( origIOErrorHandler );
 #endif
         nConnections = 0;
         if( ICEThread )
diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx
index fb2317e19573..1a116fcbe8d6 100644
--- a/vcl/unx/source/app/wmadaptor.cxx
+++ b/vcl/unx/source/app/wmadaptor.cxx
@@ -1407,56 +1407,59 @@ void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eTy
     pFrame->meWindowType        = eType;
     pFrame->mnDecorationFlags   = nDecorationFlags;
 
-    // set mwm hints
-    struct _mwmhints {
-        unsigned long flags, func, deco;
-        long input_mode;
-        unsigned long status;
-    } aHint;
-
-    aHint.flags = 15; /* flags for functions, decoration, input mode and status */
-    aHint.deco = 0;
-    aHint.func = 1L << 2;
-    aHint.status = 0;
-    aHint.input_mode = 0;
-
-    // evaluate decoration flags
-    if( nDecorationFlags & decoration_All )
-        aHint.deco = 1, aHint.func = 1;
-    else
-    {
-        if( nDecorationFlags & decoration_Title )
-            aHint.deco |= 1L << 3;
-        if( nDecorationFlags & decoration_Border )
-            aHint.deco |= 1L << 1;
-        if( nDecorationFlags & decoration_Resize )
-            aHint.deco |= 1L << 2, aHint.func |= 1L << 1;
-        if( nDecorationFlags & decoration_MinimizeBtn )
-            aHint.deco |= 1L << 5, aHint.func |= 1L << 3;
-        if( nDecorationFlags & decoration_MaximizeBtn )
-            aHint.deco |= 1L << 6, aHint.func |= 1L << 4;
-        if( nDecorationFlags & decoration_CloseBtn )
-            aHint.deco |= 1L << 4, aHint.func |= 1L << 5;
-    }
-    // evaluate window type
-    switch( eType )
+    if( ! pFrame->mbFullScreen )
     {
-        case windowType_ModalDialogue:
-            aHint.input_mode = 1;
-            break;
-        default:
-            break;
-    }
+        // set mwm hints
+        struct _mwmhints {
+            unsigned long flags, func, deco;
+            long input_mode;
+            unsigned long status;
+        } aHint;
+
+        aHint.flags = 15; /* flags for functions, decoration, input mode and status */
+        aHint.deco = 0;
+        aHint.func = 1L << 2;
+        aHint.status = 0;
+        aHint.input_mode = 0;
+
+        // evaluate decoration flags
+        if( nDecorationFlags & decoration_All )
+            aHint.deco = 1, aHint.func = 1;
+        else
+        {
+            if( nDecorationFlags & decoration_Title )
+                aHint.deco |= 1L << 3;
+            if( nDecorationFlags & decoration_Border )
+                aHint.deco |= 1L << 1;
+            if( nDecorationFlags & decoration_Resize )
+                aHint.deco |= 1L << 2, aHint.func |= 1L << 1;
+            if( nDecorationFlags & decoration_MinimizeBtn )
+                aHint.deco |= 1L << 5, aHint.func |= 1L << 3;
+            if( nDecorationFlags & decoration_MaximizeBtn )
+                aHint.deco |= 1L << 6, aHint.func |= 1L << 4;
+            if( nDecorationFlags & decoration_CloseBtn )
+                aHint.deco |= 1L << 4, aHint.func |= 1L << 5;
+        }
+        // evaluate window type
+        switch( eType )
+        {
+            case windowType_ModalDialogue:
+                aHint.input_mode = 1;
+                break;
+            default:
+                break;
+        }
 
-    // set the hint
-     XChangeProperty( m_pDisplay,
-                      pFrame->GetShellWindow(),
-                      m_aWMAtoms[ MOTIF_WM_HINTS ],
-                      m_aWMAtoms[ MOTIF_WM_HINTS ],
-                      32,
-                      PropModeReplace,
-                      (unsigned char*)&aHint,
-                      5 );
+        // set the hint
+        XChangeProperty( m_pDisplay,
+                         pFrame->GetShellWindow(),
+                         m_aWMAtoms[ MOTIF_WM_HINTS ],
+                         m_aWMAtoms[ MOTIF_WM_HINTS ],
+                         32,
+                         PropModeReplace,
+                         (unsigned char*)&aHint,
+                         5 );
+    }
 
     // set transientFor hint
     /*  #91030# dtwm will not map a dialogue if the transient
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index 7f205407b21b..403ee9707a94 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -28,15 +28,17 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "saldisp.hxx"
+#include "saldata.hxx"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+
 #include "tools/prex.h"
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
-#include <X11/Xlib.h>
-#include <X11/X.h>
 #include <X11/Xutil.h>
 #include "tools/postx.h"
 #if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
@@ -3259,6 +3261,8 @@ void SelectionManager::startDrag(
         return;
     }
 
+    SalFrame* pCaptureFrame = NULL;
+
     {
         ClearableMutexGuard aGuard(m_aMutex);
 
@@ -3327,6 +3331,32 @@ void SelectionManager::startDrag(
                           None,
                           None,
                           CurrentTime );
+        /* if we could not grab the pointer here, there is a chance
+           that the pointer is grabbed by the other vcl display (the main loop)
+           so let's break that grab an reset it later
+
+           remark: this whole code should really be molten into normal vcl so only
+           one display is used ....
+        */
+        if( nPointerGrabSuccess != GrabSuccess )
+        {
+            vos::IMutex& rSolarMutex( Application::GetSolarMutex() );
+            if( rSolarMutex.tryToAcquire() )
+            {
+                pCaptureFrame = GetX11SalData()->GetDisplay()->GetCaptureFrame();
+                if( pCaptureFrame )
+                {
+                    GetX11SalData()->GetDisplay()->CaptureMouse( NULL );
+                    nPointerGrabSuccess =
+                                XGrabPointer( m_pDisplay, it->second.m_aRootWindow, True,
+                                              DRAG_EVENT_MASK,
+                                              GrabModeAsync, GrabModeAsync,
+                                              None,
+                                              None,
+                                              CurrentTime );
+                }
+            }
+        }
 #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "%d\n", nPointerGrabSuccess );
 #endif
@@ -3349,6 +3379,16 @@ void SelectionManager::startDrag(
             aGuard.clear();
             if( listener.is() )
                 listener->dragDropEnd( aDragFailedEvent );
+            if( pCaptureFrame )
+            {
+                vos::IMutex& rSolarMutex( Application::GetSolarMutex() );
+                if( rSolarMutex.tryToAcquire() )
+                    GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame );
+#if OSL_DEBUG_LEVEL > 0
+                else
+                    OSL_ENSURE( 0, "failed to acquire SolarMutex to reset capture frame" );
+#endif
+            }
             return;
         }
 
@@ -3428,6 +3468,17 @@ void SelectionManager::startDrag(
         XUngrabKeyboard( m_pDisplay, CurrentTime );
         XFlush( m_pDisplay );
 
+        if( pCaptureFrame )
+        {
+            vos::IMutex& rSolarMutex( Application::GetSolarMutex() );
+            if( rSolarMutex.tryToAcquire() )
+                GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame );
+#if OSL_DEBUG_LEVEL > 0
+            else
+                OSL_ENSURE( 0, "failed to acquire SolarMutex to reset capture frame" );
+#endif
+        }
+
         m_aDragRunning.reset();
 
         if( listener.is() )
@@ -3915,6 +3966,18 @@ void SelectionManager::deregisterHandler( Atom selection )
 
 // ------------------------------------------------------------------------
 
+static bool bWasError = false;
+
+extern "C"
+{
+    int local_xerror_handler(Display* , XErrorEvent*)
+    {
+        bWasError = true;
+        return 0;
+    }
+    typedef int(*xerror_hdl_t)(Display*,XErrorEvent*);
+}
+
 void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTarget )
 {
     MutexGuard aGuard(m_aMutex);
@@ -3926,18 +3989,31 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar
         OSL_ASSERT( "attempt to register window as drop target twice" );
     else if( aWindow && m_pDisplay )
     {
-        XSelectInput( m_pDisplay, aWindow, PropertyChangeMask );
-
-        // set XdndAware
-        XChangeProperty( m_pDisplay, aWindow, m_nXdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&nXdndProtocolRevision, 1 );
-
         DropTargetEntry aEntry( pTarget );
-        // get root window of window (in 99.999% of all cases this will be
-        // DefaultRootWindow( m_pDisplay )
-        int x, y;
-        unsigned int w, h, bw, d;
-        XGetGeometry( m_pDisplay, aWindow, &aEntry.m_aRootWindow,
-                      &x, &y, &w, &h, &bw, &d );
+        bWasError=false;
+        /* #i100000# ugly workaround: gtk sets its own XErrorHandler which is not suitable for us
+           unfortunately XErrorHandler is not per display, so this is just and ugly hack
+           Need to remove separate display and integrate clipboard/dnd into vcl's unx code ASAP
+        */
+        xerror_hdl_t pOldHandler = XSetErrorHandler( local_xerror_handler );
+        XSelectInput( m_pDisplay, aWindow, PropertyChangeMask );
+        if( ! bWasError )
+        {
+            // set XdndAware
+            XChangeProperty( m_pDisplay, aWindow, m_nXdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&nXdndProtocolRevision, 1 );
+            if( ! bWasError )
+            {
+                // get root window of window (in 99.999% of all cases this will be
+                // DefaultRootWindow( m_pDisplay )
+                int x, y;
+                unsigned int w, h, bw, d;
+                XGetGeometry( m_pDisplay, aWindow, &aEntry.m_aRootWindow,
+                              &x, &y, &w, &h, &bw, &d );
+            }
+        }
+        XSetErrorHandler( pOldHandler );
+        if(bWasError)
+            return;
         m_aDropTargets[ aWindow ] = aEntry;
     }
     else
diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmanager/fontconfig.cxx
index 816c8fb0b4c4..03816857f27c 100644
--- a/vcl/unx/source/fontmanager/fontconfig.cxx
+++ b/vcl/unx/source/fontmanager/fontconfig.cxx
@@ -851,22 +851,25 @@ bool PrintFontManager::addFontconfigDir( const rtl::OString& rDirName )
     bool bDirOk = (rWrapper.FcConfigAppFontAddDir( rWrapper.FcConfigGetCurrent(), (FcChar8*)pDirName ) == FcTrue);
 
 #if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "FcConfigAppFontAddDir( \"%s\") => %d\n", pDirName, bRet );
+    fprintf( stderr, "FcConfigAppFontAddDir( \"%s\") => %d\n", pDirName, bDirOk );
 #endif
 
-    if( bDirOk )
+    if( !bDirOk )
+        return false;
+
+    // load dir-specific fc-config file too if available
+    const rtl::OString aConfFileName = rDirName + "/fc_local.conf";
+    FILE* pCfgFile = fopen( aConfFileName.getStr(), "rb" );
+    if( pCfgFile )
     {
-        const rtl::OString aConfFileName = rDirName + "/fc_local.conf";
+        fclose( pCfgFile);
         bool bCfgOk = rWrapper.FcConfigParseAndLoad( rWrapper.FcConfigGetCurrent(),
-                            (FcChar8*)aConfFileName.getStr(), FcTrue );
-        (void)bCfgOk; // silence compiler warning
-
-#if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk );
-#endif
+                        (FcChar8*)aConfFileName.getStr(), FcTrue );
+        if( !bCfgOk )
+            fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk );
     }
 
-    return bDirOk;
+    return true;
 }
 
 static void addtopattern(FontCfgWrapper& rWrapper, FcPattern *pPattern,
diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx
index d599e09e71f2..d3eb103b9dd6 100644
--- a/vcl/unx/source/gdi/pspgraphics.cxx
+++ b/vcl/unx/source/gdi/pspgraphics.cxx
@@ -403,7 +403,7 @@ bool PspGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double /*fT
         return false;
 }
 
-bool PspGraphics::drawPolyLine( const basegfx::B2DPolygon&, const basegfx::B2DVector& /*rLineWidths*/, basegfx::B2DLineJoin /*eJoin*/)
+bool PspGraphics::drawPolyLine( const basegfx::B2DPolygon&, double /*fTranspareny*/, const basegfx::B2DVector& /*rLineWidths*/, basegfx::B2DLineJoin /*eJoin*/)
 {
     // TODO: a PS printer can draw B2DPolyLines almost directly
     return false;
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index 15e391256344..c0658c162489 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.cxx
@@ -1089,7 +1089,7 @@ SystemGraphicsData X11SalGraphics::GetGraphicsData() const
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 // draw a poly-polygon
-bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPolyPoly, double fTransparency)
+bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPolyPoly, double fTransparency )
 {
     // nothing to do for empty polypolygons
     const int nOrigPolyCount = rOrigPolyPoly.count();
@@ -1127,6 +1127,8 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
     basegfx::B2DTrapezoidVector aB2DTrapVector;
     basegfx::tools::trapezoidSubdivide( aB2DTrapVector, aPolyPoly );
     const int nTrapCount = aB2DTrapVector.size();
+    if( !nTrapCount )
+        return true;
     const bool bDrawn = drawFilledTrapezoids( &aB2DTrapVector[0], nTrapCount, fTransparency );
     return bDrawn;
 }
@@ -1203,7 +1205,7 @@ bool X11SalGraphics::drawFilledTrapezoids( const ::basegfx::B2DTrapezoid* pB2DTr
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-bool X11SalGraphics::drawPolyLine(const ::basegfx::B2DPolygon& rPolygon, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin eLineJoin)
+bool X11SalGraphics::drawPolyLine(const ::basegfx::B2DPolygon& rPolygon, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin eLineJoin)
 {
     const bool bIsHairline = (rLineWidth.getX() == rLineWidth.getY()) && (rLineWidth.getX() <= 1.2);
 
@@ -1239,7 +1241,9 @@ bool X11SalGraphics::drawPolyLine(const ::basegfx::B2DPolygon& rPolygon, const :
 
         // draw tesselation result
         const int nTrapCount = aB2DTrapVector.size();
-        const bool bDrawOk = drawFilledTrapezoids( &aB2DTrapVector[0], nTrapCount, 0.0 );
+        if( !nTrapCount )
+            return true;
+        const bool bDrawOk = drawFilledTrapezoids( &aB2DTrapVector[0], nTrapCount, fTransparency );
 
         // restore the original brush GC
         nBrushColor_ = aKeepBrushColor;
@@ -1271,7 +1275,7 @@ bool X11SalGraphics::drawPolyLine(const ::basegfx::B2DPolygon& rPolygon, const :
     for( int nPolyIdx = 0; nPolyIdx < nPolyCount; ++nPolyIdx )
     {
         const ::basegfx::B2DPolyPolygon aOnePoly( aAreaPolyPoly.getB2DPolygon( nPolyIdx ) );
-        bDrawOk = drawPolyPolygon( aOnePoly, 0.0 );
+        bDrawOk = drawPolyPolygon( aOnePoly, fTransparency );
         if( !bDrawOk )
             break;
     }
diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx
index 3491622f783c..8617bc4e5bfa 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/source/gdi/salprnpsp.cxx
@@ -617,6 +617,7 @@ BOOL PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
 
         // copy everything to job setup
         copyJobDataToJobSetup( pJobSetup, aInfo );
+        JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, m_aJobData );
         return TRUE;
     }
     return FALSE;
@@ -694,6 +695,18 @@ BOOL PspSalInfoPrinter::SetData(
 
             pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
             pValue = pKey ? pKey->getValueCaseInsensitive( aPaper ) : NULL;
+
+            // some PPD files do not specify the standard paper names (e.g. C5 instead of EnvC5)
+            // try to find the correct paper anyway using the size
+            if( pKey && ! pValue && pJobSetup->mePaperFormat != PAPER_USER )
+            {
+                PaperInfo aInfo( pJobSetup->mePaperFormat );
+                aPaper = aData.m_pParser->matchPaper(
+                    TenMuToPt( aInfo.getWidth() ),
+                    TenMuToPt( aInfo.getHeight() ) );
+                pValue = pKey->getValueCaseInsensitive( aPaper );
+            }
+
             if( ! ( pKey && pValue && aData.m_aContext.setValue( pKey, pValue, false ) == pValue ) )
                 return FALSE;
         }
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx
index 3e885d8af5b4..5e18849b8dfe 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/source/printergfx/printerjob.cxx
@@ -284,7 +284,8 @@ removeSpoolDir (const rtl::OUString& rSpoolDir)
     nChar  = psp::appendStr ("rm -rf ",     pSystem);
     nChar += psp::appendStr (aSysPathByte.getStr(), pSystem + nChar);
 
-    system (pSystem);
+    if (system (pSystem) == -1)
+        OSL_ENSURE( 0, "psprint: couldn't remove spool directory" );
 }
 
 /* creates a spool directory with a "pidgin random" value based on
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index 6d243e41db8c..b0248662a2a2 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -665,6 +665,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, ULONG nSalFrameStyle, SystemParentD
     mhStackingWindow            = None;
     mhForeignParent             = None;
     mhBackgroundPixmap          = None;
+    m_bSetFocusOnMap            = false;
 
     pGraphics_                  = NULL;
     pFreeGraphics_              = NULL;
@@ -1226,14 +1227,11 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
         }
 
         XLIB_Time nUserTime = 0;
-        if( ! bNoActivate && (nStyle_ & (SAL_FRAME_STYLE_OWNERDRAWDECORATION|SAL_FRAME_STYLE_TOOLWINDOW)) == 0 )
-        {
-            if( GetDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("Metacity") )
-                nUserTime = pDisplay_->GetLastUserEventTime( true );
-            else
-                nUserTime = pDisplay_->GetLastUserEventTime();
-        }
+        if( ! bNoActivate && (nStyle_ & (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) == 0 )
+            nUserTime = pDisplay_->GetLastUserEventTime( true );
         GetDisplay()->getWMAdaptor()->setUserTime( this, nUserTime );
+        if( ! bNoActivate && (nStyle_ & SAL_FRAME_STYLE_TOOLWINDOW) )
+            m_bSetFocusOnMap = true;
 
         // actually map the window
         if( m_bXEmbed )
@@ -4172,6 +4170,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                                     &aEvent );
                     }
 
+                    bool bSetFocus = m_bSetFocusOnMap;
                     /*  #99570# another workaround for sawfish: if a transient window for the same parent is shown
                      *  sawfish does not set the focus to it. Applies only for click to focus mode.
                      */
@@ -4181,7 +4180,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                         // since this will lead to a parent loose-focus, close status,
                         // reget focus, open status, .... flicker loop
                         if ( (I18NStatus::get().getStatusFrame() != this) )
-                            XSetInputFocus( GetXDisplay(), GetShellWindow(), RevertToParent, CurrentTime );
+                            bSetFocus = true;
                     }
 
                     /*
@@ -4219,10 +4218,21 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                                         mpParent->GetShellWindow(),
                                         RevertToParent,
                                         CurrentTime );
+                        bSetFocus = false;
+                    }
+
+                    if( bSetFocus )
+                    {
+                        XSetInputFocus( GetXDisplay(),
+                                        GetShellWindow(),
+                                        RevertToParent,
+                                        CurrentTime );
                     }
 
+
                     RestackChildren();
                     mbInShow = FALSE;
+                    m_bSetFocusOnMap = false;
                 }
                 break;
 
diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h
index 4b97eeb98c0b..442b8bee1f15 100644..100755
--- a/vcl/win/inc/salgdi.h
+++ b/vcl/win/inc/salgdi.h
@@ -194,7 +194,7 @@ protected:
     virtual void        drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
     virtual void        drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
     virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin);
+    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin );
     virtual sal_Bool    drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
     virtual sal_Bool    drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry );
     virtual sal_Bool    drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
@@ -227,17 +227,17 @@ protected:
     virtual BOOL        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
 
     // native widget rendering methods that require mirroring
-    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                               const Point& aPos, BOOL& rIsInside );
-    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& aCaption );
-    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Region& rControlRegion,
+    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                const rtl::OUString& aCaption );
-    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Region& rControlRegion, ControlState nState,
+    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& aCaption,
-                                                Region &rNativeBoundingRegion, Region &rNativeContentRegion );
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 
     virtual bool        drawAlphaBitmap( const SalTwoRect&,
                                          const SalBitmap& rSourceBitmap,
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index b7ea81d313ae..14cb5d63437a 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -160,7 +160,8 @@ bool WinSalSystem::initMonitors()
             std::hash_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount;
             while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) )
             {
-                if( (aDev.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) == 0 ) // sort out non monitors
+                if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE)
+                    && !(aDev.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) ) // sort out non/disabled monitors
                 {
                     aDev.DeviceName[31] = 0;
                     aDev.DeviceString[127] = 0;
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index c621d81dce40..88efbb29d30a 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -189,14 +189,15 @@ bool WinSalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly
      return true;
 }
 
-bool WinSalGraphics::drawPolyLine(const basegfx::B2DPolygon& rPolygon, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin eLineJoin)
+bool WinSalGraphics::drawPolyLine( const basegfx::B2DPolygon& rPolygon, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin eLineJoin )
 {
     const sal_uInt32 nCount(rPolygon.count());
 
     if(mbPen && nCount)
     {
         Gdiplus::Graphics aGraphics(mhDC);
-        Gdiplus::Color aTestColor(255, SALCOLOR_RED(maLineColor), SALCOLOR_GREEN(maLineColor), SALCOLOR_BLUE(maLineColor));
+        const sal_uInt8 aTrans = (sal_uInt8)basegfx::fround( 255 * (1.0 - fTransparency) );
+        Gdiplus::Color aTestColor(aTrans, SALCOLOR_RED(maLineColor), SALCOLOR_GREEN(maLineColor), SALCOLOR_BLUE(maLineColor));
         Gdiplus::Pen aTestPen(aTestColor, Gdiplus::REAL(rLineWidths.getX()));
         Gdiplus::GraphicsPath aPath;
         bool bNoLineJoin(false);
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index be5d7f8360bc..8197fb37cd6d 100644..100755
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -317,7 +317,7 @@ BOOL WinSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
  */
 BOOL WinSalGraphics::hitTestNativeControl( ControlType,
                               ControlPart,
-                              const Region&,
+                              const Rectangle&,
                               const Point&,
                               BOOL& )
 {
@@ -553,9 +553,9 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
     }
     if( nType == CTRL_SPINBUTTONS && nPart == PART_ALL_BUTTONS )
     {
-        SpinbuttonValue *pValue = (SpinbuttonValue*) aValue.getOptionalVal();
-        if( pValue )
+        if( aValue.getType() == CTRL_SPINBUTTONS )
         {
+            const SpinbuttonValue *pValue = static_cast<const SpinbuttonValue*>(&aValue);
             BOOL bOk = FALSE;
 
             RECT rect;
@@ -578,9 +578,9 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         //rc.bottom--;
         if( nPart == PART_ALL_BUTTONS )
         {
-            SpinbuttonValue *pValue = (SpinbuttonValue*) aValue.getOptionalVal();
-            if( pValue )
+            if( aValue.getType() == CTRL_SPINBUTTONS )
             {
+                const SpinbuttonValue *pValue = static_cast<const SpinbuttonValue*>(&aValue);
                 BOOL bOk = FALSE;
 
                 RECT rect;
@@ -787,20 +787,19 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         iPart = TABP_TABITEMLEFTEDGE;
         rc.bottom--;
 
-        TabitemValue *pValue = (TabitemValue*) aValue.getOptionalVal();
-        if( pValue )
+        OSL_ASSERT( aValue.getType() == CTRL_TAB_ITEM );
+
+        const TabitemValue *pValue = static_cast<const TabitemValue*>(&aValue);
+        if( pValue->isBothAligned() )
         {
-            if( pValue->isBothAligned() )
-            {
-                iPart = TABP_TABITEMLEFTEDGE;
-                rc.right--;
-            }
-            else if( pValue->isLeftAligned() )
-                iPart = TABP_TABITEMLEFTEDGE;
-            else if( pValue->isRightAligned() )
-                iPart = TABP_TABITEMRIGHTEDGE;
-            else iPart = TABP_TABITEM;
+            iPart = TABP_TABITEMLEFTEDGE;
+            rc.right--;
         }
+        else if( pValue->isLeftAligned() )
+            iPart = TABP_TABITEMLEFTEDGE;
+        else if( pValue->isRightAligned() )
+            iPart = TABP_TABITEMRIGHTEDGE;
+        else iPart = TABP_TABITEM;
 
         if( !(nState & CTRL_STATE_ENABLED) )
             iState = TILES_DISABLED;
@@ -856,9 +855,12 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         }
         else if( nPart == PART_DRAW_BACKGROUND_HORZ || nPart == PART_DRAW_BACKGROUND_VERT )
         {
-            ToolbarValue *pValue = (ToolbarValue*) aValue.getOptionalVal();
-            if( pValue && pValue->mbIsTopDockingArea )
-                rc.top = 0; // extend potential gradient to cover menu bar as well
+            if( aValue.getType() == CTRL_TOOLBAR )
+            {
+                const ToolbarValue *pValue = static_cast<const ToolbarValue*>(&aValue);
+                if( pValue->mbIsTopDockingArea )
+                    rc.top = 0; // extend potential gradient to cover menu bar as well
+            }
             return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
         }
     }
@@ -868,9 +870,11 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         if( nPart != PART_ENTIRE_CONTROL )
             return FALSE;
 
-        MenubarValue *pValue = (MenubarValue*) aValue.getOptionalVal();
-        if( pValue )
+        if( aValue.getType() == CTRL_MENUBAR )
+        {
+            const MenubarValue *pValue = static_cast<const MenubarValue*>(&aValue);
             rc.bottom += pValue->maTopDockingAreaHeight;    // extend potential gradient to cover docking area as well
+        }
         return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
     }
 
@@ -918,7 +922,8 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         ImplDrawTheme( hTheme, hDC, iPart, iState, aTRect, aCaption );
 
         RECT aThumbRect;
-        SliderValue* pVal = (SliderValue*)aValue.getOptionalVal();
+        OSL_ASSERT( aValue.getType() == CTRL_SLIDER );
+        const SliderValue* pVal = static_cast<const SliderValue*>(&aValue);
         aThumbRect.left   = pVal->maThumbRect.Left();
         aThumbRect.top    = pVal->maThumbRect.Top();
         aThumbRect.right  = pVal->maThumbRect.Right();
@@ -963,7 +968,7 @@ BOOL ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
  */
 BOOL WinSalGraphics::drawNativeControl( ControlType nType,
                             ControlPart nPart,
-                            const Region& rControlRegion,
+                            const Rectangle& rControlRegion,
                             ControlState nState,
                             const ImplControlValue& aValue,
                             const OUString& aCaption )
@@ -1043,7 +1048,7 @@ BOOL WinSalGraphics::drawNativeControl( ControlType nType,
     if( !hTheme )
         return false;
 
-    Rectangle buttonRect = rControlRegion.GetBoundRect();
+    Rectangle buttonRect = rControlRegion;
     RECT rc;
     rc.left   = buttonRect.Left();
     rc.right  = buttonRect.Right()+1;
@@ -1080,7 +1085,7 @@ BOOL WinSalGraphics::drawNativeControl( ControlType nType,
  */
 BOOL WinSalGraphics::drawNativeControlText( ControlType,
                                 ControlPart,
-                                const Region&,
+                                const Rectangle&,
                                 ControlState,
                                 const ImplControlValue&,
                                 const OUString& )
@@ -1104,12 +1109,12 @@ BOOL WinSalGraphics::drawNativeControlText( ControlType,
  */
 BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
                                 ControlPart nPart,
-                                const Region& rControlRegion,
+                                const Rectangle& rControlRegion,
                                 ControlState nState,
                                 const ImplControlValue& rControlValue,
                                 const OUString&,
-                                Region &rNativeBoundingRegion,
-                                Region &rNativeContentRegion )
+                                Rectangle &rNativeBoundingRegion,
+                                Rectangle &rNativeContentRegion )
 {
     BOOL bRet = FALSE;
 
@@ -1146,7 +1151,7 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
             if( hTheme )
             {
                 Rectangle aRect( ImplGetThemeRect( hTheme, hDC, TP_SPLITBUTTONDROPDOWN,
-                    TS_HOT, rControlRegion.GetBoundRect() ) );
+                    TS_HOT, rControlRegion ) );
                 rNativeContentRegion = aRect;
                 rNativeBoundingRegion = rNativeContentRegion;
                 if( !rNativeContentRegion.IsEmpty() )
@@ -1160,7 +1165,7 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
         if( hTheme )
         {
             Rectangle aRect( ImplGetThemeRect( hTheme, hDC, PP_BAR,
-                0, rControlRegion.GetBoundRect() ) );
+                0, rControlRegion ) );
             rNativeContentRegion = aRect;
             rNativeBoundingRegion = rNativeContentRegion;
             if( !rNativeContentRegion.IsEmpty() )
@@ -1172,12 +1177,9 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
         HTHEME hTheme = getThemeHandle( mhWnd, L"Combobox");
         if( hTheme )
         {
-            Rectangle aBoxRect( rControlRegion.GetBoundRect() );
+            Rectangle aBoxRect( rControlRegion );
             Rectangle aRect( ImplGetThemeRect( hTheme, hDC, CP_DROPDOWNBUTTON,
                                                CBXS_NORMAL, aBoxRect ) );
-            Rectangle aBrdRect( ImplGetThemeRect( hTheme, hDC, CP_BORDER,
-                                                  CBB_HOT, aBoxRect ) );
-            aRect.Top() -= aBrdRect.GetHeight();
             if( aRect.GetHeight() > aBoxRect.GetHeight() )
                 aBoxRect.Bottom() = aBoxRect.Top() + aRect.GetHeight();
             if( aRect.GetWidth() > aBoxRect.GetWidth() )
@@ -1195,7 +1197,7 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
         if( hTheme )
         {
             // get borderr size
-            Rectangle aBoxRect( rControlRegion.GetBoundRect() );
+            Rectangle aBoxRect( rControlRegion );
             Rectangle aRect( ImplGetThemeRect( hTheme, hDC, EP_BACKGROUNDWITHBORDER,
                                                EBWBS_HOT, aBoxRect ) );
             // ad app font height
@@ -1234,7 +1236,7 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
             if( nPart == PART_THUMB_HORZ )
             {
                 long nW = aThumbRect.GetWidth();
-                Rectangle aRect( rControlRegion.GetBoundRect() );
+                Rectangle aRect( rControlRegion );
                 aRect.Right() = aRect.Left() + nW - 1;
                 rNativeContentRegion = aRect;
                 rNativeBoundingRegion = rNativeContentRegion;
@@ -1242,7 +1244,7 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
             else
             {
                 long nH = aThumbRect.GetHeight();
-                Rectangle aRect( rControlRegion.GetBoundRect() );
+                Rectangle aRect( rControlRegion );
                 aRect.Bottom() = aRect.Top() + nH - 1;
                 rNativeContentRegion = aRect;
                 rNativeBoundingRegion = rNativeContentRegion;
@@ -1253,30 +1255,30 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
 
     if ( ( nType == CTRL_TAB_ITEM ) && ( nPart == PART_ENTIRE_CONTROL ) )
     {
-        Rectangle aControlRect( rControlRegion.GetBoundRect() );
+        Rectangle aControlRect( rControlRegion );
         rNativeContentRegion = aControlRect;
 
         --aControlRect.Bottom();
 
-        TabitemValue *pValue = static_cast< TabitemValue* >( rControlValue.getOptionalVal() );
-        if ( pValue )
+        if( rControlValue.getType() == CTRL_TAB_ITEM )
         {
+            const TabitemValue *pValue = static_cast<const TabitemValue*>(&rControlValue);
             if ( pValue->isBothAligned() )
                 --aControlRect.Right();
-        }
 
-        if ( nState & CTRL_STATE_SELECTED )
-        {
-            aControlRect.Left() -= 2;
-            if ( pValue && !pValue->isBothAligned() )
+            if ( nState & CTRL_STATE_SELECTED )
             {
-                if ( pValue->isLeftAligned() || pValue->isNotAligned() )
-                    aControlRect.Right() += 2;
-                if ( pValue->isRightAligned() )
-                    aControlRect.Right() += 1;
+                aControlRect.Left() -= 2;
+                if ( pValue && !pValue->isBothAligned() )
+                {
+                    if ( pValue->isLeftAligned() || pValue->isNotAligned() )
+                        aControlRect.Right() += 2;
+                    if ( pValue->isRightAligned() )
+                        aControlRect.Right() += 1;
+                }
+                aControlRect.Top() -= 2;
+                aControlRect.Bottom() += 2;
             }
-            aControlRect.Top() -= 2;
-            aControlRect.Bottom() += 2;
         }
         rNativeBoundingRegion = aControlRect;
         bRet = TRUE;
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index ba19f2255646..6f0c98279e7b 100644..100755
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -2821,7 +2821,7 @@ sal_GlyphId GraphiteLayoutWinImpl::getKashidaGlyph(int & rWidth)
 class GraphiteWinLayout : public WinLayout
 {
 private:
-    mutable gr::WinFont   mpFont;
+    mutable GraphiteWinFont mpFont;
     grutils::GrFeatureParser * mpFeatures;
     mutable GraphiteLayoutWinImpl maImpl;
 public: