vcl2gnumake: rebase to DEV300m103

52 files changed, 248 insertions, 178 deletions

diff --git a/vcl/inc/aqua/salframeview.h b/vcl/inc/aqua/salframeview.h
index 3277c52d4456..c79539cf14e8 100755
--- a/vcl/inc/aqua/salframeview.h
+++ b/vcl/inc/aqua/salframeview.h
@@ -85,6 +85,7 @@
 }
 +(void)unsetMouseFrame: (AquaSalFrame*)pFrame;
 -(id)initWithSalFrame: (AquaSalFrame*)pFrame;
+-(AquaSalFrame*)getSalFrame;
 -(BOOL)acceptsFirstResponder;
 -(BOOL)acceptsFirstMouse: (NSEvent *)pEvent;
 -(BOOL)isOpaque;
diff --git a/vcl/inc/aqua/salgdi.h b/vcl/inc/aqua/salgdi.h
index 103e207a9b79..50f2bb1156b9 100644
--- a/vcl/inc/aqua/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -176,8 +176,7 @@ public:
     // InvalidateContext does an UnsetState and sets mrContext to 0
     void                InvalidateContext();
 
-    virtual sal_Bool        unionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual bool        unionClipRegion( const ::basegfx::B2DPolyPolygon& );
+    virtual bool        setClipRegion( const Region& );
 
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     virtual void        drawPixel( long nX, long nY );
@@ -250,11 +249,6 @@ public:
 
     // set the clip region to empty
     virtual void            ResetClipRegion();
