impress186: merge with DEV300m86

20 files changed, 204 insertions, 227 deletions

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/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index a40de9503367..9dc427d83943 100644..100755
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -247,6 +247,10 @@ public:
 
     virtual XubString GetSurroundingText() const;
     virtual Selection GetSurroundingTextSelection() const;
+
+    // returns the minimum size a bordered Edit should have given the current
+    // global style settings (needed by sc's inputwin.cxx)
+    static Size GetMinimumEditSize();
 };
 
 inline ULONG Edit::IsUpdateDataEnabled() const
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/help.hxx b/vcl/inc/vcl/help.hxx
index 4bca986812ed..30308aa8a723 100644
--- a/vcl/inc/vcl/help.hxx
+++ b/vcl/inc/vcl/help.hxx
@@ -48,6 +48,7 @@ class Window;
 #define QUICKHELP_BOTTOM    ((USHORT)0x0020)
 #define QUICKHELP_NOAUTOPOS (QUICKHELP_LEFT | QUICKHELP_CENTER | QUICKHELP_RIGHT | QUICKHELP_TOP | QUICKHELP_VCENTER | QUICKHELP_BOTTOM)
 #define QUICKHELP_CTRLTEXT  ((USHORT)0x0040)
+#define QUICKHELP_NOEVADEPOINTER ((USHORT)0x4000)
 #define QUICKHELP_BIDI_RTL  ((USHORT)0x8000)
 
 // By changes you must also change: rsc/vclrsc.hxx
diff --git a/vcl/inc/vcl/imgcons.hxx b/vcl/inc/vcl/imgcons.hxx
deleted file mode 100644
index 2f582fec15c3..000000000000
--- a/vcl/inc/vcl/imgcons.hxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _IMGCONS_HXX
-#define _IMGCONS_HXX
-
-#include <vcl/dllapi.h>
-
-#include <vcl/bitmap.hxx>
-
-// -----------------
-// - ImageConsumer -
-// -----------------
-
-class ImageProducer;
-class ImplColorMapper;
-class BitmapEx;
-class Image;
-
-#define IMAGEERROR          1
-#define SINGLEFRAMEDONE     2
-#define STATICIMAGEDONE     3
-#define IMAGEABORTED        4
-
-class VCL_DLLPUBLIC ImageConsumer
-{
-private:
-
-    Bitmap              maBitmap;
-    Bitmap              maMask;
-    Rectangle           maChangedRect;
-    Size                maSize;
-    ImplColorMapper*    mpMapper;
-    Color*              mpPal;
-    Link                maChgLink;
-    Link                maDoneLink;
-    sal_uInt32          mnFormat;
-    sal_uInt32          mnStatus;
-    BOOL                mbTrans;
-
-protected:
-
-    virtual void        DataChanged();
-
-public:
-
-                        ImageConsumer();
-    virtual             ~ImageConsumer();
-
-    BOOL                GetData( BitmapEx& rBmpEx ) const;
-    BOOL                GetData( Image& rImage ) const;
-    const Rectangle&    GetChangedRect() const { return maChangedRect; }
-    sal_uInt32          GetStatus() const;
-
-    void                SetDataChangedLink( const Link& rLink ) { maChgLink = rLink; }
-    const Link&         GetDataChangedLink() const { return maChgLink; }
-
-    void                SetDoneLink( const Link& rLink ) { maDoneLink = rLink; }
-    const Link&         GetDoneLink() const { return maDoneLink; }
-
-public:
-
-    virtual void        Init( sal_uInt32 nWidth, sal_uInt32 nHeight );
-
-    virtual void        SetColorModel( USHORT nBitCount,
-                                       sal_uInt32 nPalEntries, const sal_uInt32* pRGBAPal,
-                                       sal_uInt32 nRMask, sal_uInt32 nGMask, sal_uInt32 nBMask, sal_uInt32 nAMask  );
-
-    virtual void        SetPixelsByBytes( sal_uInt32 nConsX, sal_uInt32 nConsY,
-                                          sal_uInt32 nConsWidth, sal_uInt32 nConsHeight,
-                                          const BYTE* pProducerData, sal_uInt32 nOffset, sal_uInt32 nScanSize );
-
-    virtual void        SetPixelsByLongs( sal_uInt32 nConsX, sal_uInt32 nConsY,
-                                          sal_uInt32 nConsWidth, sal_uInt32 nConsHeight,
-                                          const sal_uInt32* pProducerData, sal_uInt32 nOffset, sal_uInt32 nScanSize );
-
-    virtual void        Completed( sal_uInt32 nStatus );
-//  virtual void        Completed( sal_uInt32 nStatus, ImageProducer& rProducer );
-};
-
-#endif // _IMGCONS_HXX
diff --git a/vcl/inc/vcl/impfont.hxx b/vcl/inc/vcl/impfont.hxx
index 6ce9f21500b5..a1104bbf4a86 100644
--- a/vcl/inc/vcl/impfont.hxx
+++ b/vcl/inc/vcl/impfont.hxx
@@ -177,7 +177,8 @@ class CmapResult;
 class VCL_DLLPUBLIC ImplFontCharMap
 {
 public:
-   explicit             ImplFontCharMap( const CmapResult& );
+    explicit             ImplFontCharMap( const CmapResult& );
+    virtual              ~ImplFontCharMap();
 
     static ImplFontCharMap* GetDefaultMap( bool bSymbols=false);
 
@@ -201,7 +202,6 @@ public:
     int                 GetGlyphIndex( sal_uInt32 ) const;
 
 private:
-    /*virtual*/         ~ImplFontCharMap();
     int                 ImplFindRangeIndex( sal_uInt32 ) const;
 
     // prevent assignment and copy construction
diff --git a/vcl/inc/vcl/javachild.hxx b/vcl/inc/vcl/javachild.hxx
index 62b447f26571..c5ec3c678900 100644
--- a/vcl/inc/vcl/javachild.hxx
+++ b/vcl/inc/vcl/javachild.hxx
@@ -47,8 +47,6 @@ public:
 
 private:
 
-    SAL_DLLPRIVATE void implTestJavaException( void* pEnv );
-
     // Copy assignment is forbidden and not implemented.
     SAL_DLLPRIVATE      JavaChildWindow (const JavaChildWindow &);
     SAL_DLLPRIVATE      JavaChildWindow & operator= (const JavaChildWindow &);
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index 98cd05d999dd..3659e5aee485 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.hxx
@@ -130,6 +130,7 @@ public:
 
     virtual USHORT      GetEntryPos( const XubString& rStr ) const;
     virtual USHORT      GetEntryPos( const void* pData ) const;
+            Image       GetEntryImage( USHORT nPos ) const;
     virtual XubString   GetEntry( USHORT nPos ) const;
     virtual USHORT      GetEntryCount() const;
 
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/print.hxx b/vcl/inc/vcl/print.hxx
index 96822d9bc756..af83b2db40e1 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -478,6 +478,7 @@ public:
     */
     void enableUIOption( const rtl::OUString& rPropName, bool bEnable );
     bool isUIOptionEnabled( const rtl::OUString& rPropName ) const;
+    bool isUIChoiceEnabled( const rtl::OUString& rPropName, sal_Int32 nChoice ) const;
     /* returns the property name rPropName depends on or an empty string
        if no dependency exists.
     */
@@ -649,6 +650,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
                                                          const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices,
                                                          sal_Int32 i_nValue,
                                                          const rtl::OUString& i_rType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Radio" ) ),
+                                                         const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(),
                                                          const UIControlOptions& i_rControlOptions = UIControlOptions()
                                                          );
 
diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/vcl/salgdi.hxx
index 510e797678b0..cbe3581bedc4 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
 
@@ -233,7 +233,7 @@ public:
     // release the fonts
     void                   ReleaseFonts() { SetFont( NULL, 0 ); }
     // get the current font's metrics
-    virtual void            GetFontMetric( ImplFontMetricData* ) = 0;
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel = 0 ) = 0;
 
     // get kernign pairs of the current font
     // return only PairCount if (pKernPairs == NULL)
@@ -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/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx
index 5cc8f32d7ac9..fe69b0c0b4d4 100644
--- a/vcl/inc/vcl/svdata.hxx
+++ b/vcl/inc/vcl/svdata.hxx
@@ -318,6 +318,9 @@ struct ImplSVNWFData
                                                           // window background before drawing the native
                                                           // checkbox
     bool                    mbScrollbarJumpPage;          // true for "jump to here" behavior
+    int                     mnStatusBarLowerRightOffset;  // amount in pixel to avoid in the lower righthand corner
+                                                          // used on the Mac where the system resizer paints over
+                                                          // our window content
 };
 
 
diff --git a/vcl/inc/vcl/syschild.hxx b/vcl/inc/vcl/syschild.hxx
index da4ffcd51a22..e914adbdffed 100644
--- a/vcl/inc/vcl/syschild.hxx
+++ b/vcl/inc/vcl/syschild.hxx
@@ -44,6 +44,7 @@ class VCL_DLLPUBLIC SystemChildWindow : public Window
 private:
     using Window::ImplInit;
     SAL_DLLPRIVATE void     ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, BOOL bShow = FALSE );
+    SAL_DLLPRIVATE void     ImplTestJavaException( void* pEnv );
 
     // Copy assignment is forbidden and not implemented.
     SAL_DLLPRIVATE          SystemChildWindow (const SystemChildWindow &);
@@ -62,6 +63,11 @@ public:
     //  however, this might not always be required
     void                    EnableEraseBackground( BOOL bEnable = TRUE );
     BOOL                    IsEraseBackgroundEnabled();
+
+    // return the platform specific handle/id of this window;
+    // in case the flag bUseJava is set, a java compatible overlay window
+    // is created on which other java windows can be created (plugin interface)
+    sal_IntPtr              GetParentWindowHandle( sal_Bool bUseJava = sal_False );
 };
 
 #endif // _SV_SYSCHILD_HXX
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index b0e74df9a767..b3a7d9b8775e 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -179,6 +179,8 @@ private:
     SystemWindow (const SystemWindow &);
     SystemWindow & operator= (const SystemWindow &);
 
+    SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin );
+
 protected:
     // Single argument ctors shall be explicit.
     explicit        SystemWindow( WindowType nType );