-    // begin setting the clip region, add rectangles to the
-    // region with the UnionClipRegion call
-    virtual void            BeginSetClipRegion( sal_uLong nCount );
-    // all rectangles were added and the clip region should be set now
-    virtual void            EndSetClipRegion();
 
     // set the line color to transparent (= don't draw lines)
     virtual void            SetLineColor();
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index b18748ed5791..7747b99015fe 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -38,7 +38,7 @@
 namespace psp
 {
 
-class VCL_DLLPUBLIC FontCache
+class VCL_PLUGIN_PUBLIC FontCache
 {
     struct FontDir;
     friend class FontDir;
diff --git a/vcl/inc/glyphcache.hxx b/vcl/inc/glyphcache.hxx
index a17018699d71..a818ef6a75c3 100644
--- a/vcl/inc/glyphcache.hxx
+++ b/vcl/inc/glyphcache.hxx
@@ -57,7 +57,7 @@ class ServerFontLayout;
 
 // =======================================================================
 
-class VCL_DLLPUBLIC GlyphCache
+class VCL_PLUGIN_PUBLIC GlyphCache
 {
 public:
     explicit                    GlyphCache( GlyphCachePeer& );
@@ -172,7 +172,7 @@ private:
 
 // =======================================================================
 
-class VCL_DLLPUBLIC ServerFont
+class VCL_PLUGIN_PUBLIC ServerFont
 {
 public:
     virtual const ::rtl::OString*   GetFontFileName() const { return NULL; }
@@ -254,7 +254,7 @@ private:
 // =======================================================================
 
 // a class for cache entries for physical font instances that are based on serverfonts
-class VCL_DLLPUBLIC ImplServerFontEntry : public ImplFontEntry
+class VCL_PLUGIN_PUBLIC ImplServerFontEntry : public ImplFontEntry
 {
 private:
     ServerFont*    mpServerFont;
@@ -271,7 +271,7 @@ public:
 
 // =======================================================================
 
-class VCL_DLLPUBLIC ServerFontLayout : public GenericSalLayout
+class VCL_PLUGIN_PUBLIC ServerFontLayout : public GenericSalLayout
 {
 private:
     ServerFont&     mrServerFont;
@@ -316,7 +316,7 @@ protected:
 
 // =======================================================================
 
-class VCL_DLLPUBLIC RawBitmap
+class VCL_PLUGIN_PUBLIC RawBitmap
 {
 public:
                     RawBitmap();
@@ -349,7 +349,7 @@ inline void ServerFont::SetExtended( int nInfo, void* pVoid )
 
 // ExtraKernInfo allows an on-demand query of extra kerning info #i29881#
 // The kerning values have to be scaled to match the font size before use
-class VCL_DLLPUBLIC ExtraKernInfo
+class VCL_PLUGIN_PUBLIC ExtraKernInfo
 {
 public:
     ExtraKernInfo( sal_IntPtr nFontId );
diff --git a/vcl/inc/graphite_adaptors.hxx b/vcl/inc/graphite_adaptors.hxx
index 4f78a8a0b13b..753523f4aa0d 100644
--- a/vcl/inc/graphite_adaptors.hxx
+++ b/vcl/inc/graphite_adaptors.hxx
@@ -84,7 +84,7 @@ namespace grutils
 // the Graphite engine.
 // @author tse
 //
-class VCL_DLLPUBLIC GraphiteFontAdaptor : public gr::Font
+class VCL_PLUGIN_PUBLIC GraphiteFontAdaptor : public gr::Font
 {
     typedef std::map<const gr::gid16, std::pair<gr::Rect, gr::Point> > GlyphMetricMap;
     friend class GrFontHasher;
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index bbeaf21ecd60..d4f89d4cb91d 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -85,7 +85,7 @@ namespace grutils { class GrFeatureParser; }
 // This class uses the SIL Graphite engine to provide complex text layout services to the VCL
 // @author tse
 //
-class VCL_DLLPUBLIC GraphiteLayout : public SalLayout
+class VCL_PLUGIN_PUBLIC GraphiteLayout : public SalLayout
 {
 public:
     // Mask to allow Word break status to be stored within mvChar2BaseGlyph
@@ -133,7 +133,7 @@ private:
     const grutils::GrFeatureParser * mpFeatures;
 
 public:
-    GraphiteLayout(const gr::Font & font, const grutils::GrFeatureParser * features = NULL) throw();
+    explicit GraphiteLayout( const gr::Font& font, const grutils::GrFeatureParser* features = NULL ) throw();
 
     // used by upper layers
     virtual bool  LayoutText( ImplLayoutArgs& );    // first step of layout
@@ -183,6 +183,4 @@ private:
     void expandOrCondense(ImplLayoutArgs &rArgs);
 };
 
-
-
 #endif // _SV_GRAPHITELAYOUT_HXX
diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index 3980031cf7b6..819180b30bf6 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -37,7 +37,7 @@
 
 // Modules
 
-class VCL_DLLPUBLIC GraphiteLayoutImpl : public GraphiteLayout
+class VCL_PLUGIN_PUBLIC GraphiteLayoutImpl : public GraphiteLayout
 {
 public:
     GraphiteLayoutImpl(const gr::Font & font, const grutils::GrFeatureParser * features, GraphiteFontAdaptor * pFont) throw()
@@ -51,14 +51,14 @@ private:
 // This class implments the server font specific parts.
 // @author tse
 //
-class VCL_DLLPUBLIC GraphiteServerFontLayout : public ServerFontLayout
+class VCL_PLUGIN_PUBLIC GraphiteServerFontLayout : public ServerFontLayout
 {
 private:
         mutable GraphiteFontAdaptor * mpFont;
         // mutable so that the DrawOffset/DrawBase can be set
         mutable GraphiteLayoutImpl maImpl;
 public:
-        GraphiteServerFontLayout(GraphiteFontAdaptor * font) throw();
+        explicit GraphiteServerFontLayout( GraphiteFontAdaptor* font ) throw();
 
         virtual bool  LayoutText( ImplLayoutArgs& rArgs) { SalLayout::AdjustLayout(rArgs); return maImpl.LayoutText(rArgs); };    // first step of layout
         virtual void  AdjustLayout( ImplLayoutArgs& rArgs)
@@ -94,7 +94,5 @@ public:
         int getMaxCharPos() const { return mnEndCharPos; }
 };
 
-
-
 #endif
 #endif //_SV_GRAPHITESERVERFONT_HXX
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index a3fd0a81da36..fc3e2d5ffce8 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -65,7 +65,8 @@ public:
 
     const String&       GetHelpText() const { return maHelpText; }
     void                SetHelpText( const String& rHelpText );
-    sal_uInt16              GetWinStyle() const { return mnHelpWinStyle; }
+    sal_uInt16          GetWinStyle() const { return mnHelpWinStyle; }
+    sal_uInt16          GetStyle() const { return mnStyle; }
 
     // Nur merken:
     void                SetStatusText( const String& rStatusText ) { maStatusText = rStatusText; }
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index c0ff0a080b17..cc4271932b47 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -174,7 +174,7 @@ public:
 
 class CmapResult;
 
-class VCL_DLLPUBLIC ImplFontCharMap
+class VCL_PLUGIN_PUBLIC ImplFontCharMap
 {
 public:
     explicit             ImplFontCharMap( const CmapResult& );
@@ -218,11 +218,7 @@ private:
 };
 
 // CmapResult is a normalized version of the many CMAP formats
-class
-#ifdef UNX
-    VCL_DLLPUBLIC // vcl-plugins need it
-#endif // UNX
-CmapResult
+class VCL_PLUGIN_PUBLIC CmapResult
 {
 public:
     explicit    CmapResult( bool bSymbolic = false,
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index f31e6590a315..aabc6bd2797f 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -116,7 +116,7 @@ public: // TODO: hide members behind accessor methods
 // TODO: make cloning cheaper
 
 // abstract base class for physical font faces
-class VCL_DLLPUBLIC ImplFontData : public ImplDevFontAttributes
+class VCL_PLUGIN_PUBLIC ImplFontData : public ImplDevFontAttributes
 {
 public:
     // by using an ImplFontData object as a factory for its corresponding
@@ -185,7 +185,7 @@ public: // TODO: change to private
 // TODO: merge with ImplFontCache
 // TODO: rename to LogicalFontManager
 
-class VCL_DLLPUBLIC ImplDevFontList
+class VCL_PLUGIN_PUBLIC ImplDevFontList
 {
 private:
     friend class WinGlyphFallbackSubstititution;
@@ -324,7 +324,7 @@ public: // TODO: hide members behind accessor methods
 // TODO: rename ImplFontEntry to LogicalFontInstance
 // TODO: allow sharing of metrics for related fonts
 
-class VCL_DLLPUBLIC ImplFontEntry
+class VCL_PLUGIN_PUBLIC ImplFontEntry
 {
 public:
     explicit            ImplFontEntry( const ImplFontSelectData& );
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index 66ab22d65570..b90eaae756bf 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -57,7 +57,7 @@ struct ImplPrnQueueData
 // - ImplPrnQueueList -
 // --------------------
 
-class VCL_DLLPUBLIC ImplPrnQueueList
+class VCL_PLUGIN_PUBLIC ImplPrnQueueList
 {
 public:
     std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash >
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index d1bbc3030c18..8201610593af 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -73,7 +73,9 @@ namespace vcl
             virtual void Resize();
             virtual void DataChanged( const DataChangedEvent& );
 
-            void setPreview( const GDIMetaFile&, const Size&, const rtl::OUString&,
+            void setPreview( const GDIMetaFile&, const Size& i_rPaperSize,
+                             const rtl::OUString& i_rPaperName,
+                             const rtl::OUString& i_rNoPageString,
                              sal_Int32 i_nDPIX, sal_Int32 i_nDPIY,
                              bool i_bGreyscale
                             );
@@ -169,6 +171,7 @@ namespace vcl
             NumericField                            maCopyCountField;
             CheckBox                                maCollateBox;
             FixedImage                              maCollateImage;
+            CheckBox                                maReverseOrderBox;
 
             Image                                   maCollateImg;
             Image                                   maCollateHCImg;
@@ -197,7 +200,6 @@ namespace vcl
             FixedLine                           maOptionsLine;
             CheckBox                            maToFileBox;
             CheckBox                            maCollateSingleJobsBox;
-            CheckBox                            maReverseOrderBox;
 
             boost::shared_ptr<vcl::RowOrColumn> mxOptGroup;
 
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index e12d5a21152c..b19c2ac33aeb 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -38,7 +38,7 @@ class SalGraphics;
 class BitmapPalette;
 struct BitmapSystemData;
 
-class VCL_DLLPUBLIC SalBitmap
+class VCL_PLUGIN_PUBLIC SalBitmap
 {
 public:
     SalBitmap() {}
diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index ead0e0974713..0a27089ceb47 100644
--- a/vcl/inc/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -39,7 +39,7 @@ namespace psp
     class PrinterInfoManager;
 }
 
-class VCL_DLLPUBLIC SalData
+class VCL_PLUGIN_PUBLIC SalData
 {
 public:
     SalInstance*                  m_pInstance; // pointer to instance
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 4576641dcd45..8fbbe96ba8bf 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -143,7 +143,7 @@ using namespace rtl;
 
 struct SystemParentData;
 
-class VCL_DLLPUBLIC SalFrame : public vcl::DeletionNotifier
+class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier
 {
     // the VCL window corresponding to this frame
     Window*                 m_pWindow;
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index e6d60e2b329c..1a9b9ccaea59 100644..100755
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -96,7 +96,7 @@ typedef std::vector< sal_Int32 > Int32Vector;
 // note: all positions are in pixel and relative to
 // the top/left-position of the virtual output area
 
-class VCL_DLLPUBLIC SalGraphics
+class VCL_PLUGIN_PUBLIC SalGraphics
 {
     int                     m_nLayout; // 0: mirroring off, 1: mirror x-axis
 
@@ -113,8 +113,7 @@ public:
     virtual ~SalGraphics();
 
 protected:
-    virtual sal_Bool        unionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0;
-    virtual bool        unionClipRegion( const ::basegfx::B2DPolyPolygon& ) = 0;
+    virtual bool        setClipRegion( const Region& ) = 0;
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     virtual void        drawPixel( long nX, long nY ) = 0;
     virtual void        drawPixel( long nX, long nY, SalColor nSalColor ) = 0;
@@ -204,11 +203,6 @@ public:
 
     // set the clip region to empty
     virtual void            ResetClipRegion() = 0;
-    // begin setting the clip region, add rectangles to the
-    // region with the UnionClipRegion call
-    virtual void            BeginSetClipRegion( sal_uLong nCount ) = 0;
-    // all rectangles were added and the clip region should be set now
-    virtual void            EndSetClipRegion() = 0;
 
     // set the line color to transparent (= don't draw lines)
     virtual void            SetLineColor() = 0;
@@ -355,10 +349,9 @@ public:
     basegfx::B2DPolygon     mirror( const basegfx::B2DPolygon& i_rPoly, const OutputDevice *pOutDev, bool bBack = false ) const;
     basegfx::B2DPolyPolygon mirror( const basegfx::B2DPolyPolygon& i_rPoly, const OutputDevice *pOutDev, bool bBack = false ) const;
 
-    // non virtual methods; these do eventual coordinate mirroring and
+    // non virtual methods; these do possible coordinate mirroring and
     // then delegate to protected virtual methods
-    sal_Bool                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev );
-    sal_Bool                    UnionClipRegion( const ::basegfx::B2DPolyPolygon&, const OutputDevice* );
+    bool                    SetClipRegion( const Region&, const OutputDevice *pOutDev );
 
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     void                    DrawPixel( long nX, long nY, const OutputDevice *pOutDev );
diff --git a/vcl/inc/salimestatus.hxx b/vcl/inc/salimestatus.hxx
index 779a75c9afaa..20184a059d9a 100644
--- a/vcl/inc/salimestatus.hxx
+++ b/vcl/inc/salimestatus.hxx
@@ -30,7 +30,7 @@
 
 #include <vcl/dllapi.h>
 
-class VCL_DLLPUBLIC SalI18NImeStatus
+class VCL_PLUGIN_PUBLIC SalI18NImeStatus
 {
 public:
     SalI18NImeStatus() {}
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index e1ed7288651a..51f1f5b3b4e0 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -31,10 +31,12 @@
 #include "com/sun/star/uno/Reference.hxx"
 
 #include "vcl/sv.h"
+#include "vcl/displayconnectiondispatch.hxx"
 #include "vcl/dllapi.h"
 
 #include "tools/string.hxx"
 
+#include "rtl/ref.hxx"
 #include "rtl/string.hxx"
 
 #include <list>
@@ -68,23 +70,13 @@ namespace vos { class IMutex; }
 // - SalInstance -
 // ---------------
 
-class VCL_DLLPUBLIC SalInstance
+class VCL_PLUGIN_PUBLIC SalInstance
 {
-public:
-    typedef bool(*Callback)(void*,void*,int);
 private:
-    void*                       m_pEventInst;
-    void*                       m_pErrorInst;
-    Callback                    m_pEventCallback;
-    Callback                    m_pErrorCallback;
+    rtl::Reference< vcl::DisplayConnectionDispatch > m_pEventInst;
 
 public:
-    SalInstance() :
-            m_pEventInst( NULL ),
-            m_pErrorInst( NULL ),
-            m_pEventCallback( NULL ),
-            m_pErrorCallback( NULL )
-    {}
+    SalInstance() {}
     virtual ~SalInstance();
 
     // Frame
@@ -154,22 +146,12 @@ public:
 
     // methods for XDisplayConnection
 
-    // the parameters for the callbacks are:
-    //    void* pInst:          pInstance form the SetCallback call
-    //    void* pEvent:         address of the system specific event structure
-    //    int   nBytes:         length of the system specific event structure
-    void                SetEventCallback( void* pInstance, Callback pCallback )
-    { m_pEventInst = pInstance; m_pEventCallback = pCallback; }
-    Callback GetEventCallback() const
-    { return m_pEventCallback; }
+    void                SetEventCallback( rtl::Reference< vcl::DisplayConnectionDispatch > const & pInstance )
+    { m_pEventInst = pInstance; }
     bool                CallEventCallback( void* pEvent, int nBytes )
-    { return m_pEventCallback ? m_pEventCallback( m_pEventInst, pEvent, nBytes ) : false; }
-    void                SetErrorEventCallback( void* pInstance, Callback pCallback )
-    { m_pErrorInst = pInstance; m_pErrorCallback = pCallback; }
-    Callback            GetErrorEventCallback() const
-    { return m_pErrorCallback; }
+    { return m_pEventInst.is() && m_pEventInst->dispatchEvent( pEvent, nBytes ); }
     bool                CallErrorCallback( void* pEvent, int nBytes )
-    { return m_pErrorCallback ? m_pErrorCallback( m_pErrorInst, pEvent, nBytes ) : false; }
+    { return m_pEventInst.is() && m_pEventInst->dispatchErrorEvent( pEvent, nBytes ); }
 
     enum ConnectionIdentifierType { AsciiCString, Blob };
     virtual void*               GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
@@ -197,7 +179,7 @@ void DestroySalInstance( SalInstance* pInst );
 
 void SalAbort( const XubString& rErrorText );
 
-VCL_DLLPUBLIC const ::rtl::OUString& SalGetDesktopEnvironment();
+VCL_PLUGIN_PUBLIC const ::rtl::OUString& SalGetDesktopEnvironment();
 
 // -----------
 // - SalData -
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index e23090c42392..bb5c6e829a70 100755
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -72,7 +72,7 @@ class ImplFontData;
 // -----------------
 
 // used for managing runs e.g. for BiDi, glyph and script fallback
-class VCL_DLLPUBLIC ImplLayoutRuns
+class VCL_PLUGIN_PUBLIC ImplLayoutRuns
 {
 private:
     int                 mnRunIndex;
@@ -148,7 +148,7 @@ sal_UCS4 GetVerticalChar( sal_UCS4 );
 // #i80090# GetMirroredChar also needed outside vcl, moved to svapp.hxx
 // VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 );
 sal_UCS4 GetLocalizedChar( sal_UCS4, LanguageType );
-VCL_DLLPUBLIC const char* GetAutofallback( sal_UCS4 ) ;
+VCL_PLUGIN_PUBLIC const char* GetAutofallback( sal_UCS4 ) ;
 
 // -------------
 // - SalLayout -
@@ -179,7 +179,7 @@ typedef sal_uInt32 sal_GlyphId;
 // all positions/widths are in font units
 // one exception: drawposition is in pixel units
 
-class VCL_DLLPUBLIC SalLayout
+class VCL_PLUGIN_PUBLIC SalLayout
 {
 public:
     // used by upper layers
@@ -258,7 +258,7 @@ protected:
 // - MultiSalLayout -
 // ------------------
 
-class VCL_DLLPUBLIC MultiSalLayout : public SalLayout
+class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout
 {
 public:
     virtual void    DrawText( SalGraphics& ) const;
@@ -271,7 +271,7 @@ public:
     virtual bool    GetBoundRect( SalGraphics&, Rectangle& ) const;
 
     // used only by OutputDevice::ImplLayout, TODO: make friend
-                    MultiSalLayout( SalLayout& rBaseLayout,
+    explicit        MultiSalLayout( SalLayout& rBaseLayout,
                          const ImplFontData* pBaseFont = NULL );
     virtual bool    AddFallback( SalLayout& rFallbackLayout,
                          ImplLayoutRuns&, const ImplFontData* pFallbackFont );
@@ -341,7 +341,7 @@ typedef std::vector<GlyphItem> GlyphVector;
 
 // ---------------
 
-class VCL_DLLPUBLIC GenericSalLayout : public SalLayout
+class VCL_PLUGIN_PUBLIC GenericSalLayout : public SalLayout
 {
 public:
     // used by layout engines
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index ab9f44922aa8..030952388dfb 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -60,14 +60,14 @@ struct SalMenuButtonItem
     : mnId( i_nId ), maImage( rImg ), maToolTipText( i_rTTText ) {}
 };
 
-class VCL_DLLPUBLIC SalMenuItem
+class VCL_PLUGIN_PUBLIC SalMenuItem
 {
 public:
     SalMenuItem() {}
     virtual ~SalMenuItem();
 };
 
-class VCL_DLLPUBLIC SalMenu
+class VCL_PLUGIN_PUBLIC SalMenu
 {
 public:
     SalMenu() {}
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 81078dcdcaf1..5ece9e93613d 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -47,7 +47,7 @@ struct SystemEnvData;
 // - SalObject -
 // -------------
 
-class VCL_DLLPUBLIC SalObject
+class VCL_PLUGIN_PUBLIC SalObject
 {
     void*               m_pInst;
     SALOBJECTPROC       m_pCallback;
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index ae21a8a5b438..572b766ea909 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -44,7 +44,7 @@ namespace vcl { class PrinterController; }
 // - SalPrinterQueueInfo -
 // -----------------------
 
-struct VCL_DLLPUBLIC SalPrinterQueueInfo
+struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
 {
     XubString               maPrinterName;
     XubString               maDriver;
@@ -62,7 +62,7 @@ struct VCL_DLLPUBLIC SalPrinterQueueInfo
 // - SalInfoPrinter -
 // ------------------
 
-class VCL_DLLPUBLIC SalInfoPrinter
+class VCL_PLUGIN_PUBLIC SalInfoPrinter
 {
 public:
     std::vector< PaperInfo  >           m_aPaperFormats;    // all printer supported formats
@@ -104,7 +104,7 @@ public:
 // - SalPrinter -
 // --------------
 
-class VCL_DLLPUBLIC SalPrinter
+class VCL_PLUGIN_PUBLIC SalPrinter
 {
 public:                     // public for Sal Implementation
     SalPrinter() {}
diff --git a/vcl/inc/salsession.hxx b/vcl/inc/salsession.hxx
index 2da1ae551074..c11054a79eef 100644
--- a/vcl/inc/salsession.hxx
+++ b/vcl/inc/salsession.hxx
@@ -85,7 +85,7 @@ struct SalSessionQuitEvent : public SalSessionEvent
 
 typedef void(*SessionProc)( SalSessionEvent *pEvent);
 
-class VCL_DLLPUBLIC SalSession
+class VCL_PLUGIN_PUBLIC SalSession
 {
     SessionProc         m_aProc;
 public:
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 310b0a27e30f..da16d8d5b656 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -58,7 +58,7 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO     = 7;
 // - SalSystem -
 // -------------
 
-class VCL_DLLPUBLIC SalSystem
+class VCL_PLUGIN_PUBLIC SalSystem
 {
 public:
             SalSystem() {}
diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx
index 73fe3a13fd02..38dd20e69ff3 100644
--- a/vcl/inc/saltimer.hxx
+++ b/vcl/inc/saltimer.hxx
@@ -42,7 +42,7 @@
  * this needed to be virtualized for the sal plugin migration
  */
 
-class VCL_DLLPUBLIC SalTimer
+class VCL_PLUGIN_PUBLIC SalTimer
 {
     SALTIMERPROC        m_pProc;
 public:
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index 6aa3222c5d96..6bf4b820a176 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -37,7 +37,7 @@ class SalGraphics;
 // - SalVirtualDevice -
 // --------------------
 
-class VCL_DLLPUBLIC SalVirtualDevice
+class VCL_PLUGIN_PUBLIC SalVirtualDevice
 {
 public:                     // public for Sal Implementation
     SalVirtualDevice() {}
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 24d85c873572..9c91915823b2 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -28,6 +28,7 @@
 #ifndef _SV_SVDATA_HXX
 #define _SV_SVDATA_HXX
 
+#include "rtl/ref.hxx"
 #include "vos/thread.hxx"
 #include "tools/string.hxx"
 #include "tools/gen.hxx"
@@ -42,6 +43,8 @@
 #include "com/sun/star/uno/Reference.hxx"
 #include "unotools/options.hxx"
 
+#include <hash_map>
+
 namespace com {
 namespace sun {
 namespace star {
@@ -51,9 +54,6 @@ namespace lang {
 namespace frame {
     class XSessionManagerClient;
 }
-namespace awt {
-    class XDisplayConnection;
-}
 }}}
 
 struct ImplTimerData;
@@ -361,21 +361,21 @@ struct ImplSVData
     sal_Bool                    mbIsTestTool;
 
     vos::OThread::TThreadIdentifier                     mnMainThreadId;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::awt::XDisplayConnection >     mxDisplayConnection;
+    rtl::Reference< vcl::DisplayConnection >            mxDisplayConnection;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxAccessBridge;
     com::sun::star::uno::Reference< com::sun::star::frame::XSessionManagerClient > xSMClient;
     ::vcl::SettingsConfigItem*          mpSettingsConfigItem;
     std::list< vcl::DeleteOnDeinitBase* >*   mpDeinitDeleteList;
+    std::hash_map< int, rtl::OUString >*     mpPaperNames;
 };
 
 void        ImplInitSVData();
 void        ImplDeInitSVData();
 void        ImplDestroySVData();
 Window*     ImplGetDefaultWindow();
-VCL_DLLPUBLIC ResMgr*     ImplGetResMgr();
-VCL_DLLPUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr
+VCL_PLUGIN_PUBLIC ResMgr*     ImplGetResMgr();
+VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr
 DockingManager*     ImplGetDockingManager();
 void        ImplWindowAutoMnemonic( Window* pWindow );
 
@@ -391,8 +391,8 @@ void        ImplFreeEventHookData();
 long        ImplCallPreNotify( NotifyEvent& rEvt );
 long        ImplCallEvent( NotifyEvent& rEvt );
 
-extern VCL_DLLPUBLIC ImplSVData* pImplSVData;
-inline VCL_DLLPUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; }
+extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData;
+inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; }
 inline ImplSVData* ImplGetAppSVData() { return ImplGetSVData(); }
 
 bool ImplInitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled );
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 432a30c3a748..61622bcabade 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -58,6 +58,8 @@
 #define SV_DISCLOSURE_PLUS_HC               1062
 #define SV_DISCLOSURE_MINUS_HC              1063
 
+#define RID_STR_PAPERNAMES                  1070
+
 #define SV_RESID_MENU_EDIT                  2000
 #define SV_MENU_EDIT_UNDO                   1
 #define SV_MENU_EDIT_CUT                    2
@@ -147,12 +149,12 @@
 #define SV_PRINT_LOCATION_TXT               21
 #define SV_PRINT_COMMENT_TXT                22
 #define SV_PRINT_DETAILS_BTN                23
+#define SV_PRINT_OPT_REVERSE                24
 
 #define SV_PRINT_TAB_OPT                    3
 #define SV_PRINT_OPT_PRINT_FL               1
 #define SV_PRINT_OPT_TOFILE                 2
 #define SV_PRINT_OPT_SINGLEJOBS             3
-#define SV_PRINT_OPT_REVERSE                4
 
 #define SV_DLG_PRINT_PROGRESS             2049
 #define SV_PRINT_PROGRESS_CANCEL            1
diff --git a/vcl/inc/unx/dtint.hxx b/vcl/inc/unx/dtint.hxx
index ebe2cae90803..6e6cf13575ed 100644
--- a/vcl/inc/unx/dtint.hxx
+++ b/vcl/inc/unx/dtint.hxx
@@ -31,12 +31,12 @@
 #include <tools/string.hxx>
 #include <tools/color.hxx>
 #include <vcl/font.hxx>
+#include "svunx.h"
 
 class SalBitmap;
 class SalDisplay;
 class AllSettings;
 
-
 enum DtType {
     DtGeneric,
     DtCDE
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index d80f109e3e21..bc16e94f832e 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -78,11 +78,8 @@ public:
     //helper methods for frame's UpdateSettings
     void updateSettings( AllSettings& rSettings );
 
+    virtual bool            setClipRegion( const Region& );
     virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( sal_uLong nCount );
-    virtual sal_Bool            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual bool            unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
-    virtual void            EndSetClipRegion();
 
     // some themes set the background pixmap of our window EVERY time
     // a control is painted; but presentation effects need
diff --git a/vcl/inc/unx/pspgraphics.h b/vcl/inc/unx/pspgraphics.h
index c46e59e63fad..7b39ec80537c 100644
--- a/vcl/inc/unx/pspgraphics.h
+++ b/vcl/inc/unx/pspgraphics.h
@@ -88,10 +88,7 @@ public:
     virtual long            GetGraphicsWidth() const;
 
     virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( sal_uIntPtr nCount );
-    virtual sal_Bool            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual bool            unionClipRegion( const ::basegfx::B2DPolyPolygon& );
-    virtual void            EndSetClipRegion();
+    virtual bool            setClipRegion( const Region& );
 
     virtual void            SetLineColor();
     virtual void            SetLineColor( SalColor nSalColor );
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 2117f43e1a2b..b97044f8036d 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -128,7 +128,7 @@ enum SalRGB { RGB,  RBG,
               RGBA, RBGA,
               GBRA, GRBA,
               BGRA, BRGA,
-              other };
+              otherSalRGB };
 
 // -=-= SalVisual =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class SalVisual : public XVisualInfo
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index e27b2ab31e2d..a6f30ee92930 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -93,7 +93,7 @@ protected:
     CairoFontsCache m_aCairoFontsCache;
 
     XLIB_Region     pPaintRegion_;
-    XLIB_Region     pClipRegion_;
+    XLIB_Region     mpClipRegion;
 
     GC              pPenGC_;        // Pen attributes
     SalColor        nPenColor_;
@@ -136,6 +136,7 @@ protected:
     bool            bXORMode_ : 1;      // is ROP XOR Mode set
     sal_Bool            bDitherBrush_ : 1;  // is solid or tile
 
+    using SalGraphics::SetClipRegion;
     void            SetClipRegion( GC          pGC,
                                    XLIB_Region pXReg = NULL ) const;
 
@@ -231,10 +232,7 @@ public:
     virtual long            GetGraphicsHeight() const;
 
     virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( sal_uIntPtr nCount );
-    virtual sal_Bool            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual bool            unionClipRegion( const ::basegfx::B2DPolyPolygon& );
-    virtual void            EndSetClipRegion();
+    virtual bool            setClipRegion( const Region& );
 
     virtual void            SetLineColor();
     virtual void            SetLineColor( SalColor nSalColor );
diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx
index 14fd58296b0d..c143e49002fa 100644
--- a/vcl/inc/vcl/cursor.hxx
+++ b/vcl/inc/vcl/cursor.hxx
@@ -64,15 +64,13 @@ private:
     sal_Bool            mbVisible;          // Ist Cursor sichtbar
     unsigned char   mnDirection;        // indicates direction
 
-//#if 0 // _SOLAR__PRIVATE
 public:
     SAL_DLLPRIVATE void         ImplDraw();
     SAL_DLLPRIVATE void         ImplRestore();
     DECL_DLLPRIVATE_LINK(       ImplTimerHdl, AutoTimer* );
-    SAL_DLLPRIVATE void         ImplShow( sal_Bool bDrawDirect = sal_True );
-    SAL_DLLPRIVATE void         ImplHide();
+    SAL_DLLPRIVATE void         ImplShow( bool bDrawDirect = true, bool bRestore = false );
+    SAL_DLLPRIVATE bool         ImplHide();
     SAL_DLLPRIVATE void         ImplNew();
-//#endif
 
 public:
                     Cursor();
diff --git a/vcl/inc/vcl/cvtsvm.hxx b/vcl/inc/vcl/cvtsvm.hxx
index 00c7c5270a0d..ad4e38816830 100644
--- a/vcl/inc/vcl/cvtsvm.hxx
+++ b/vcl/inc/vcl/cvtsvm.hxx
@@ -92,7 +92,7 @@
 
 class Stack;
 
-class VCL_DLLPUBLIC SVMConverter
+class VCL_PLUGIN_PUBLIC SVMConverter
 {
 private:
 //#if 0 // _SOLAR__PRIVATE
diff --git a/vcl/inc/vcl/displayconnectiondispatch.hxx b/vcl/inc/vcl/displayconnectiondispatch.hxx
new file mode 100644
index 000000000000..fea1d0b7cba9
--- /dev/null
+++ b/vcl/inc/vcl/displayconnectiondispatch.hxx
@@ -0,0 +1,52 @@
+/*************************************************************************
+*
+* 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 INCLUDED_VCL_DISPLAYCONNECTIONDISPATCH_HXX
+#define INCLUDED_VCL_DISPLAYCONNECTIONDISPATCH_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/awt/XDisplayConnection.hpp"
+#include "cppuhelper/implbase1.hxx"
+
+namespace vcl {
+
+class DisplayConnectionDispatch:
+    public cppu::WeakImplHelper1< com::sun::star::awt::XDisplayConnection >
+{
+public:
+    virtual bool dispatchEvent(void * pData, int nBytes) = 0;
+
+    virtual bool dispatchErrorEvent(void * pData, int nBytes) = 0;
+
+protected:
+    virtual ~DisplayConnectionDispatch() {}
+};
+
+}
+
+#endif
diff --git a/vcl/inc/vcl/dllapi.h b/vcl/inc/vcl/dllapi.h
index bcf4001aa671..2c5c2c6801ac 100644
--- a/vcl/inc/vcl/dllapi.h
+++ b/vcl/inc/vcl/dllapi.h
@@ -37,4 +37,10 @@
 #define VCL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
+#if defined UNX && ! defined MACOS
+#define VCL_PLUGIN_PUBLIC VCL_DLLPUBLIC
+#else
+#define VCL_PLUGIN_PUBLIC SAL_DLLPRIVATE
+#endif
+
 #endif
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index 33fece8d88e1..f97f21a8f72d 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -222,7 +222,7 @@ class FontCache;
 
 class FontCache;
 
-class VCL_DLLPUBLIC PrintFontManager
+class VCL_PLUGIN_PUBLIC PrintFontManager
 {
     struct PrintFont;
     struct TrueTypeFontFile;
diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx
index 752fc6e6e4f9..b80b9a86627a 100644
--- a/vcl/inc/vcl/help.hxx
+++ b/vcl/inc/vcl/help.hxx
@@ -40,16 +40,22 @@ class Window;
 // - Help-Types -
 // --------------
 
-#define QUICKHELP_LEFT      ((sal_uInt16)0x0001)
-#define QUICKHELP_CENTER    ((sal_uInt16)0x0002)
-#define QUICKHELP_RIGHT     ((sal_uInt16)0x0004)
-#define QUICKHELP_TOP       ((sal_uInt16)0x0008)
-#define QUICKHELP_VCENTER   ((sal_uInt16)0x0010)
-#define QUICKHELP_BOTTOM    ((sal_uInt16)0x0020)
-#define QUICKHELP_NOAUTOPOS (QUICKHELP_LEFT | QUICKHELP_CENTER | QUICKHELP_RIGHT | QUICKHELP_TOP | QUICKHELP_VCENTER | QUICKHELP_BOTTOM)
-#define QUICKHELP_CTRLTEXT  ((sal_uInt16)0x0040)
-#define QUICKHELP_NOEVADEPOINTER ((sal_uInt16)0x4000)
-#define QUICKHELP_BIDI_RTL  ((sal_uInt16)0x8000)
+#define QUICKHELP_LEFT              ((sal_uInt16)0x0001)
+#define QUICKHELP_CENTER            ((sal_uInt16)0x0002)
+#define QUICKHELP_RIGHT             ((sal_uInt16)0x0004)
+#define QUICKHELP_TOP               ((sal_uInt16)0x0008)
+#define QUICKHELP_VCENTER           ((sal_uInt16)0x0010)
+#define QUICKHELP_BOTTOM            ((sal_uInt16)0x0020)
+#define QUICKHELP_NOAUTOPOS         (QUICKHELP_LEFT | QUICKHELP_CENTER | QUICKHELP_RIGHT | QUICKHELP_TOP | QUICKHELP_VCENTER | QUICKHELP_BOTTOM)
+#define QUICKHELP_CTRLTEXT          ((sal_uInt16)0x0040)
+/// force the existent tip window to be re-positioned, even if the previous incarnation has the same text. Applies to ShowBallon and ShowQuickHelp.
+#define QUICKHELP_FORCE_REPOSITION  ((sal_uInt16)0x0080)
+/// no delay when opening the quick help. Applies to ShowBallon and ShowQuickHelp
+#define QUICKHELP_NO_DELAY          ((sal_uInt16)0x0100)
+/// force balloon-style in ShowTip
+#define QUICKHELP_TIP_STYLE_BALLOON ((sal_uInt16)0x0200)
+#define QUICKHELP_NOEVADEPOINTER    ((sal_uInt16)0x4000)
+#define QUICKHELP_BIDI_RTL          ((sal_uInt16)0x8000)
 
 // By changes you must also change: rsc/vclrsc.hxx
 #define OOO_HELP_INDEX          ".help:index"
@@ -101,21 +107,25 @@ public:
 
     static void         EnableQuickHelp();
     static void         DisableQuickHelp();
-    static sal_Bool         IsQuickHelpEnabled();
-    static sal_Bool         ShowQuickHelp( Window* pParent,
+    static sal_Bool     IsQuickHelpEnabled();
+    static sal_Bool     ShowQuickHelp( Window* pParent,
                                        const Rectangle& rScreenRect,
                                        const XubString& rHelpText,
                                        const XubString& rLongHelpText,
                                        sal_uInt16 nStyle = 0 );
-    static sal_Bool         ShowQuickHelp( Window* pParent,
+    static sal_Bool     ShowQuickHelp( Window* pParent,
                                        const Rectangle& rScreenRect,
                                        const XubString& rHelpText,
                                        sal_uInt16 nStyle = 0 )
                             { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, XubString(), nStyle ); }
 
-    static sal_uLong        ShowTip( Window* pParent,
+    static sal_uLong    ShowTip( Window* pParent,
                                  const Rectangle& rScreenRect,
                                  const XubString& rText, sal_uInt16 nStyle = 0 );
+    static void         UpdateTip( sal_uLong nId,
+                                   Window* pParent,
+                                   const Rectangle& rScreenRect,
+                                   const XubString& rText );
     static void         HideTip( sal_uLong nId );
 };
 
diff --git a/vcl/inc/vcl/lineinfo.hxx b/vcl/inc/vcl/lineinfo.hxx
index 6332acb907ee..ca498c157bd7 100644
--- a/vcl/inc/vcl/lineinfo.hxx
+++ b/vcl/inc/vcl/lineinfo.hxx
@@ -56,6 +56,8 @@ struct ImplLineInfo
                         ImplLineInfo();
                         ImplLineInfo( const ImplLineInfo& rImplLineInfo );
 
+    bool operator==( const ImplLineInfo& ) const;
+
     friend SvStream&    operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo );
     friend SvStream&    operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo );
 };
diff --git a/vcl/inc/vcl/octree.hxx b/vcl/inc/vcl/octree.hxx
index 684155d075f9..88de6bcc9e68 100644
--- a/vcl/inc/vcl/octree.hxx
+++ b/vcl/inc/vcl/octree.hxx
@@ -65,7 +65,7 @@ typedef PNODE*      PPNODE;
 class ImpNodeCache;
 class BitmapReadAccess;
 
-class VCL_DLLPUBLIC Octree
+class VCL_PLUGIN_PUBLIC Octree
 {
 private:
 
@@ -127,7 +127,7 @@ inline sal_uInt16 Octree::GetBestPaletteIndex( const BitmapColor& rColor )
 // - InverseColorMap -
 // -------------------
 
-class VCL_DLLPUBLIC InverseColorMap
+class VCL_PLUGIN_PUBLIC InverseColorMap
 {
 private:
 
@@ -143,7 +143,7 @@ private:
 
 public:
 
-                        InverseColorMap( const BitmapPalette& rPal );
+    explicit            InverseColorMap( const BitmapPalette& rPal );
                         ~InverseColorMap();
 
     inline sal_uInt16       GetBestPaletteIndex( const BitmapColor& rColor );
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 88c31bd17752..1130db5bd4a2 100644..100755
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -400,7 +400,6 @@ public:
     SAL_DLLPRIVATE void         ImplInitClipRegion();
     SAL_DLLPRIVATE bool         ImplSelectClipRegion( const Region&, SalGraphics* pGraphics = NULL );
     SAL_DLLPRIVATE void         ImplSetClipRegion( const Region* pRegion );
-    SAL_DLLPRIVATE void         ImplSetTriangleClipRegion( const PolyPolygon &rPolyPolygon );
 
     SAL_DLLPRIVATE SalLayout*   ImplLayout( const String&, xub_StrLen nIndex,
                                             xub_StrLen nLen, const Point& rLogicPos = Point(0,0),
@@ -838,7 +837,6 @@ public:
 
     void                SetClipRegion();
     void                SetClipRegion( const Region& rRegion );
-    void                SetTriangleClipRegion( const PolyPolygon &rRegion );
     Region              GetClipRegion() const;
     sal_Bool                IsClipRegion() const { return mbClipRegion; }
     Region              GetActiveClipRegion() const;
@@ -1108,6 +1106,10 @@ public:
 
     void                Push( sal_uInt16 nFlags = PUSH_ALL );
     void                Pop();
+    // returns the curren stack depth; that is the number of Push() calls minus the number of Pop() calls
+    // this should not normally be used since Push and Pop must always be used symmetrically
+    // however this may be e.g. a help when debugging code in which this somehow is not the case
+    sal_uInt32          GetGCStackDepth() const;
 
     /** Query availability of alpha channel
 
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index 0f7cb805d914..4e792ef40f57 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -537,6 +537,11 @@ The following structure describes the permissions used in PDF security
         String          Producer;       // OpenOffice
     };
 
+    enum ColorMode
+    {
+        DrawColor, DrawGreyscale
+    };
+
     struct PDFWriterContext
     {
         /* must be a valid file: URL usable by osl */
@@ -599,6 +604,7 @@ The following structure describes the permissions used in PDF security
         com::sun::star::lang::Locale    DocumentLocale; // defines the document default language
         sal_uInt32                      DPIx, DPIy;     // how to handle MapMode( MAP_PIXEL )
                                                         // 0 here specifies a default handling
+        PDFWriter::ColorMode            ColorMode;
 
         PDFWriterContext() :
                 RelFsys( false ), //i56629, i49415?, i64585?
@@ -627,7 +633,8 @@ The following structure describes the permissions used in PDF security
                 OpenBookmarkLevels( -1 ),
                 Encryption(),
                 DPIx( 0 ),
-                DPIy( 0 )
+                DPIy( 0 ),
+                ColorMode( PDFWriter::DrawColor )
         {}
     };
 
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index 3584a20a92b5..2ce69ab0b660 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -340,6 +340,9 @@ public:
     sal_Bool                        SetPaperSizeUser( const Size& rSize );
     sal_Bool                        SetPaperSizeUser( const Size& rSize, bool bMatchNearest );
     Paper                   GetPaper() const;
+    static rtl::OUString        GetPaperName( Paper ePaper );
+    // return a UI string for the current paper; i_bPaperUser == false means an empty string for PAPER_USER
+    rtl::OUString               GetPaperName( bool i_bPaperUser = true ) const;
 
     // returns number of available paper formats
     int                         GetPaperInfoCount() const;
@@ -520,24 +523,24 @@ public:
     bool isDirectPrint() const;
 
     // implementation details, not usable outside vcl
-    // don't use outside vcl. Some of these ar exported for
+    // don't use outside vcl. Some of these are exported for
     // the benefit of vcl's plugins.
     // Still: DO NOT USE OUTSIDE VCL
-    int getFilteredPageCount();
+    VCL_PLUGIN_PUBLIC int getFilteredPageCount();
     SAL_DLLPRIVATE PageSize getPageFile( int i_inUnfilteredPage, GDIMetaFile& rMtf, bool i_bMayUseCache = false );
-    PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache = false );
+    VCL_PLUGIN_PUBLIC PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache = false );
     SAL_DLLPRIVATE void printFilteredPage( int i_nPage );
     SAL_DLLPRIVATE void setPrinter( const boost::shared_ptr<Printer>& );
     SAL_DLLPRIVATE void setOptionChangeHdl( const Link& );
-    void createProgressDialog();
-    bool isProgressCanceled() const;
+    VCL_PLUGIN_PUBLIC void createProgressDialog();
+    VCL_PLUGIN_PUBLIC bool isProgressCanceled() const;
     SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& );
     SAL_DLLPRIVATE const MultiPageSetup& getMultipage() const;
-    void setLastPage( sal_Bool i_bLastPage );
+    VCL_PLUGIN_PUBLIC void setLastPage( sal_Bool i_bLastPage );
     SAL_DLLPRIVATE void setReversePrint( sal_Bool i_bReverse );
     SAL_DLLPRIVATE bool getReversePrint() const;
     SAL_DLLPRIVATE void pushPropertiesToPrinter();
-    void setJobState( com::sun::star::view::PrintableState );
+    VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState );
     SAL_DLLPRIVATE bool setupPrinter( Window* i_pDlgParent );
 
     SAL_DLLPRIVATE int getPageCountProtected() const;
diff --git a/vcl/inc/vcl/region.hxx b/vcl/inc/vcl/region.hxx
index d4a9f5f5c0ab..fce105bfa8f8 100644..100755
--- a/vcl/inc/vcl/region.hxx
+++ b/vcl/inc/vcl/region.hxx
@@ -69,14 +69,19 @@ private:
     SAL_DLLPRIVATE inline void      ImplPolyPolyRegionToBandRegion();
     SAL_DLLPRIVATE const ImplRegion*    ImplGetImplRegion() const { return mpImplRegion; }
     SAL_DLLPRIVATE ImplRegion*      ImplGetImplRegion() { return mpImplRegion; }
-    SAL_DLLPRIVATE sal_Bool             ImplGetFirstRect( ImplRegionInfo& rImplRegionInfo,
-                                          long& nX, long& nY, long& nWidth, long& nHeight ) const;
-    SAL_DLLPRIVATE sal_Bool             ImplGetNextRect( ImplRegionInfo& rImplRegionInfo,
-                                         long& nX, long& nY, long& nWidth, long& nHeight ) const;
     SAL_DLLPRIVATE void             ImplBeginAddRect( );
     SAL_DLLPRIVATE sal_Bool             ImplAddRect( const Rectangle& rRect );
     SAL_DLLPRIVATE void             ImplEndAddRect( );
+    SAL_DLLPRIVATE void             ImplIntersectWithPolyPolygon( const Region& );
+    SAL_DLLPRIVATE void             ImplExcludePolyPolygon( const Region& );
+    SAL_DLLPRIVATE void             ImplUnionPolyPolygon( const Region& );
+    SAL_DLLPRIVATE void             ImplXOrPolyPolygon( const Region& );
 
+public: // public within vcl
+    VCL_PLUGIN_PUBLIC bool              ImplGetFirstRect( ImplRegionInfo& rImplRegionInfo,
+                                          long& nX, long& nY, long& nWidth, long& nHeight ) const;
+    VCL_PLUGIN_PUBLIC bool              ImplGetNextRect( ImplRegionInfo& rImplRegionInfo,
+                                         long& nX, long& nY, long& nWidth, long& nHeight ) const;
 #ifdef DBG_UTIL
     friend const char*  ImplDbgTestRegion( const void* pObj );
 #endif
diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx
index fe062429121a..f78af4321398 100755
--- a/vcl/inc/vcl/salnativewidgets.hxx
+++ b/vcl/inc/vcl/salnativewidgets.hxx
@@ -307,7 +307,7 @@ class VCL_DLLPUBLIC ImplControlValue
  *
  *   Value container for scrollbars.
  */
- class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue
+class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue
 {
     public:
         long            mnMin;
diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index 1146f1b3b842..b9feeaf3a2aa 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -150,6 +150,7 @@ struct SystemGlyphData
     unsigned long        index;
     double               x;
     double               y;
+    int                  fallbacklevel;
 };
 
 
@@ -178,12 +179,14 @@ struct SystemFontData
 // - SystemTextLayoutData -
 // --------------------
 
+typedef std::vector<SystemGlyphData> SystemGlyphDataVector;
+
 struct SystemTextLayoutData
 {
     unsigned long   nSize;                      // size in bytes of this structure
     std::vector<SystemGlyphData> rGlyphData;    // glyph data
     int             orientation;                // Text orientation
-    SystemFontData aSysFontData;                // Font data for the text layout
 };
 
 #endif // _SV_SYSDATA_HXX
+
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index 6f8273731f36..696a07ca3d42 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -85,7 +85,7 @@ class TaskPaneList;
 #define WINDOWSTATE_STATE_MAXIMIZED_HORZ ((sal_uLong)0x00000010)
 #define WINDOWSTATE_STATE_MAXIMIZED_VERT ((sal_uLong)0x00000020)
 
-class VCL_DLLPUBLIC WindowStateData
+class VCL_PLUGIN_PUBLIC WindowStateData
 {
 private:
     sal_uInt32          mnValidMask;
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 364fef4ef015..f367be85051d 100755..100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -1053,9 +1053,20 @@ public:
     void    SetAccessibleDescription( const String& rDescr );
     String  GetAccessibleDescription() const;
 
+    void    SetAccessibleRelationLabeledBy( Window* pLabeledBy );
+    Window* GetAccessibleRelationLabeledBy() const;
+
+    void    SetAccessibleRelationLabelFor( Window* pLabelFor );
+    Window* GetAccessibleRelationLabelFor() const;
+
+    void    SetAccessibleRelationMemberOf( Window* pMemberOf );
+    Window* GetAccessibleRelationMemberOf() const;
+
+
     // to avoid sending accessibility events in cases like closing dialogs
     // by default checks complete parent path
     sal_Bool    IsAccessibilityEventsSuppressed( sal_Bool bTraverseParentPath = sal_True );
+    void    SetAccessibilityEventsSuppressed(sal_Bool bSuppressed);
 
     /// request XCanvas render interface for this window
     ::com::sun::star::uno::Reference<
@@ -1080,8 +1091,7 @@ public:
     sal_Bool                    IsCreatedWithToolkit() const;
     void                    SetCreatedWithToolkit( sal_Bool b );
 
-    Window*             GetLabelFor() const;
-    Window*             GetLabeledBy() const;
+            // Deprecated - can use SetAccessibleRelationLabelFor/By nowadys
     virtual Window* GetParentLabelFor( const Window* pLabel ) const;
     virtual Window* GetParentLabeledBy( const Window* pLabeled ) const;
     KeyEvent            GetActivationKey() const;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 52c4d84f0db3..52ac23b45a48 100755
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -151,8 +151,6 @@ public:
     COLORREF                mnTextColor;        // TextColor
     RGNDATA*                mpClipRgnData;      // ClipRegion-Data
     RGNDATA*                mpStdClipRgnData;   // Cache Standard-ClipRegion-Data
-    RECT*                   mpNextClipRect;     // Naechstes ClipRegion-Rect
-    sal_Bool                    mbFirstClipRect;    // Flag for first cliprect to insert
     LOGFONTA*               mpLogFont;          // LOG-Font which is currently selected (only W9x)
     ImplFontAttrCache*      mpFontAttrCache;    // Cache font attributes from files in so/share/fonts
     BYTE*                   mpFontCharSets;     // All Charsets for the current font
@@ -182,8 +180,7 @@ public:
     virtual ~WinSalGraphics();
 
 protected:
-    virtual sal_Bool        unionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual bool                unionClipRegion( const ::basegfx::B2DPolyPolygon& );
+    virtual bool        setClipRegion( const Region& );
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     virtual void        drawPixel( long nX, long nY );
     virtual void        drawPixel( long nX, long nY, SalColor nSalColor );
@@ -255,11 +252,6 @@ public:
 
     // set the clip region to empty
     virtual void            ResetClipRegion();
-    // begin setting the clip region, add rectangles to the
-    // region with the UnionClipRegion call
-    virtual void            BeginSetClipRegion( sal_uIntPtr nCount );
-    // all rectangles were added and the clip region should be set now
-    virtual void            EndSetClipRegion();
 
     // set the line color to transparent (= don't draw lines)
     virtual void            SetLineColor();
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 4a9afddea8b0..4011584890cf 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -210,6 +210,24 @@ struct ImplFrameData
     sal_Bool                mbInternalDragGestureRecognizer;
 };
 
+// -----------------------
+// - ImplAccessibleInfos -
+// -----------------------
+
+struct ImplAccessibleInfos
+{
+    sal_uInt16 nAccessibleRole;
+    String* pAccessibleName;
+    String* pAccessibleDescription;
+    Window* pLabeledByWindow;
+    Window* pLabelForWindow;
+    Window* pMemberOfWindow;
+
+    ImplAccessibleInfos();
+    ~ImplAccessibleInfos();
+};
+
+
 // ---------------
 // - WindowImpl -
 // ---------------
diff --git a/vcl/inc/xconnection.hxx b/vcl/inc/xconnection.hxx
index aa9d37430ea6..d43e02941cb3 100644
--- a/vcl/inc/xconnection.hxx
+++ b/vcl/inc/xconnection.hxx
@@ -28,11 +28,12 @@
 #ifndef _VCL_XCONNECTION_HXX
 #define _VCL_XCONNECTION_HXX
 
-#include <com/sun/star/awt/XDisplayConnection.hpp>
-#include <cppuhelper/implbase1.hxx>
 #include <osl/mutex.hxx>
+#include <rtl/ref.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
+#include "vcl/displayconnectiondispatch.hxx"
+
 #ifndef _STLP_LIST
 #include <list>
 #endif
@@ -40,7 +41,7 @@
 namespace vcl {
 
     class DisplayConnection :
-        public ::cppu::WeakImplHelper1< ::com::sun::star::awt::XDisplayConnection >
+        public DisplayConnectionDispatch
     {
         ::osl::Mutex                    m_aMutex;
         ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler > >
@@ -52,9 +53,11 @@ namespace vcl {
         DisplayConnection();
         virtual ~DisplayConnection();
 
-        static bool dispatchEvent( void* pThis, void* pData, int nBytes );
-        static bool dispatchErrorEvent( void* pThis, void* pData, int nBytes );
-        void dispatchDowningEvent();
+        void start();
+        void terminate();
+
+        virtual bool dispatchEvent( void* pData, int nBytes );
+        virtual bool dispatchErrorEvent( void* pData, int nBytes );
 
         // XDisplayConnection
         virtual void SAL_CALL addEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw();