CWS-TOOLING: integrate CWS gridsort

81 files changed, 5309 insertions, 2067 deletions

diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index fa6d3f4d591f..caf1c045be03 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -99,6 +99,8 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
     toolkit/source/controls/grid/defaultgridcolumnmodel \
     toolkit/source/controls/grid/defaultgriddatamodel \
     toolkit/source/controls/grid/gridcolumn \
+    toolkit/source/controls/grid/grideventforwarder \
+    toolkit/source/controls/grid/sortablegriddatamodel \
     toolkit/source/controls/grid/gridcontrol \
     toolkit/source/controls/roadmapcontrol \
     toolkit/source/controls/roadmapentry \
diff --git a/toolkit/inc/toolkit/controls/animatedimages.hxx b/toolkit/inc/toolkit/controls/animatedimages.hxx
index 96791c252b0b..c19ed5e5451c 100755
--- a/toolkit/inc/toolkit/controls/animatedimages.hxx
+++ b/toolkit/inc/toolkit/controls/animatedimages.hxx
@@ -57,7 +57,7 @@ namespace toolkit
     class AnimatedImagesControl : public AnimatedImagesControl_Base
     {
     public:
-                                    AnimatedImagesControl();
+                                    AnimatedImagesControl( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & i_factory );
         ::rtl::OUString             GetComponentServiceName();
 
         // XAnimation
@@ -93,7 +93,7 @@ namespace toolkit
     class AnimatedImagesControlModel : public AnimatedImagesControlModel_Base
     {
     public:
-                                        AnimatedImagesControlModel();
+                                        AnimatedImagesControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & i_factory );
                                         AnimatedImagesControlModel( const AnimatedImagesControlModel& i_copySource );
 
         virtual UnoControlModel*        Clone() const;
diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
index 2246ec0204b4..3090eba68749 100644
--- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
@@ -104,7 +104,7 @@ protected:
     UnoControlModelHolderList::iterator         ImplFindElement( const ::rtl::OUString& rName );
 
 public:
-                        ControlModelContainerBase();
+                        ControlModelContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         ControlModelContainerBase( const ControlModelContainerBase& rModel );
                         ~ControlModelContainerBase();
 
@@ -232,8 +232,11 @@ protected:
     void        ImplUpdateResourceResolver();
     void        ImplStartListingForResourceEvents();
     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > Impl_getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL );
-public:
+
     ControlContainerBase();
+
+public:
+    ControlContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ~ControlContainerBase();
 
     DECLIMPL_SERVICEINFO_DERIVED( ControlContainerBase, UnoControlBase, "toolkit.ControlContainerBase" )
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index 1ab0120ec470..17b958aeace9 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -48,7 +48,7 @@ protected:
     ::com::sun::star::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const;
     ::cppu::IPropertyArrayHelper&       SAL_CALL getInfoHelper();
 public:
-                        UnoControlDialogModel();
+                        UnoControlDialogModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlDialogModel( const UnoControlDialogModel& rModel );
                         ~UnoControlDialogModel();
 
@@ -76,8 +76,8 @@ private:
 
 public:
 
-    UnoDialogControl();
-    ~UnoDialogControl();
+                                UnoDialogControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+                                ~UnoDialogControl();
     ::rtl::OUString             GetComponentServiceName();
 
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlContainer::queryInterface(rType); }
diff --git a/toolkit/inc/toolkit/controls/formattedcontrol.hxx b/toolkit/inc/toolkit/controls/formattedcontrol.hxx
index f589dabd47aa..93f675dae03f 100644
--- a/toolkit/inc/toolkit/controls/formattedcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/formattedcontrol.hxx
@@ -67,8 +67,11 @@ namespace toolkit
                 ) throw (::com::sun::star::uno::Exception);
 
     public:
-                            UnoControlFormattedFieldModel();
-                            UnoControlFormattedFieldModel( const UnoControlFormattedFieldModel& rModel ) : UnoControlModel( rModel ) {;}
+                            UnoControlFormattedFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+                            UnoControlFormattedFieldModel( const UnoControlFormattedFieldModel& rModel )
+                                :UnoControlModel( rModel )
+                            {
+                            }
 
         UnoControlModel*    Clone() const { return new UnoControlFormattedFieldModel( *this ); }
 
@@ -110,7 +113,7 @@ namespace toolkit
     class UnoFormattedFieldControl : public UnoSpinFieldControl
     {
     public:
-                            UnoFormattedFieldControl();
+                            UnoFormattedFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
         ::rtl::OUString     GetComponentServiceName();
 
         // ::com::sun::star::awt::XTextListener
diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
index 558d145f3d14..ef86ec8eb5b8 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
@@ -185,8 +185,7 @@ FORWARD_DECLARE_INTERFACE( script, XNameContainer )
         ,public ::comphelper::OAggregationArrayUsageHelper< OTemplateInstanceDisambiguation< CONTROLMODEL > >
     {
     public:
-        OGeometryControlModel();
-        OGeometryControlModel(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_xCompContext);
+        OGeometryControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
 
     private:
         OGeometryControlModel(::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance);
diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
index 3b784251b65e..0b2362656433 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
+++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
@@ -32,17 +32,17 @@
 //====================================================================
 //--------------------------------------------------------------------
 template <class CONTROLMODEL>
-OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel()
-    :OGeometryControlModel_Base(new CONTROLMODEL)
-{
-}
-
-template <class CONTROLMODEL>
-OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_xCompContext)
-    :OGeometryControlModel_Base(new CONTROLMODEL(i_xCompContext))
+OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+    :OGeometryControlModel_Base(new CONTROLMODEL( i_factory ) )
 {
 }
 
+//template <class CONTROLMODEL>
+//OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_xCompContext)
+//  :OGeometryControlModel_Base(new CONTROLMODEL(i_xCompContext))
+//{
+//}
+//
 //--------------------------------------------------------------------
 template <class CONTROLMODEL>
 OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel(::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance)
diff --git a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
index 1b86d277fde2..0848fb21b8b5 100644
--- a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
@@ -45,37 +45,37 @@
 #include <cppuhelper/implbase4.hxx>
 
 
-
 #include <comphelper/uno3.hxx>
 
-typedef GraphicControlModel UnoControlRoadmapModel_Base;
+//........................................................................
+namespace toolkit
+{
+//........................................................................
 
+    typedef GraphicControlModel UnoControlRoadmapModel_Base;
 
-typedef ::cppu::ImplHelper3 <   ::com::sun::star::lang::XSingleServiceFactory
-                            ,   ::com::sun::star::container::XContainer
-                            ,   ::com::sun::star::container::XIndexContainer
-                            >   UnoControlRoadmapModel_IBase;
 
+    typedef ::cppu::ImplHelper3 <   ::com::sun::star::lang::XSingleServiceFactory
+                                ,   ::com::sun::star::container::XContainer
+                                ,   ::com::sun::star::container::XIndexContainer
+                                >   UnoControlRoadmapModel_IBase;
 
 
-typedef UnoControlBase  UnoControlRoadmap_Base;
-typedef ::cppu::ImplHelper4 <   ::com::sun::star::awt::XItemEventBroadcaster
-                            ,   ::com::sun::star::container::XContainerListener
-                            ,   ::com::sun::star::awt::XItemListener
-                            ,   ::com::sun::star::beans::XPropertyChangeListener
-                            >   UnoControlRoadmap_IBase;
 
+    typedef UnoControlBase  UnoControlRoadmap_Base;
+    typedef ::cppu::ImplHelper4 <   ::com::sun::star::awt::XItemEventBroadcaster
+                                ,   ::com::sun::star::container::XContainerListener
+                                ,   ::com::sun::star::awt::XItemListener
+                                ,   ::com::sun::star::beans::XPropertyChangeListener
+                                >   UnoControlRoadmap_IBase;
 
 
 
-typedef ::cppu::ImplHelper2< ::com::sun::star::container::XContainerListener,
-                             ::com::sun::star::awt::XItemEventBroadcaster>    SVTXRoadmap_Base;
 
+    typedef ::cppu::ImplHelper2< ::com::sun::star::container::XContainerListener,
+                                 ::com::sun::star::awt::XItemEventBroadcaster>    SVTXRoadmap_Base;
 
-//........................................................................
 
-namespace toolkit{
-//........................................................................
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star::lang;
@@ -110,7 +110,7 @@ namespace toolkit{
         ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
     public:
-        UnoControlRoadmapModel();
+        UnoControlRoadmapModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
         UnoControlRoadmapModel( const UnoControlRoadmapModel& rModel ) :
             UnoControlRoadmapModel_Base( rModel ),
             UnoControlRoadmapModel_IBase( rModel ),
@@ -167,7 +167,7 @@ namespace toolkit{
     private:
         ItemListenerMultiplexer                 maItemListeners;
     public:
-                            UnoRoadmapControl();
+                            UnoRoadmapControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
         ::rtl::OUString     GetComponentServiceName();
 
     void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); }
diff --git a/toolkit/inc/toolkit/controls/spinningprogress.hxx b/toolkit/inc/toolkit/controls/spinningprogress.hxx
index b2e8204ca999..e0a676b2aa86 100755
--- a/toolkit/inc/toolkit/controls/spinningprogress.hxx
+++ b/toolkit/inc/toolkit/controls/spinningprogress.hxx
@@ -44,7 +44,7 @@ namespace toolkit
     class SpinningProgressControlModel : public SpinningProgressControlModel_Base
     {
     public:
-                                    SpinningProgressControlModel();
+                                    SpinningProgressControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & i_factory );
                                     SpinningProgressControlModel( const SpinningProgressControlModel& i_copySource );
 
         virtual UnoControlModel*    Clone() const;
diff --git a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
index 6861f4bc01bb..c7a2e3b8ef90 100644
--- a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
+++ b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
@@ -66,7 +66,7 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
 
 public:
-    UnoControlTabPageContainerModel();
+    UnoControlTabPageContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     UnoControlTabPageContainerModel( const UnoControlTabPageContainerModel& rModel ) : UnoControlTabPageContainerModel_Base( rModel ),maContainerListeners( *this ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlTabPageContainerModel( *this ); }
@@ -113,7 +113,7 @@ typedef ::cppu::AggImplInheritanceHelper1   <   ControlContainerBase
 class UnoControlTabPageContainer : public UnoControlTabPageContainer_Base
 {
 public:
-    UnoControlTabPageContainer();
+    UnoControlTabPageContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString             GetComponentServiceName();
 
     // ::com::sun::star::lang::XComponent
diff --git a/toolkit/inc/toolkit/controls/tabpagemodel.hxx b/toolkit/inc/toolkit/controls/tabpagemodel.hxx
index 76edc2e68026..08938669fa58 100644
--- a/toolkit/inc/toolkit/controls/tabpagemodel.hxx
+++ b/toolkit/inc/toolkit/controls/tabpagemodel.hxx
@@ -93,12 +93,11 @@
 class UnoControlTabPageModel :  public ControlModelContainerBase
                                 //public TabPageModel
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xCompContext;
 protected:
     ::com::sun::star::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const;
     ::cppu::IPropertyArrayHelper&       SAL_CALL getInfoHelper();
 public:
-    UnoControlTabPageModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_xCompContext);
+    UnoControlTabPageModel( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & i_factory);
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -127,7 +126,7 @@ private:
     bool            m_bWindowListener;
 public:
 
-    UnoControlTabPage();
+    UnoControlTabPage( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ~UnoControlTabPage();
     ::rtl::OUString             GetComponentServiceName();
 
diff --git a/toolkit/inc/toolkit/controls/tkscrollbar.hxx b/toolkit/inc/toolkit/controls/tkscrollbar.hxx
index 78795aa240c2..da3d97ab1bc2 100644
--- a/toolkit/inc/toolkit/controls/tkscrollbar.hxx
+++ b/toolkit/inc/toolkit/controls/tkscrollbar.hxx
@@ -50,7 +50,7 @@ namespace toolkit
         ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
     public:
-                            UnoControlScrollBarModel();
+                            UnoControlScrollBarModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                             UnoControlScrollBarModel( const UnoControlScrollBarModel& rModel ) : UnoControlModel( rModel ) {;}
 
         UnoControlModel*    Clone() const { return new UnoControlScrollBarModel( *this ); }
@@ -76,7 +76,7 @@ namespace toolkit
         AdjustmentListenerMultiplexer maAdjustmentListeners;
 
     public:
-                                    UnoScrollBarControl();
+                                    UnoScrollBarControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
         ::rtl::OUString             GetComponentServiceName();
 
         ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
diff --git a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
index 1d059c749902..a0ddfc0dbf8d 100644
--- a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
+++ b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
@@ -51,7 +51,7 @@ namespace toolkit
         ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
     public:
-                            UnoSimpleAnimationControlModel();
+                            UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                             UnoSimpleAnimationControlModel( const UnoSimpleAnimationControlModel& rModel ) : UnoControlModel( rModel ) {;}
 
         UnoControlModel*    Clone() const { return new UnoSimpleAnimationControlModel( *this ); }
@@ -80,7 +80,7 @@ namespace toolkit
     private:
 
     public:
-                                    UnoSimpleAnimationControl();
+                                    UnoSimpleAnimationControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
         ::rtl::OUString             GetComponentServiceName();
 
         // XSimpleAnimation
diff --git a/toolkit/inc/toolkit/controls/tkspinbutton.hxx b/toolkit/inc/toolkit/controls/tkspinbutton.hxx
index 48c602f76cfc..7600c3e6f9e7 100644
--- a/toolkit/inc/toolkit/controls/tkspinbutton.hxx
+++ b/toolkit/inc/toolkit/controls/tkspinbutton.hxx
@@ -51,7 +51,7 @@ namespace toolkit
         ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
     public:
-                            UnoSpinButtonModel();
+                            UnoSpinButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                             UnoSpinButtonModel( const UnoSpinButtonModel& rModel ) : UnoControlModel( rModel ) {;}
 
         UnoControlModel*    Clone() const { return new UnoSpinButtonModel( *this ); }
@@ -82,7 +82,7 @@ namespace toolkit
         AdjustmentListenerMultiplexer maAdjustmentListeners;
 
     public:
-                                    UnoSpinButtonControl();
+                                    UnoSpinButtonControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
         ::rtl::OUString             GetComponentServiceName();
 
         DECLARE_UNO3_AGG_DEFAULTS( UnoSpinButtonControl, UnoControlBase );
diff --git a/toolkit/inc/toolkit/controls/tkthrobber.hxx b/toolkit/inc/toolkit/controls/tkthrobber.hxx
index d6c3a3d8a511..1c149639fc47 100644
--- a/toolkit/inc/toolkit/controls/tkthrobber.hxx
+++ b/toolkit/inc/toolkit/controls/tkthrobber.hxx
@@ -51,7 +51,7 @@ namespace toolkit
         ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
     public:
-                            UnoThrobberControlModel();
+                            UnoThrobberControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                             UnoThrobberControlModel( const UnoThrobberControlModel& rModel ) : UnoControlModel( rModel ) {;}
 
         UnoControlModel*    Clone() const { return new UnoThrobberControlModel( *this ); }
@@ -80,7 +80,7 @@ namespace toolkit
     private:
 
     public:
-                                    UnoThrobberControl();
+                                    UnoThrobberControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
         ::rtl::OUString             GetComponentServiceName();
 
         DECLARE_UNO3_AGG_DEFAULTS( UnoThrobberControl, UnoControlBase );
diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx
index 6bcfa519ed3d..44836ec28dd6 100644
--- a/toolkit/inc/toolkit/controls/unocontrol.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrol.hxx
@@ -49,6 +49,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase9.hxx>
+#include <comphelper/componentcontext.hxx>
 #include <com/sun/star/util/XModeChangeBroadcaster.hpp>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 
@@ -95,6 +96,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >   mxVclWindowPeer; // just to avoid the query_interface thing
 
 protected:
+    const ::comphelper::ComponentContext    maContext;
     EventListenerMultiplexer            maDisposeListeners;
     WindowListenerMultiplexer           maWindowListeners;
     FocusListenerMultiplexer            maFocusListeners;
@@ -144,8 +146,11 @@ protected:
 
     virtual sal_Bool   requiresNewPeer( const ::rtl::OUString& _rPropertyName ) const;
 
-public:
+protected:
                 UnoControl();
+
+public:
+                UnoControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                 ~UnoControl();
 
                 UnoControlComponentInfos&           GetComponentInfos() { return maComponentInfos; }
diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
index f12dd23a5c67..1ce56c11cec1 100644
--- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
@@ -39,6 +39,14 @@
 class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl
 {
 protected:
+    UnoControlBase();
+
+protected:
+    UnoControlBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+        :UnoControl( i_factory )
+    {
+    }
+
     sal_Bool                    ImplHasProperty( sal_uInt16 nProp );
     sal_Bool                    ImplHasProperty( const ::rtl::OUString& aPropertyName );
     void                        ImplSetPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Bool bUpdateThis );
diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
index 1175d0e85abb..dcba4fdcbf9a 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
@@ -64,8 +64,9 @@ protected:
     void                                    ImplActivateTabControllers();
 
 public:
-                UnoControlContainer();
-                UnoControlContainer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >  xPeer );
+                UnoControlContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+                UnoControlContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory,
+                                     const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xPeer );
                 ~UnoControlContainer();
 
 
diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
index ef0d9a4068ee..cdc908718988 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
@@ -45,7 +45,7 @@ protected:
     ::cppu::IPropertyArrayHelper&                                                   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlContainerModel();
+                        UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlContainerModel( const UnoControlContainerModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlContainerModel( *this ); }
diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
index 5ac3c33aa1c9..bdb6e5d4bc68 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
@@ -44,6 +44,9 @@
 
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/implbase7.hxx>
+#include <comphelper/componentcontext.hxx>
+#include <comphelper/uno3.hxx>
 
 #include <list>
 
@@ -53,21 +56,25 @@ class ImplPropertyTable;
 //  class UnoControlModel
 //  ----------------------------------------------------
 
-class TOOLKIT_DLLPUBLIC UnoControlModel :   public ::com::sun::star::awt::XControlModel,
-                        public ::com::sun::star::beans::XPropertyState,
-                        public ::com::sun::star::io::XPersistObject,
-                        public ::com::sun::star::lang::XComponent,
-                        public ::com::sun::star::lang::XServiceInfo,
-                        public ::com::sun::star::lang::XTypeProvider,
-                        public ::com::sun::star::lang::XUnoTunnel,
-                        public ::com::sun::star::util::XCloneable,
-                        public MutexAndBroadcastHelper,
-                        public ::cppu::OPropertySetHelper,
-                        public ::cppu::OWeakAggObject
+typedef ::cppu::WeakAggImplHelper7  <   ::com::sun::star::awt::XControlModel
+                                    ,   ::com::sun::star::beans::XPropertyState
+                                    ,   ::com::sun::star::io::XPersistObject
+                                    ,   ::com::sun::star::lang::XComponent
+                                    ,   ::com::sun::star::lang::XServiceInfo
+                                    ,   ::com::sun::star::lang::XUnoTunnel
+                                    ,   ::com::sun::star::util::XCloneable
+                                    >   UnoControlModel_Base;
+
+class TOOLKIT_DLLPUBLIC UnoControlModel :public UnoControlModel_Base
+                                        ,public MutexAndBroadcastHelper
+                                        ,public ::cppu::OPropertySetHelper
 {
 private:
-    ImplPropertyTable*          mpData;
-    EventListenerMultiplexer    maDisposeListeners;
+    ImplPropertyTable*                      mpData;
+    EventListenerMultiplexer                maDisposeListeners;
+
+protected:
+    const ::comphelper::ComponentContext    maContext;
 
 protected:
     void                                        ImplRegisterProperty( sal_uInt16 nPropType );
@@ -99,18 +106,21 @@ protected:
                 sal_Int32 _nSecondHandle                /// second handle, which should supersede _nFirstHandle in the sequence
             ) const;
 
-public:
+protected:
                 UnoControlModel();
+public:
+                UnoControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                 UnoControlModel( const UnoControlModel& rModel );
                 ~UnoControlModel();
 
     virtual UnoControlModel*    Clone() const = 0;
 
-    // ::com::sun::star::uno::XAggregation
+    // ::com::sun::star::uno::XInterface
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return OWeakAggObject::queryInterface(rType); }
-    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
-    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    void                        SAL_CALL acquire() throw();
+    void                        SAL_CALL release() throw();
 
+    // ::com::sun::star::uno::XAggregation
     ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XUnoTunnel
@@ -122,10 +132,7 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XTypeProvider
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::awt::XControlModel
+    DECLARE_XTYPEPROVIDER()
 
     // ::com::sun::star::lang::XComponent
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 21af6d2b45e6..09622d2c8ef8 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -82,7 +82,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlEditModel();
+                        UnoControlEditModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlEditModel( const UnoControlEditModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlEditModel( *this ); }
@@ -124,7 +124,7 @@ private:
 
 public:
 
-                                UnoEditControl();
+                                UnoEditControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString             GetComponentServiceName();
     TextListenerMultiplexer&    GetTextListeners()  { return maTextListeners; }
 
@@ -185,7 +185,7 @@ protected:
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlFileControlModel();
+                        UnoControlFileControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlFileControlModel( const UnoControlFileControlModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlFileControlModel( *this ); }
@@ -206,7 +206,7 @@ public:
 class UnoFileControl : public UnoEditControl
 {
 public:
-                        UnoFileControl();
+                        UnoFileControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     // ::com::sun::star::lang::XServiceInfo
@@ -226,7 +226,12 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL );
 
 protected:
-    GraphicControlModel() : mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
+    GraphicControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+        :UnoControlModel( i_factory )
+        ,mbAdjustingImagePosition( false )
+        ,mbAdjustingGraphic( false )
+    {
+    }
     GraphicControlModel( const GraphicControlModel& _rSource ) : UnoControlModel( _rSource ), mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
 
     // ::cppu::OPropertySetHelper
@@ -242,14 +247,14 @@ private:
 //  ----------------------------------------------------
 //  class UnoControlButtonModel
 //  ----------------------------------------------------
-class UnoControlButtonModel :   public GraphicControlModel
+class UnoControlButtonModel : public GraphicControlModel
 {
 protected:
     ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlButtonModel();
+                        UnoControlButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlButtonModel( const UnoControlButtonModel& rModel ) : GraphicControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlButtonModel( *this ); }
@@ -282,7 +287,7 @@ private:
 
 public:
 
-                        UnoButtonControl();
+                        UnoButtonControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
@@ -327,7 +332,7 @@ protected:
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
 public:
-                                    UnoControlImageControlModel();
+                                    UnoControlImageControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                                     UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : GraphicControlModel( rModel ), mbAdjustingImageScaleMode( false ) { }
 
     UnoControlModel*    Clone() const { return new UnoControlImageControlModel( *this ); }
@@ -359,7 +364,7 @@ private:
 
 public:
 
-                            UnoImageControlControl();
+                            UnoImageControlControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString         GetComponentServiceName();
 
     void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -387,7 +392,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlRadioButtonModel();
+                        UnoControlRadioButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlRadioButtonModel( const UnoControlRadioButtonModel& rModel ) : GraphicControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlRadioButtonModel( *this ); }
@@ -421,7 +426,7 @@ private:
 
 public:
 
-                            UnoRadioButtonControl();
+                            UnoRadioButtonControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString         GetComponentServiceName();
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
@@ -466,7 +471,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlCheckBoxModel();
+                        UnoControlCheckBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlCheckBoxModel( const UnoControlCheckBoxModel& rModel ) : GraphicControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlCheckBoxModel( *this ); }
@@ -499,7 +504,7 @@ private:
 
 public:
 
-                            UnoCheckBoxControl();
+                            UnoCheckBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                             ~UnoCheckBoxControl(){;}
     ::rtl::OUString         GetComponentServiceName();
 
@@ -547,7 +552,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-    UnoControlFixedHyperlinkModel();
+    UnoControlFixedHyperlinkModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     UnoControlFixedHyperlinkModel( const UnoControlFixedHyperlinkModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlFixedHyperlinkModel( *this ); }
@@ -573,7 +578,7 @@ private:
     ActionListenerMultiplexer   maActionListeners;
 
 public:
-    UnoFixedHyperlinkControl();
+    UnoFixedHyperlinkControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
 
     ::rtl::OUString     GetComponentServiceName();
 
@@ -621,7 +626,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlFixedTextModel();
+                        UnoControlFixedTextModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlFixedTextModel( const UnoControlFixedTextModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlFixedTextModel( *this ); }
@@ -645,7 +650,7 @@ class UnoFixedTextControl : public UnoControlBase,
                             public ::com::sun::star::awt::XLayoutConstrains
 {
 public:
-                        UnoFixedTextControl();
+                        UnoFixedTextControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
@@ -686,7 +691,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlGroupBoxModel();
+                        UnoControlGroupBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlGroupBoxModel( const UnoControlGroupBoxModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlGroupBoxModel( *this ); }
@@ -708,7 +713,7 @@ public:
 class UnoGroupBoxControl :  public UnoControlBase
 {
 public:
-                        UnoGroupBoxControl();
+                        UnoGroupBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     sal_Bool SAL_CALL isTransparent(  ) throw(::com::sun::star::uno::RuntimeException);
@@ -725,12 +730,20 @@ struct UnoControlListBoxModel_Data;
 typedef ::cppu::AggImplInheritanceHelper1   <   UnoControlModel
                                             ,   ::com::sun::star::awt::XItemList
                                             >   UnoControlListBoxModel_Base;
-class TOOLKIT_DLLPUBLIC UnoControlListBoxModel    :public UnoControlListBoxModel_Base
+class TOOLKIT_DLLPUBLIC UnoControlListBoxModel : public UnoControlListBoxModel_Base
 {
 protected:
-    UnoControlListBoxModel(bool asComboBox);
+    enum ConstructorMode
+    {
+        ConstructDefault,
+        ConstructWithoutProperties
+    };
+
 public:
-                        UnoControlListBoxModel();
+                        UnoControlListBoxModel(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory,
+                            ConstructorMode const i_mode = ConstructDefault
+                        );
                         UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource );
                         ~UnoControlListBoxModel();
 
@@ -828,7 +841,7 @@ typedef ::cppu::AggImplInheritanceHelper5   <   UnoControlBase
 class TOOLKIT_DLLPUBLIC UnoListBoxControl : public UnoListBoxControl_Base
 {
 public:
-                        UnoListBoxControl();
+                        UnoListBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
@@ -908,7 +921,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlComboBoxModel();
+                        UnoControlComboBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlComboBoxModel( const UnoControlComboBoxModel& rModel ) : UnoControlListBoxModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlComboBoxModel( *this ); }
@@ -942,7 +955,7 @@ private:
 
 public:
 
-                UnoComboBoxControl();
+                        UnoComboBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
@@ -1009,7 +1022,7 @@ private:
     sal_Bool                        mbRepeat;
 
 public:
-                                UnoSpinFieldControl();
+                                UnoSpinFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
 
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoEditControl::queryInterface(rType); }
     ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
@@ -1047,7 +1060,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                UnoControlDateFieldModel();
+                UnoControlDateFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                 UnoControlDateFieldModel( const UnoControlDateFieldModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlDateFieldModel( *this ); }
@@ -1074,7 +1087,7 @@ private:
     sal_Int32       mnLast;
     sal_Bool        mbLongFormat;
 public:
-                    UnoDateFieldControl();
+                            UnoDateFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString         GetComponentServiceName();
 
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
@@ -1123,7 +1136,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlTimeFieldModel();
+                        UnoControlTimeFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlTimeFieldModel( const UnoControlTimeFieldModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlTimeFieldModel( *this ); }
@@ -1150,7 +1163,7 @@ private:
     sal_Int32       mnLast;
 
 public:
-                        UnoTimeFieldControl();
+                        UnoTimeFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
@@ -1198,7 +1211,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                UnoControlNumericFieldModel();
+                UnoControlNumericFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                 UnoControlNumericFieldModel( const UnoControlNumericFieldModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlNumericFieldModel( *this ); }
@@ -1225,7 +1238,7 @@ private:
     double mnLast;
 
 public:
-                        UnoNumericFieldControl();
+                        UnoNumericFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
@@ -1275,7 +1288,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlCurrencyFieldModel();
+                        UnoControlCurrencyFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlCurrencyFieldModel( const UnoControlCurrencyFieldModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlCurrencyFieldModel( *this ); }
@@ -1302,7 +1315,7 @@ private:
     double mnLast;
 
 public:
-                        UnoCurrencyFieldControl();
+                        UnoCurrencyFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
@@ -1351,7 +1364,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlPatternFieldModel();
+                        UnoControlPatternFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlPatternFieldModel( const UnoControlPatternFieldModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlPatternFieldModel( *this ); }
@@ -1377,7 +1390,7 @@ protected:
     void            ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
 
 public:
-                        UnoPatternFieldControl();
+                        UnoPatternFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
@@ -1412,7 +1425,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlProgressBarModel();
+                        UnoControlProgressBarModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlProgressBarModel( const UnoControlProgressBarModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlProgressBarModel( *this ); }
@@ -1434,7 +1447,7 @@ class UnoProgressBarControl :   public UnoControlBase,
                                 public ::com::sun::star::awt::XProgressBar
 {
 public:
-                                UnoProgressBarControl();
+                                UnoProgressBarControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString             GetComponentServiceName();
 
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
@@ -1468,7 +1481,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-                        UnoControlFixedLineModel();
+                        UnoControlFixedLineModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
                         UnoControlFixedLineModel( const UnoControlFixedLineModel& rModel ) : UnoControlModel( rModel ) {;}
 
     UnoControlModel*    Clone() const { return new UnoControlFixedLineModel( *this ); }
@@ -1490,7 +1503,7 @@ public:
 class UnoFixedLineControl : public UnoControlBase
 {
 public:
-                        UnoFixedLineControl();
+                        UnoFixedLineControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString     GetComponentServiceName();
 
     sal_Bool SAL_CALL isTransparent(  ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx b/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx
index 45e0bdf93dc4..4ae1dd17c62f 100644
--- a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx
+++ b/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx
@@ -39,7 +39,6 @@ class MutexAndBroadcastHelper
 public:
     MutexAndBroadcastHelper() : BrdcstHelper( Mutex ) {}
 
-
     ::osl::Mutex                Mutex;
     ::cppu::OBroadcastHelper    BrdcstHelper;
 
@@ -47,11 +46,6 @@ public:
     ::cppu::OBroadcastHelper&   GetBroadcastHelper() { return BrdcstHelper; }
 };
 
-
-
-
-
-
 #endif  // _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX
 
 
diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx
index 082ac75bafae..c2d6380dcb65 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ b/toolkit/inc/toolkit/helper/property.hxx
@@ -177,7 +177,7 @@ namespace rtl {
 #define BASEPROPERTY_TREE_ROOTDISPLAYED             127
 #define BASEPROPERTY_TREE_SHOWSHANDLES              128
 #define BASEPROPERTY_TREE_SHOWSROOTHANDLES          129
-#define BASEPROPERTY_TREE_ROWHEIGHT                 130
+#define BASEPROPERTY_ROW_HEIGHT                     130
 #define BASEPROPERTY_TREE_INVOKESSTOPNODEEDITING    131
 #define BASEPROPERTY_TREE_END                       131
 #define BASEPROPERTY_DIALOGSOURCEURL                132
@@ -196,13 +196,16 @@ namespace rtl {
 #define BASEPROPERTY_ENABLEVISIBLE                  145  // sal_Bool
 #define BASEPROPERTY_REFERENCE_DEVICE               146
 #define BASEPROPERTY_HIGHCONTRASTMODE               147
-#define BASEPROPERTY_GRID_EVEN_ROW_BACKGROUND       148
-#define BASEPROPERTY_GRID_HEADER_BACKGROUND         149
-#define BASEPROPERTY_GRID_LINE_COLOR                150
-#define BASEPROPERTY_GRID_ROW_BACKGROUND            151
+#define BASEPROPERTY_GRID_HEADER_BACKGROUND         148
+#define BASEPROPERTY_GRID_HEADER_TEXT_COLOR         149
+#define BASEPROPERTY_GRID_ROW_BACKGROUND_COLORS     150
+#define BASEPROPERTY_GRID_LINE_COLOR                151
 #define BASEPROPERTY_MULTISELECTION_SIMPLEMODE      152
 #define BASEPROPERTY_ITEM_SEPARATOR_POS             153
 #define BASEPROPERTY_AUTO_REPEAT                    154
+#define BASEPROPERTY_ROW_HEADER_WIDTH               155
+#define BASEPROPERTY_COLUMN_HEADER_HEIGHT           156
+#define BASEPROPERTY_USE_GRID_LINES                 157
 
 
 // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx b/toolkit/inc/toolkit/helper/servicenames.hxx
index 1e5d394fb660..27949e9de791 100644
--- a/toolkit/inc/toolkit/helper/servicenames.hxx
+++ b/toolkit/inc/toolkit/helper/servicenames.hxx
@@ -97,6 +97,7 @@ extern const sal_Char __FAR_DATA szServiceName_GridControlModel[];
 extern const sal_Char __FAR_DATA szServiceName_DefaultGridDataModel[];
 extern const sal_Char __FAR_DATA szServiceName_DefaultGridColumnModel[];
 extern const sal_Char __FAR_DATA szServiceName_GridColumn[];
+extern const sal_Char __FAR_DATA szServiceName_SortableGridDataModel[];
 
 extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[];
 extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[];
diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index 7b6fd72c3ab0..e11d32c435bf 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -1,2 +1,3 @@
-ti	toolkit	: LIBXSLT:libxslt vcl NULL
-ti toolkit\prj nmake - all ti_prj NULL
+ti toolkit : LIBXSLT:libxslt vcl qadevOOo test NULL
+ti toolkit\prj					nmake - all ti_prj NULL
+ti toolkit\qa\complex\toolkit   nmake - all ti_complex_toolkit NULL
diff --git a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java b/toolkit/qa/complex/toolkit/AccessibleStatusBar.java
index cfb40614beab..d4f2329d8f31 100755
--- a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java
+++ b/toolkit/qa/complex/toolkit/AccessibleStatusBar.java
@@ -27,12 +27,15 @@
 
 package complex.toolkit;
 
-// import complexlib.ComplexTestCase;
-import lib.TestParameters;
+import complex.toolkit.accessibility._XAccessibleEventBroadcaster;
+import complex.toolkit.accessibility._XAccessibleExtendedComponent;
+import complex.toolkit.accessibility._XAccessibleComponent;
+import complex.toolkit.accessibility._XAccessibleContext;
+import java.util.logging.Logger;
+import java.util.logging.Level;
 import util.SOfficeFactory;
 import util.AccessibilityTools;
 import com.sun.star.awt.XWindow;
-// import com.sun.star.chart.XChartDocument;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XServiceInfo;
@@ -45,11 +48,8 @@ import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XExtendedToolkit;
-// import java.io.PrintWriter;
 
-// import org.junit.After;
 import org.junit.AfterClass;
-// import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
@@ -58,26 +58,12 @@ import static org.junit.Assert.*;
 /**
  *
  */
-public class CheckAccessibleStatusBar {
+public class AccessibleStatusBar {
 
     XInterface testObject = null;
     XMultiServiceFactory xMSF = null;
     XWindow xWindow = null;
 
-    /**
-     * The test parameters
-     */
-    private static TestParameters param = null;
-
-//    public String[] getTestMethodNames() {
-//        return new String[]{"checkDocs"};//WriterDoc", "checkDrawDoc",
-////                    "checkMathDoc", "checkImpressDoc", "checkCalcDoc"};
-//    }
-
-/*    public String getTestObjectName() {
-        return "com.sun.star.awt.AccessibleStatusBar";
-    }
-*/
     private XMultiServiceFactory getMSF()
     {
         final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
@@ -100,41 +86,13 @@ public class CheckAccessibleStatusBar {
     /**
      * Check document types
      */
-    @Test public void checkDocs() {
-        Object doc = param.get("DocType");
-        String testDocType;
-        if (doc == null)
-        {
-            testDocType = "all";
-        }
-        else
-        {
-            testDocType = (String)doc;
-        }
-
-        System.out.println("Param was " + doc);
-        System.out.println("DocType " + testDocType);
-        if (testDocType.equalsIgnoreCase("writer") || testDocType.equalsIgnoreCase("all"))
-        {
-            checkWriterDoc();
-        }
-        if (testDocType.equalsIgnoreCase("math") || testDocType.equalsIgnoreCase("all"))
-        {
-            checkMathDoc();
-        }
-        if (testDocType.equalsIgnoreCase("draw") || testDocType.equalsIgnoreCase("all"))
-        {
-            checkDrawDoc();
-        }
-        if (testDocType.equalsIgnoreCase("impress") || testDocType.equalsIgnoreCase("all"))
-        {
-            checkImpressDoc();
-        }
-        if (testDocType.equalsIgnoreCase("calc") || testDocType.equalsIgnoreCase("all"))
-        {
-            checkCalcDoc();
-        }
-
+    @Test
+    public void checkDocs() {
+        checkWriterDoc();
+        checkMathDoc();
+        checkDrawDoc();
+        checkImpressDoc();
+        checkCalcDoc();
     }
 
     /**
@@ -150,7 +108,7 @@ public class CheckAccessibleStatusBar {
             getTestObject();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         runAllInterfaceTests();
 
@@ -160,7 +118,7 @@ public class CheckAccessibleStatusBar {
                 xClose.close(false);
             }
             catch(com.sun.star.util.CloseVetoException e) {
-                e.printStackTrace();
+                Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
             }
         }
     }
@@ -178,7 +136,7 @@ public class CheckAccessibleStatusBar {
             getTestObject();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         runAllInterfaceTests();
 
@@ -188,7 +146,7 @@ public class CheckAccessibleStatusBar {
                 xClose.close(false);
             }
             catch(com.sun.star.util.CloseVetoException e) {
-                e.printStackTrace();
+                Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
             }
         }
     }
@@ -206,7 +164,7 @@ public class CheckAccessibleStatusBar {
             getTestObject();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         runAllInterfaceTests();
 
@@ -216,7 +174,7 @@ public class CheckAccessibleStatusBar {
                 xClose.close(false);
             }
             catch(com.sun.star.util.CloseVetoException e) {
-                e.printStackTrace();
+                Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
             }
         }
     }
@@ -234,7 +192,7 @@ public class CheckAccessibleStatusBar {
             getTestObject();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         runAllInterfaceTests();
 
@@ -244,7 +202,7 @@ public class CheckAccessibleStatusBar {
                 xClose.close(false);
             }
             catch(com.sun.star.util.CloseVetoException e) {
-                e.printStackTrace();
+                Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
             }
         }
     }
@@ -262,7 +220,7 @@ public class CheckAccessibleStatusBar {
             getTestObject();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         runAllInterfaceTests();
 
@@ -272,7 +230,7 @@ public class CheckAccessibleStatusBar {
                 xClose.close(false);
             }
             catch(com.sun.star.util.CloseVetoException e) {
-                e.printStackTrace();
+                Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
             }
         }
     }
@@ -287,12 +245,11 @@ public class CheckAccessibleStatusBar {
             xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow());
 
             shortWait();
-            AccessibilityTools at = new AccessibilityTools();
-            XAccessible xRoot = at.getAccessibleObject(xWindow);
+            XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
             XAccessibleContext parentContext = null;
 
             System.out.println("Get the accessible status bar.");
-            parentContext = at.getAccessibleObjectForRole(
+            parentContext = AccessibilityTools.getAccessibleObjectForRole(
                                         xRoot, AccessibleRole.STATUS_BAR, "");
             shortWait();
             System.out.println("...OK.");
@@ -309,11 +266,11 @@ public class CheckAccessibleStatusBar {
             testObject=parentContext;
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         catch(Throwable t) {
             System.out.println("Got throwable:");
-            t.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", t );
         }
     }
 
@@ -354,7 +311,7 @@ public class CheckAccessibleStatusBar {
 
         System.out.println("*** Now testing XAccessibleEventBroadcaster ***");
         _XAccessibleEventBroadcaster _xAccEvBcast =
-                                new _XAccessibleEventBroadcaster(testObject, "Pfff", xWindow);
+                                new _XAccessibleEventBroadcaster(testObject, xWindow);
         assertTrue("failed: XAccessibleEventBroadcaster::addEventListener", _xAccEvBcast._addEventListener());
         assertTrue("failed: XAccessibleEventBroadcaster::removeEventListener", _xAccEvBcast._removeEventListener());
     }
@@ -362,12 +319,14 @@ public class CheckAccessibleStatusBar {
 
 
 
-    @BeforeClass public static void setUpConnection() throws Exception {
+    @BeforeClass
+    public static void setUpConnection() throws Exception {
         System.out.println("setUpConnection()");
         connection.setUp();
     }
 
-    @AfterClass public static void tearDownConnection()
+    @AfterClass
+    public static void tearDownConnection()
         throws InterruptedException, com.sun.star.uno.Exception
     {
         System.out.println("tearDownConnection()");
diff --git a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java b/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java
index 537654c6aacc..edd84651d45e 100755
--- a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java
+++ b/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java
@@ -27,14 +27,16 @@
 
 package complex.toolkit;
 
-// import complexlib.ComplexTestCase;
-import lib.TestParameters;
-// import util.SOfficeFactory;
-// import complexlib.ComplexTestCase;
+import java.util.logging.Logger;
+import java.util.logging.Level;
+import complex.toolkit.accessibility._XAccessibleEventBroadcaster;
+import complex.toolkit.accessibility._XAccessibleExtendedComponent;
+import complex.toolkit.accessibility._XAccessibleText;
+import complex.toolkit.accessibility._XAccessibleComponent;
+import complex.toolkit.accessibility._XAccessibleContext;
 import util.SOfficeFactory;
 import util.AccessibilityTools;
 import com.sun.star.awt.XWindow;
-// import com.sun.star.chart.XChartDocument;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XServiceInfo;
@@ -47,12 +49,9 @@ import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XExtendedToolkit;
-// import java.io.PrintWriter;
 
 
-// import org.junit.After;
 import org.junit.AfterClass;
-// import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
@@ -61,35 +60,17 @@ import static org.junit.Assert.*;
 /**
  *
  */
-public class CheckAccessibleStatusBarItem {
+public class AccessibleStatusBarItem {
 
     XMultiServiceFactory xMSF = null;
     XAccessibleContext testObject = null;
     XWindow xWindow = null;
 
-   /**
-     * The test parameters
-     */
-    private static TestParameters param = null;
-
-//    public String[] getTestMethodNames() {
-//        return new String[]{"checkDocs"};//{"checkWriterDoc", "checkDrawDoc",
-////                    "checkMathDoc", "checkImpressDoc", "checkCalcDoc"};
-//    }
-
-    /**
-    * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
-    * reset</code> call.
-    */
-    private void shortWait() {
-        shortWait(500) ;
-    }
-
     /**
     * Sleeps for a certain time.
     * @param Thread is sleeping for this time in milliseconds.
     */
-    private void shortWait(int time) {
+    private void shortWait() {
         try {
             Thread.sleep(500);
         } catch (InterruptedException e) {
@@ -100,43 +81,14 @@ public class CheckAccessibleStatusBarItem {
     /**
      * Check document types
      */
-    @Test public void checkDocs()
+    @Test
+    public void checkDocs()
     {
-        param = new TestParameters();
-        Object doc = param.get("DocType");
-        String testDocType;
-        if (doc == null)
-        {
-            testDocType = "all";
-        }
-        else
-        {
-            testDocType = (String)doc;
-        }
-
-        System.out.println("Param was " + doc);
-        System.out.println("DocType " + testDocType);
-        if (testDocType.equalsIgnoreCase("writer") || testDocType.equalsIgnoreCase("all"))
-        {
-            checkWriterDoc();
-        }
-        if (testDocType.equalsIgnoreCase("math") || testDocType.equalsIgnoreCase("all"))
-        {
-            checkMathDoc();
-        }
-        if (testDocType.equalsIgnoreCase("draw") || testDocType.equalsIgnoreCase("all"))
-        {
-            checkDrawDoc();
-        }
-        if (testDocType.equalsIgnoreCase("impress") || testDocType.equalsIgnoreCase("all"))
-        {
-            checkImpressDoc();
-        }
-        if (testDocType.equalsIgnoreCase("calc") || testDocType.equalsIgnoreCase("all"))
-        {
-            checkCalcDoc();
-        }
-
+        checkWriterDoc();
+        checkMathDoc();
+        checkDrawDoc();
+        checkImpressDoc();
+        checkCalcDoc();
     }
 
     private XMultiServiceFactory getMSF()
@@ -158,7 +110,7 @@ public class CheckAccessibleStatusBarItem {
             getTestObject();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         runAllInterfaceTests();
 
@@ -168,7 +120,7 @@ public class CheckAccessibleStatusBarItem {
                 xClose.close(false);
             }
             catch(com.sun.star.util.CloseVetoException e) {
-                e.printStackTrace();
+                Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
             }
         }
     }
@@ -186,7 +138,7 @@ public class CheckAccessibleStatusBarItem {
             getTestObject();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         runAllInterfaceTests();
 
@@ -196,7 +148,7 @@ public class CheckAccessibleStatusBarItem {
                 xClose.close(false);
             }
             catch(com.sun.star.util.CloseVetoException e) {
-                e.printStackTrace();
+                Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
             }
         }
     }
@@ -214,7 +166,7 @@ public class CheckAccessibleStatusBarItem {
             getTestObject();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         runAllInterfaceTests();
 
@@ -224,7 +176,7 @@ public class CheckAccessibleStatusBarItem {
                 xClose.close(false);
             }
             catch(com.sun.star.util.CloseVetoException e) {
-                e.printStackTrace();
+                Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
             }
         }
     }
@@ -242,7 +194,7 @@ public class CheckAccessibleStatusBarItem {
             getTestObject();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         runAllInterfaceTests();
 
@@ -252,7 +204,7 @@ public class CheckAccessibleStatusBarItem {
                 xClose.close(false);
             }
             catch(com.sun.star.util.CloseVetoException e) {
-                e.printStackTrace();
+                Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
             }
         }
     }
@@ -270,7 +222,7 @@ public class CheckAccessibleStatusBarItem {
             getTestObject();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         runAllInterfaceTests();
 
@@ -280,7 +232,7 @@ public class CheckAccessibleStatusBarItem {
                 xClose.close(false);
             }
             catch(com.sun.star.util.CloseVetoException e) {
-                e.printStackTrace();
+                Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
             }
         }
     }
@@ -297,35 +249,25 @@ public class CheckAccessibleStatusBarItem {
                                     XWindow.class,tk.getActiveTopWindow());
 
             shortWait();
-            AccessibilityTools at = new AccessibilityTools();
-            XAccessible xRoot = at.getAccessibleObject(xWindow);
+            XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
             XAccessibleContext parentContext = null;
 
             System.out.println("Get the accessible status bar.");
-            parentContext = at.getAccessibleObjectForRole(
+            parentContext = AccessibilityTools.getAccessibleObjectForRole(
                                         xRoot, AccessibleRole.STATUS_BAR, "");
             shortWait();
             if ( parentContext == null ) {
-                System.out.println("Could not get the test object: set the correct focus in the next 30 seconds.");
-                shortWait(30000);
-                parentContext = at.getAccessibleObjectForRole(
-                                        xRoot, AccessibleRole.STATUS_BAR, "");
-
-                if ( parentContext == null )
-                {
-                    fail("Could not create a test object.");
-                }
+                fail("Could not create a test object.");
             }
             System.out.println("...OK.");
 
             testObject=parentContext;
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", e );
         }
         catch(Throwable t) {
-            System.out.println("Got throwable:");
-            t.printStackTrace();
+            Logger.getLogger( this.getClass().getName() ).log( Level.SEVERE, "caught an exception", t );
         }
     }
 
@@ -391,7 +333,7 @@ public class CheckAccessibleStatusBarItem {
 
             System.out.println("*** Now testing XAccessibleEventBroadcaster ***");
             _XAccessibleEventBroadcaster _xAccEvBcast =
-                                    new _XAccessibleEventBroadcaster(object, "Pfff", xWindow);
+                                    new _XAccessibleEventBroadcaster(object, xWindow);
             assertTrue("failed: "+accName+" - XAccessibleEventBroadcaster::addEventListener", _xAccEvBcast._addEventListener());
             assertTrue("failed: "+accName+" - XAccessibleEventBroadcaster::removeEventListener", _xAccEvBcast._removeEventListener());
 
diff --git a/toolkit/qa/complex/toolkit/Assert.java b/toolkit/qa/complex/toolkit/Assert.java
new file mode 100755
index 000000000000..93b1a2c490e1
--- /dev/null
+++ b/toolkit/qa/complex/toolkit/Assert.java
@@ -0,0 +1,234 @@
+/*************************************************************************
+ * 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.
+ *
+ *************************************************************************/
+
+package complex.toolkit;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import com.sun.star.uno.UnoRuntime;
+import static org.junit.Assert.*;
+
+/**
+ * provides assertion capabilities not found in {@link org.junit.Assert}
+ * @author frank.schoenheit@oracle.com
+ */
+public class Assert
+{
+    // --------------------------------------------------------------------------------------------------------
+    /** invokes a given method on a given object, and assures a certain exception is caught
+     * @param i_message
+     *          is the message to print when the check fails
+     * @param i_object
+     *          is the object to invoke the method on
+     * @param i_methodName
+     *          is the name of the method to invoke
+     * @param i_methodArgs
+     *          are the arguments to pass to the method.
+     * @param i_argClasses
+     *          are the classes to assume for the arguments of the methods
+     * @param i_expectedExceptionClass
+     *          is the class of the exception to be caught. If this is null,
+     *          it means that <em>no</em> exception must be throw by invoking the method.
+    */
+    public static void assertException( final String i_message, final Object i_object, final String i_methodName,
+        final Class[] i_argClasses, final Object[] i_methodArgs, final Class i_expectedExceptionClass )
+    {
+        Class objectClass = i_object.getClass();
+
+        boolean noExceptionAllowed = ( i_expectedExceptionClass == null );
+
+        boolean caughtExpected = noExceptionAllowed ? true : false;
+        try
+        {
+            Method method = impl_getMethod( objectClass, i_methodName, i_argClasses );
+            method.invoke(i_object, i_methodArgs );
+        }
+        catch ( NoSuchMethodException e )
+        {
+            StringBuilder message = new StringBuilder();
+            message.append( "no such method: " ).append( objectClass.getName() ).append( "." ).append( i_methodName ).append( "( " );
+            for ( int i=0; i<i_argClasses.length; ++i )
+            {
+                message.append( i_argClasses[i].getName() );
+                if ( i<i_argClasses.length - 1 )
+                    message.append( ", " );
+            }
+            message.append( " )" );
+            fail( message.toString() );
+        }
+        catch ( InvocationTargetException e )
+        {
+            caughtExpected =    noExceptionAllowed
+                            ?   false
+                            :   ( e.getTargetException().getClass().equals( i_expectedExceptionClass ) );
+        }
+        catch( Exception e )
+        {
+            caughtExpected = false;
+        }
+
+        assertTrue( i_message, caughtExpected );
+    }
+
+    /**
+     * retrieves a method, given by name and parameter signature, from the given class
+     *
+     * The method does somewhat more than simply calling {@link Class.getMethod}. In particular, it recognizes
+     * primitiive parameter types, and attempts to find a method taking the given primitive type, instead of the
+     * type represented by the parameter class.
+     *
+     * For instance, if you have a method <code>foo( int )</code>, {@link Class.getMethod} would not return this
+     * method when you pass <code>Integer.class</code>. <code>impl_getMethod</code> will recognize this, and
+     * properly retrieve the method.
+     *
+     * Note: <code>impl_getMethod</code> is limited in that it will not try all possible combinations of primitive
+     * and non-primitive types. That is, a method like <code>foo( int, Integer, int )</code> is likely to not be
+     * found.
+     *
+     * @param i_obbjectClass
+     * @param i_methodName
+     * @param i_argClasses
+     * @return
+     */
+    private static Method impl_getMethod( final Class i_objectClass, final String i_methodName, final Class[] i_argClasses ) throws NoSuchMethodException
+    {
+        try
+        {
+            return i_objectClass.getMethod( i_methodName, i_argClasses );
+        }
+        catch ( NoSuchMethodException ex )
+        {
+        }
+
+        int substitutedTypes = 0;
+        int substitutedTypesLastRound = 0;
+        final Class[][] substitutionTable = new Class[][] {
+            new Class[] { Long.class, long.class },
+            new Class[] { Integer.class, int.class },
+            new Class[] { Short.class, short.class },
+            new Class[] { Byte.class, byte.class },
+            new Class[] { Double.class, double.class },
+            new Class[] { Float.class, float.class },
+            new Class[] { Character.class, char.class }
+        };
+        do
+        {
+            substitutedTypes = 0;
+            final Class[] argClasses = new Class[ i_argClasses.length ];
+            for ( int i=0; i < argClasses.length; ++i )
+            {
+                argClasses[i] = i_argClasses[i];
+                if ( substitutedTypes > substitutedTypesLastRound )
+                    continue;
+
+                for ( int c=0; c<substitutionTable.length; ++c )
+                {
+                    if ( i_argClasses[i].equals( substitutionTable[c][0] ) )
+                    {
+                        argClasses[i] = substitutionTable[c][1];
+                        ++substitutedTypes;
+                        break;
+                    }
+                }
+            }
+            if ( substitutedTypes == substitutedTypesLastRound )
+                throw new NoSuchMethodException();
+            substitutedTypesLastRound = substitutedTypes;
+
+            try
+            {
+                return i_objectClass.getMethod( i_methodName, argClasses );
+            }
+            catch ( NoSuchMethodException e )
+            {
+            }
+        }
+        while ( substitutedTypes > 0 );
+        throw new NoSuchMethodException();
+    }
+
+    /** invokes a given method on a given object, and assures a certain exception is caught
+     * @param i_message is the message to print when the check fails
+     * @param i_object is the object to invoke the method on
+     * @param i_methodName is the name of the method to invoke
+     * @param i_methodArgs are the arguments to pass to the method. Those implicitly define
+     *      the classes of the arguments of the method which is called.
+     * @param i_expectedExceptionClass is the class of the exception to be caught. If this is null,
+     *          it means that <em>no</em> exception must be throw by invoking the method.
+    */
+    public static void assertException( final String i_message, final Object i_object, final String i_methodName,
+        final Object[] i_methodArgs, final Class i_expectedExceptionClass )
+    {
+        Class[] argClasses = new Class[ i_methodArgs.length ];
+        for ( int i=0; i<i_methodArgs.length; ++i )
+            argClasses[i] = i_methodArgs[i].getClass();
+        assertException( i_message, i_object, i_methodName, argClasses, i_methodArgs, i_expectedExceptionClass );
+    }
+
+    /** invokes a given method on a given object, and assures a certain exception is caught
+     * @param i_object is the object to invoke the method on
+     * @param i_methodName is the name of the method to invoke
+     * @param i_methodArgs are the arguments to pass to the method. Those implicitly define
+     *      the classes of the arguments of the method which is called.
+     * @param i_expectedExceptionClass is the class of the exception to be caught. If this is null,
+     *          it means that <em>no</em> exception must be throw by invoking the method.
+    */
+    public static void assertException( final Object i_object, final String i_methodName, final Object[] i_methodArgs,
+        final Class i_expectedExceptionClass )
+    {
+        assertException(
+            "did not catch the expected exception (" +
+                ( ( i_expectedExceptionClass == null ) ? "none" : i_expectedExceptionClass.getName() ) +
+                ") while calling " + i_object.getClass().getName() + "." + i_methodName,
+            i_object, i_methodName, i_methodArgs, i_expectedExceptionClass );
+    }
+
+    /** invokes a given method on a given object, and assures a certain exception is caught
+     * @param i_object is the object to invoke the method on
+     * @param i_methodName is the name of the method to invoke
+     * @param i_methodArgs are the arguments to pass to the method
+     * @param i_argClasses are the classes to assume for the arguments of the methods
+     * @param i_expectedExceptionClass is the class of the exception to be caught. If this is null,
+     *          it means that <em>no</em> exception must be throw by invoking the method.
+    */
+    public static void assertException( final Object i_object, final String i_methodName, final Class[] i_argClasses,
+        final Object[] i_methodArgs, final Class i_expectedExceptionClass )
+    {
+        assertException(
+            "did not catch the expected exception (" +
+                ( ( i_expectedExceptionClass == null ) ? "none" : i_expectedExceptionClass.getName() ) +
+                ") while calling " + i_object.getClass().getName() + "." + i_methodName,
+            i_object, i_methodName, i_argClasses, i_methodArgs, i_expectedExceptionClass );
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    public static void assertException( Object i_object, Class _unoInterfaceClass, String i_methodName, Object[] i_methodArgs,
+        Class i_expectedExceptionClass )
+    {
+        assertException( UnoRuntime.queryInterface( _unoInterfaceClass, i_object ), i_methodName,
+            i_methodArgs, i_expectedExceptionClass );
+    }
+}
diff --git a/toolkit/qa/complex/toolkit/CallbackClass.java b/toolkit/qa/complex/toolkit/CallbackClass.java
deleted file mode 100644
index 1c9eb68a6d34..000000000000
--- a/toolkit/qa/complex/toolkit/CallbackClass.java
+++ /dev/null
@@ -1,67 +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.
- *
- ************************************************************************/
-
-package complex.toolkit;
-
-import com.sun.star.awt.XCallback;
-// import lib.MultiMethodTest;
-import com.sun.star.lang.XMultiServiceFactory;
-// import com.sun.star.uno.XInterface;
-// import com.sun.star.uno.UnoRuntime;
-// import share.LogWriter;
-
-/**
- * Testing <code>com.sun.star.awt.XRequestCallback</code>
- * interface methods :
- * <ul>
- *  <li><code> addCallback()</code></li>
- * </ul> <p>
- * @see com.sun.star.awt.XRequestCallback
- */
-public class CallbackClass implements XCallback{
-
-    // private LogWriter log;
-
-    private XMultiServiceFactory xMSF;
-
-
-    public CallbackClass(XMultiServiceFactory xMSF ) {
-
-        this.xMSF = xMSF;
-        // this.log = log;
-    }
-
-
-    /**
-     * Callback method which will be called by the asynchronous
-     * service where we have added our request before.
-     */
-    public void notify( Object aData ) {
-
-        System.out.println("callback called successfully" );
-    }
-}
diff --git a/toolkit/qa/complex/toolkit/CheckAsyncCallback.java b/toolkit/qa/complex/toolkit/CheckAsyncCallback.java
deleted file mode 100644
index 3a1e51729f11..000000000000
--- a/toolkit/qa/complex/toolkit/CheckAsyncCallback.java
+++ /dev/null
@@ -1,156 +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.
- *
- ************************************************************************/
-
-package complex.toolkit;
-
-// import complexlib.ComplexTestCase;
-import util.SOfficeFactory;
-// import complex.toolkit.CallbackClass;
-import com.sun.star.awt.XRequestCallback;
-import com.sun.star.lang.XMultiServiceFactory;
-// import com.sun.star.lang.XComponent;
-// import com.sun.star.lang.XServiceInfo;
-import com.sun.star.uno.XInterface;
-import com.sun.star.uno.UnoRuntime;
-// import com.sun.star.awt.XExtendedToolkit;
-// import java.io.PrintWriter;
-
-// import org.junit.After;
-import org.junit.AfterClass;
-// import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-/**
- *
- */
-public class CheckAsyncCallback /* extends ComplexTestCase*/  {
-
-
-    XInterface testObject = null;
-    XMultiServiceFactory xMSF = null;
-
-//    public String[] getTestMethodNames() {
-//        return new String[]{"checkService"};
-//    }
-
-/*    public String getTestObjectName() {
-        return "com.sun.star.awt.AccessibleStatusBar";
-    }
-*/
-    private XMultiServiceFactory getMSF()
-    {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
-    }
-
-    /**
-    * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
-    * reset</code> call.
-    */
-    private void shortWait() {
-        try {
-            Thread.sleep(500) ;
-        } catch (InterruptedException e) {
-            System.out.println("While waiting :" + e) ;
-        }
-    }
-
-    /**
-     * Check services
-     */
-    @Test public void checkService() {
-            checkAsyncCallbackService();
-
-    }
-
-    /**
-     * Test the interfaces
-     */
-    public void checkAsyncCallbackService() {
-        runAllInterfaceTests();
-    }
-
-    public void getTestObject() {
-        try {
-            xMSF = getMSF();
-            SOfficeFactory xSOF = SOfficeFactory.getFactory(xMSF);
-
-            XRequestCallback xAsyncCallback = null;
-
-            XInterface xIfc = (XInterface)xMSF.createInstance(
-                                "com.sun.star.awt.AsyncCallback" );
-            xAsyncCallback = UnoRuntime.queryInterface(XRequestCallback.class, xIfc);
-
-            testObject=xAsyncCallback;
-        }
-        catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
-        }
-        catch(Throwable t) {
-            System.out.println("Got throwable:");
-            t.printStackTrace();
-        }
-    }
-
-    public void runAllInterfaceTests() {
-        getTestObject();
-        System.out.println("*** Now testing XRequestCallback ***");
-        _XRequestCallback _xRequestCallback =
-                                new _XRequestCallback(testObject, xMSF );
-        assertTrue("failed: XRequestCallback::addCallback", _xRequestCallback._addCallback());
-    }
-
-    public void checkCallback() {
-        getTestObject();
-        System.out.println("*** Now testing asynchronous callback service ***");
-        XRequestCallback xAsyncCallback = null;
-        xAsyncCallback = UnoRuntime.queryInterface(XRequestCallback.class, testObject);
-        CallbackClass aCallbackClass = new CallbackClass( xMSF );
-        xAsyncCallback.addCallback( aCallbackClass, null );
-    }
-
-
-
-    @BeforeClass public static void setUpConnection() throws Exception {
-        System.out.println("setUpConnection()");
-        connection.setUp();
-    }
-
-    @AfterClass public static void tearDownConnection()
-        throws InterruptedException, com.sun.star.uno.Exception
-    {
-        System.out.println("tearDownConnection()");
-        connection.tearDown();
-    }
-
-    private static final OfficeConnection connection = new OfficeConnection();
-
-
-}
diff --git a/toolkit/qa/complex/toolkit/GridControl.java b/toolkit/qa/complex/toolkit/GridControl.java
new file mode 100755
index 000000000000..a06a52342417
--- /dev/null
+++ b/toolkit/qa/complex/toolkit/GridControl.java
@@ -0,0 +1,687 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2011 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.
+ *
+ *************************************************************************/
+
+package complex.toolkit;
+
+import com.sun.star.awt.XControl;
+import com.sun.star.awt.XControlContainer;
+import com.sun.star.awt.XControlModel;
+import com.sun.star.awt.XToolkit;
+import com.sun.star.awt.grid.DefaultGridDataModel;
+import com.sun.star.awt.grid.XGridColumn;
+import com.sun.star.awt.grid.XGridColumnModel;
+import com.sun.star.awt.grid.XGridDataModel;
+import com.sun.star.awt.grid.XMutableGridDataModel;
+import com.sun.star.awt.grid.XSortableMutableGridDataModel;
+import com.sun.star.beans.Pair;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.container.ContainerEvent;
+import com.sun.star.container.XContainerListener;
+import com.sun.star.container.XNameContainer;
+import com.sun.star.lang.EventObject;
+import com.sun.star.lang.IndexOutOfBoundsException;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XEventListener;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.Exception;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.XInterface;
+import com.sun.star.util.XCloneable;
+import complex.toolkit.awtgrid.DummyColumn;
+import complex.toolkit.awtgrid.TMutableGridDataModel;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.openoffice.test.OfficeConnection;
+
+/** is a unit test for the grid control related implementations
+ * @author frank.schoenheit@sun.com
+ */
+public class GridControl
+{
+    // -----------------------------------------------------------------------------------------------------------------
+    public GridControl()
+    {
+        m_context = m_connection.getComponentContext();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private static void impl_dispose( final Object... i_components )
+    {
+        for ( int i=0; i<i_components.length; ++i )
+        {
+            if ( i_components[i] != null )
+            {
+                final XComponent component = UnoRuntime.queryInterface( XComponent.class, i_components[i] );
+                component.dispose();
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_recreateGridModel() throws Exception
+    {
+        impl_dispose( m_gridControlModel, m_columnModel, m_dataModel );
+
+        // create a grid control model, and ensure it has a proper data and column model already
+        m_gridControlModel = UnoRuntime.queryInterface( XPropertySet.class,
+            createInstance( "com.sun.star.awt.grid.UnoControlGridModel" ) );
+        assertNotNull( "grid control model does not provide XPropertySet interface", m_gridControlModel );
+
+        // ensure that the model has default column/data models
+        m_columnModel = UnoRuntime.queryInterface( XGridColumnModel.class, m_gridControlModel.getPropertyValue( "ColumnModel" ) );
+        assertNotNull( "the control model is expected to have an initial column model", m_columnModel );
+        final XGridDataModel dataModel = UnoRuntime.queryInterface( XGridDataModel.class, m_gridControlModel.getPropertyValue( "GridDataModel" ) );
+        assertNotNull( "the control model is expected to have an initial data model", dataModel );
+        m_dataModel = UnoRuntime.queryInterface( XSortableMutableGridDataModel.class,
+            dataModel );
+        assertNotNull( "the out-of-the-box data model should be mutable and sortable", m_dataModel );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void testGridControlCloning() throws Exception
+    {
+        impl_recreateGridModel();
+
+        // give the test something to compare, actually
+        XGridColumnModel columnModel = UnoRuntime.queryInterface( XGridColumnModel.class,
+            m_gridControlModel.getPropertyValue( "ColumnModel" ) );
+        columnModel.setDefaultColumns( 10 );
+
+        // clone the grid model
+        final XCloneable cloneable = UnoRuntime.queryInterface( XCloneable.class, m_gridControlModel );
+        assertNotNull( "all UnoControlModel's are expected to be cloneable", cloneable );
+
+        final XInterface clone = cloneable.createClone();
+        final XPropertySet clonedProps = UnoRuntime.queryInterface( XPropertySet.class, clone );
+
+        // TODO: check all those generic properties for equality
+
+        // the data model and the column model should have been cloned, too
+        // in particular, the clone should not share the sub models with the orignal
+        final XMutableGridDataModel originalDataModel = UnoRuntime.queryInterface( XMutableGridDataModel.class,
+            m_gridControlModel.getPropertyValue( "GridDataModel" ) );
+        final XMutableGridDataModel clonedDataModel = UnoRuntime.queryInterface( XMutableGridDataModel.class,
+            clonedProps.getPropertyValue( "GridDataModel" ) );
+        assertFalse( "data model should not be shared after cloning", UnoRuntime.areSame( originalDataModel, clonedDataModel ) );
+        impl_assertEquality( originalDataModel, clonedDataModel );
+
+        final XGridColumnModel originalColumnModel = columnModel;
+        final XGridColumnModel clonedColumnModel = UnoRuntime.queryInterface( XGridColumnModel.class,
+            clonedProps.getPropertyValue( "ColumnModel" ) );
+        assertFalse( "column model should not be shared after cloning", UnoRuntime.areSame( originalColumnModel, clonedColumnModel ) );
+        impl_assertEquality( originalColumnModel, clonedColumnModel );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void testDisposal() throws Exception
+    {
+        impl_recreateGridModel();
+
+        final int columnCount = 3;
+        m_columnModel.setDefaultColumns( columnCount );
+
+        // add disposal listeners to all columns so far
+        final XGridColumn[] columns = m_columnModel.getColumns();
+        assertEquals( "creating default columns resulted in unexpected column count", columnCount, columns.length );
+        final DisposeListener[] columnListeners = new DisposeListener[columnCount];
+        for ( int i=0; i<columnCount; ++i )
+            columnListeners[i] = new DisposeListener( columns[i] );
+
+        // add another column, and check that upon removal, it is disposed
+        final int newColumnIndex = m_columnModel.addColumn( m_columnModel.createColumn() );
+        final DisposeListener columnListener = new DisposeListener( m_columnModel.getColumn( newColumnIndex ) );
+        m_columnModel.removeColumn( newColumnIndex );
+        assertTrue( "explicit column removal is expected to dispose the column", columnListener.isDisposed() );
+
+        // by definition, the grid control model is the owner of both the column and the data model. So, setting
+        // a new column/data model should implicitly dispose the old models
+        final DisposeListener oldDataModelListener = new DisposeListener( m_dataModel );
+        final DisposeListener oldColumnModelListener = new DisposeListener( m_columnModel );
+
+        final Object newDataModel = createInstance( "com.sun.star.awt.grid.DefaultGridDataModel" );
+        final Object newColumnModel = createInstance( "com.sun.star.awt.grid.DefaultGridColumnModel" );
+        final DisposeListener newDataModelListener = new DisposeListener( newDataModel );
+        final DisposeListener newColumnModelListener = new DisposeListener( newColumnModel );
+
+        m_gridControlModel.setPropertyValue( "GridDataModel", newDataModel );
+        assertTrue( "setting a new data model failed", impl_areSameInterface( newDataModel, m_gridControlModel.getPropertyValue( "GridDataModel" ) ) );
+        m_gridControlModel.setPropertyValue( "ColumnModel", newColumnModel );
+        assertTrue( "setting a new column model failed", impl_areSameInterface( newColumnModel, m_gridControlModel.getPropertyValue( "ColumnModel" ) ) );
+
+        assertTrue( "old data model has not been disposed", oldDataModelListener.isDisposed() );
+        assertTrue( "old column model has not been disposed", oldColumnModelListener.isDisposed() );
+        for ( int i=0; i<columnCount; ++i )
+            assertTrue( "column no. " + i + " has not been disposed", columnListeners[i].isDisposed() );
+
+        // the same holds if the grid control model itself is disposed - it should dispose the depending models, too
+        assertFalse( "new data model is already disposed - this is unexpected", newDataModelListener.isDisposed() );
+        assertFalse( "new column model is already disposed - this is unexpected", newColumnModelListener.isDisposed() );
+        impl_dispose( m_gridControlModel );
+        assertTrue( "new data model is not disposed after disposing the grid column model", newDataModelListener.isDisposed() );
+        assertTrue( "new column model is not disposed after disposing the grid column model", newColumnModelListener.isDisposed() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    /**
+     * tests various aspects of the <code>XMutableGridDataModel</code> interface
+     */
+    @Test
+    public void testMutableGridDataModel() throws Exception
+    {
+        impl_recreateGridModel();
+
+        TMutableGridDataModel test = new TMutableGridDataModel( m_dataModel );
+        test.testAddRow();
+        test.testAddRows();
+        test.testRemoveRow();
+        test.testRemoveAllRows();
+        test.testUpdateCellData();
+        test.testUpdateRowData();
+        test.testUpdateRowHeading();
+        test.cleanup();
+
+        // a somehwat less straight-forward test: the data model is expected to implicitly increase its column count
+        // when you add a row which has more columns than currently known
+        final XMutableGridDataModel dataModel = DefaultGridDataModel.create( m_context );
+        dataModel.addRow( 0, new Object[] { 1 } );
+        assertEquals( "unexpected column count after adding the most simple row", 1, dataModel.getColumnCount() );
+        dataModel.addRow( 1, new Object[] { 1, 2 } );
+        assertEquals( "implicit extension of the column count doesn't work", 2, dataModel.getColumnCount() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void testGridColumnModel() throws Exception
+    {
+        impl_recreateGridModel();
+
+        ColumnModelListener listener = new ColumnModelListener();
+        m_columnModel.addContainerListener( listener );
+
+        // insert default columns into the previously empty model, ensure we get the right notifications
+        final int defaultColumnsCount = 3;
+        m_columnModel.setDefaultColumns( defaultColumnsCount );
+        impl_assertColumnModelConsistency();
+        List< ContainerEvent > events = listener.assertExclusiveInsertionEvents();
+        listener.reset();
+        assertEquals( "wrong number of events fired by setDefaulColumns", defaultColumnsCount, events.size() );
+        for ( int i=0; i<defaultColumnsCount; ++i )
+        {
+            final ContainerEvent event = events.get(i);
+            final int index = impl_assertInteger( event.Accessor );
+            assertEquals( "unexpected Accessor value in insert notification", i, index );
+            assertTrue( "wrong column object notified in insert notification",
+                impl_areSameInterface( event.Element, m_columnModel.getColumn(i) ) );
+        }
+
+        // insert some more default columns, ensure that all previously existing columns are removed
+        final int moreDefaultColumnsCount = 5;
+        m_columnModel.setDefaultColumns( moreDefaultColumnsCount );
+        impl_assertColumnModelConsistency();
+        assertEquals( "setting default columns is expected to remove all previously existing columns",
+            moreDefaultColumnsCount, m_columnModel.getColumnCount() );
+
+        // in this situation, both removal and insertion events have been notified
+        final List< ContainerEvent > removalEvents = listener.getRemovalEvents();
+        final List< ContainerEvent > insertionEvents = listener.getInsertionEvents();
+        listener.reset();
+
+        // for the removal events, check the indexes
+        assertEquals( "wrong number of columns removed (or notified) upon setting default columns",
+            defaultColumnsCount, removalEvents.size() );
+        for ( int i=0; i<removalEvents.size(); ++i )
+        {
+            final ContainerEvent event = removalEvents.get(i);
+            final int removedIndex = impl_assertInteger( event.Accessor );
+
+            // The implementation is allowed to remove the columns from the beginning, in which case the
+            // index of the removed column must always be 0, since e.g. the second column has index 0
+            // after the first column (which previously had index 0) had been removed.
+            // Alternatively, the implementation is allowed to remove columns from the end, which means
+            // that the column index given in the event is steadily increasing.
+            assertTrue( "unexpected column removal event column index",
+                ( removedIndex == 0 ) || ( removedIndex == removalEvents.size() - 1 - i ) );
+        }
+
+        // for the insertion events, check the indexes as well
+        assertEquals( "wrong number of insertion events when setting default columns over existing columns",
+            moreDefaultColumnsCount, insertionEvents.size() );
+        for ( int i=0; i<insertionEvents.size(); ++i )
+        {
+            final ContainerEvent event = insertionEvents.get(i);
+            final int index = impl_assertInteger( event.Accessor );
+            assertEquals( i, index );
+        }
+
+        // okay, remove all those columns
+        while ( m_columnModel.getColumnCount() != 0 )
+        {
+            final int columnCount = m_columnModel.getColumnCount();
+            final int removeColumnIndex = m_randomGenerator.nextInt( columnCount );
+            m_columnModel.removeColumn( removeColumnIndex );
+            events = listener.assertExclusiveRemovalEvents();
+            listener.reset();
+            assertEquals( "removing a single column should notify a single event", 1, events.size() );
+            final ContainerEvent event = events.get(0);
+            final int removalIndex = impl_assertInteger( event.Accessor );
+            assertEquals( "removing an arbitrary column does not notify the proper accessor",
+                removeColumnIndex, removalIndex );
+        }
+
+        // calling addColumn with a column not created by the given model/implementatoion should not succeed
+        boolean caughtExpected = false;
+        try
+        {
+            m_columnModel.addColumn( new DummyColumn() );
+        }
+        catch( final com.sun.star.lang.IllegalArgumentException e )
+        {
+            assertTrue( impl_areSameInterface( e.Context, m_columnModel ) );
+            caughtExpected = true;
+        }
+        assertTrue( "adding a dummy (self-implemented) grid column to the model should not succeed", caughtExpected );
+
+        // adding a single column to the end should succeed, properly notify, and still be consistent
+        final XGridColumn newColumn = m_columnModel.createColumn();
+        m_columnModel.addColumn( newColumn );
+        impl_assertColumnModelConsistency();
+        events = listener.assertExclusiveInsertionEvents();
+        listener.reset();
+        assertEquals( "addColumn notifies the wrong number of insertion events", 1, events.size() );
+        final int insertionIndex = impl_assertInteger( events.get(0).Accessor );
+        assertEquals( insertionIndex, newColumn.getIndex() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void testSortableDataModel() throws Exception
+    {
+        impl_recreateGridModel();
+
+        final int colCount = 3;
+        final int rowCount = 10;
+        // initialize with some data
+        final Object[][] data = new Object[][] {
+            new Object[] { 15, 17, 0 },
+            new Object[] { 9, 8, 14 },
+            new Object[] { 17, 2, 16 },
+            new Object[] { 0, 7, 14 },
+            new Object[] { 10, 16, 16 },
+            new Object[] { 2, 8, 10 },
+            new Object[] { 4, 8, 3 },
+            new Object[] { 7, 9, 0 },
+            new Object[] { 15, 6, 19 },
+            new Object[] { 2, 14, 19 }
+        };
+        final Object[] rowHeadings = new Object[] {
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+        };
+        // ensure consistency of the test data
+        assertEquals( rowHeadings.length, rowCount );
+        assertEquals( data.length, rowCount );
+        for ( Object[] rowData : data )
+            assertEquals( rowData.length, colCount );
+
+        // add the test data
+        m_dataModel.addRows( rowHeadings, data );
+        assertEquals( rowCount, m_dataModel.getRowCount() );
+        assertEquals( colCount, m_dataModel.getColumnCount() );
+
+        // sort by each column
+        for ( int colIndex = 0; colIndex < colCount; ++colIndex )
+        {
+            for ( boolean ascending : new boolean[] { true, false } )
+            {
+                m_dataModel.sortByColumn( colIndex, ascending );
+                Pair currentSortOrder = m_dataModel.getCurrentSortOrder();
+                assertEquals( "invalid current sort column (column " + colIndex + ")", ((Integer)currentSortOrder.First).intValue(), colIndex );
+                assertEquals( "invalid current sort direction", ((Boolean)currentSortOrder.Second).booleanValue(), ascending );
+
+                /*for ( int i=0; i<rowCount; ++i )
+                {
+                    for ( int j=0; j<colCount; ++j )
+                        System.out.print( m_dataModel.getCellData( j, i ).toString() + ", " );
+                    System.out.println();
+                }*/
+
+                // verify the data is actually sorted by this column
+                for ( int rowIndex = 0; rowIndex < rowCount - 1; ++rowIndex )
+                {
+                    final Object currentValue = m_dataModel.getCellData( colIndex, rowIndex );
+                    final int currentIntValue = impl_assertInteger( currentValue );
+                    final Object nextValue = m_dataModel.getCellData( colIndex, rowIndex + 1 );
+                    final int nextIntValue = impl_assertInteger( nextValue );
+                    assertTrue( "data in row " + rowIndex + " is actually not sorted " + ( ascending ? "ascending" : "descending" ),
+                        ascending   ? currentIntValue <= nextIntValue
+                                    : currentIntValue >= nextIntValue );
+
+                    // ensure the data in the other columns, and the row headings, are sorted as well
+                    final Object rowHeading = m_dataModel.getRowHeading( rowIndex );
+                    final int unsortedRowIndex = impl_assertInteger( rowHeading );
+                    for ( int innerColIndex = 0; innerColIndex < colCount; ++innerColIndex )
+                    {
+                        assertEquals( "sorted row " + rowIndex + ", unsorted row " + unsortedRowIndex + ", col " + innerColIndex +
+                            ": wrong data",
+                            data[unsortedRowIndex][innerColIndex], m_dataModel.getCellData( innerColIndex, rowIndex ) );
+                    }
+                }
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void testModelViewInteraction() throws Exception
+    {
+        final List< Object > disposables = new ArrayList< Object >();
+        try
+        {
+            // create a siple dialog model/control/peer trinity
+            final XControlModel dialogModel = createInstance( XControlModel.class, "com.sun.star.awt.UnoControlDialogModel" );
+            disposables.add( dialogModel );
+            final XPropertySet dialogProps = UnoRuntime.queryInterface( XPropertySet.class, dialogModel );
+            dialogProps.setPropertyValue( "Width", 200 );
+            dialogProps.setPropertyValue( "Height", 100 );
+            dialogProps.setPropertyValue( "Title", "Grid Control Unit Test" );
+            final XControl dialogControl = createInstance( XControl.class, "com.sun.star.awt.UnoControlDialog" );
+            disposables.add( dialogControl );
+            dialogControl.setModel( dialogModel );
+            dialogControl.createPeer( createInstance( XToolkit.class, "com.sun.star.awt.Toolkit" ), null );
+
+            // insert a grid control model
+            final XMultiServiceFactory controlModelFactory = UnoRuntime.queryInterface( XMultiServiceFactory.class,
+                dialogModel );
+            XPropertySet gridModelProps = UnoRuntime.queryInterface( XPropertySet.class,
+                controlModelFactory.createInstance( "com.sun.star.awt.grid.UnoControlGridModel" ) );
+            disposables.add( gridModelProps );
+            gridModelProps.setPropertyValue( "PositionX", 6 );
+            gridModelProps.setPropertyValue( "PositionY", 6 );
+            gridModelProps.setPropertyValue( "Width", 188 );
+            gridModelProps.setPropertyValue( "Height", 88 );
+            final XNameContainer modelContainer = UnoRuntime.queryInterface( XNameContainer.class, dialogModel );
+            modelContainer.insertByName( "grid", gridModelProps );
+
+            // check the respective control has been created
+            final XControlContainer controlContainer = UnoRuntime.queryInterface( XControlContainer.class, dialogControl );
+            final XControl gridControl = controlContainer.getControl( "grid" );
+            assertNotNull( "no grid control created in the dialog", gridControl );
+
+            // in the current implementation (not sure this is a good idea at all), the control (more precise: the peer)
+            // ensures that if there are no columns in the column model, but in the data model, then the column model
+            // will implicitly have the needed columns added.
+            // To ensure that clients which rely on this do not break in the future, check this here.
+            final XMutableGridDataModel dataModel = UnoRuntime.queryInterface( XMutableGridDataModel.class,
+                gridModelProps.getPropertyValue( "GridDataModel" ) );
+            assertNotNull( dataModel );
+            assertEquals( 0, dataModel.getColumnCount() );
+
+            final XGridColumnModel columnModel = UnoRuntime.queryInterface( XGridColumnModel.class,
+                gridModelProps.getPropertyValue( "ColumnModel" ) );
+            assertNotNull( columnModel );
+            assertEquals( 0, columnModel.getColumnCount() );
+
+            dataModel.addRow( null, new Object[] { 1, 2, 3 } );
+            assertEquals( 3, dataModel.getColumnCount() );
+            assertEquals( 3, columnModel.getColumnCount() );
+        }
+        finally
+        {
+            impl_dispose( disposables.toArray());
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private int impl_assertInteger( final Object i_object )
+    {
+        assertTrue( i_object instanceof Integer );
+        return ((Integer)i_object).intValue();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_assertColumnModelConsistency() throws IndexOutOfBoundsException
+    {
+        for ( int col = 0; col < m_columnModel.getColumnCount(); ++col )
+        {
+            final XGridColumn column = m_columnModel.getColumn( col );
+            assertNotNull( column );
+            assertEquals( "column/model inconsistency: column " + col + " has a wrong index!", col, column.getIndex() );
+        }
+
+        final XGridColumn[] allColumns = m_columnModel.getColumns();
+        assertEquals( "getColumns returns the wrong number of column objects",
+            m_columnModel.getColumnCount(), allColumns.length );
+        for ( int col = 0; col < m_columnModel.getColumnCount(); ++col )
+        {
+            assertTrue( "getColumns inconsistency", impl_areSameInterface( allColumns[col], m_columnModel.getColumn(col) ) );
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_assertEquality( final XGridDataModel i_reference, final XGridDataModel i_compare ) throws IndexOutOfBoundsException
+    {
+        assertNotNull( i_reference );
+        assertNotNull( i_compare );
+
+        assertEquals( "data model comparison: wrong column counts", i_reference.getColumnCount(), i_compare.getColumnCount() );
+        assertEquals( "data model comparison: wrong row counts", i_reference.getRowCount(), i_compare.getRowCount() );
+
+        for ( int row = 0; row < i_reference.getRowCount(); ++row )
+        {
+            assertEquals( "data model comparison: wrong row heading content in row " + row,
+                    i_reference.getRowHeading( row ) );
+            for ( int col = 0; col < i_reference.getRowCount(); ++col )
+            {
+                assertEquals( "data model comparison: wrong cell content in cell (" + col + ", " + row + ")",
+                    i_reference.getCellData( col, row ) );
+                assertEquals( "data model comparison: wrong tooltip content in cell (" + col + ", " + row + ")",
+                    i_reference.getCellToolTip( col, row ) );
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_assertEquality( final XGridColumnModel i_reference, final XGridColumnModel i_compare ) throws IndexOutOfBoundsException
+    {
+        assertEquals( "column model comparison: wrong column counts", i_reference.getColumnCount(), i_compare.getColumnCount() );
+        for ( int col = 0; col < i_reference.getColumnCount(); ++col )
+        {
+            final XGridColumn referenceColumn = i_reference.getColumn( col );
+            final XGridColumn compareColumn = i_compare.getColumn( col );
+            impl_assertEquality( referenceColumn, compareColumn );
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_assertEquality( final XGridColumn i_reference, final XGridColumn i_compare )
+    {
+        final Method[] methods = XGridColumn.class.getMethods();
+        for ( int m=0; m<methods.length; ++m )
+        {
+            if ( !methods[m].getName().startsWith( "get" ) )
+                continue;
+            try
+            {
+                final Object referenceValue = methods[m].invoke( i_reference );
+                final Object compareValue = methods[m].invoke( i_compare );
+                assertEquals( "grid column comparison: column attribute '" + methods[m].getName().substring(3) + "' does not match",
+                    referenceValue, compareValue );
+            }
+            catch ( java.lang.Exception ex )
+            {
+                fail( " could not retrieve object attributes: " + ex.toString() );
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private boolean impl_areSameInterface( final Object i_lhs, final Object i_rhs )
+    {
+        final XInterface lhs = UnoRuntime.queryInterface( XInterface.class, i_lhs );
+        final XInterface rhs = UnoRuntime.queryInterface( XInterface.class, i_rhs );
+        return UnoRuntime.areSame( lhs, rhs );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @BeforeClass
+    public static void setUpConnection() throws java.lang.Exception
+    {
+        System.out.println( "--------------------------------------------------------------------------------" );
+        System.out.println( "starting class: " + GridControl.class.getName() );
+        System.out.print( "connecting ... " );
+        m_connection.setUp();
+        System.out.println( "done.");
+
+        final long seed = m_randomGenerator.nextLong();
+        m_randomGenerator.setSeed( seed );
+        System.out.println( "seeding random number generator with " + seed );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @AfterClass
+    public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println();
+        System.out.println( "tearing down connection" );
+        m_connection.tearDown();
+        System.out.println( "finished class: " + GridControl.class.getName() );
+        System.out.println( "--------------------------------------------------------------------------------" );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    public <T> T createInstance( Class<T> i_interfaceClass, final String i_serviceIndentifer ) throws Exception
+    {
+        return UnoRuntime.queryInterface( i_interfaceClass, createInstance( i_serviceIndentifer ) );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private Object createInstance( final String i_serviceName ) throws Exception
+    {
+        Object instance = m_context.getServiceManager().createInstanceWithContext( i_serviceName, m_context );
+        assertNotNull( "could not create an instance of '" + i_serviceName + "'", instance );
+        return instance;
+    }
+    // -----------------------------------------------------------------------------------------------------------------
+    private static final class DisposeListener implements XEventListener
+    {
+        DisposeListener( final Object i_component )
+        {
+            m_component = UnoRuntime.queryInterface( XComponent.class, i_component );
+            assertNotNull( m_component );
+            m_component.addEventListener( this );
+        }
+
+        public void disposing( EventObject i_event )
+        {
+            assertTrue( UnoRuntime.areSame( i_event.Source, m_component ) );
+            m_isDisposed = true;
+        }
+
+        final boolean isDisposed() { return m_isDisposed; }
+
+        private final XComponent    m_component;
+        private boolean             m_isDisposed;
+    };
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private static final class ColumnModelListener implements XContainerListener
+    {
+        ColumnModelListener()
+        {
+        }
+
+        public void elementInserted( ContainerEvent i_event )
+        {
+            m_insertionEvents.add( i_event );
+        }
+
+        public void elementRemoved( ContainerEvent i_event )
+        {
+            m_removalEvents.add( i_event );
+        }
+
+        public void elementReplaced( ContainerEvent i_event )
+        {
+            m_replacementEvents.add( i_event );
+        }
+
+        public void disposing( EventObject eo )
+        {
+            m_isDisposed = true;
+        }
+
+        private List< ContainerEvent > assertExclusiveInsertionEvents()
+        {
+            assertFalse( m_insertionEvents.isEmpty() );
+            assertTrue( m_removalEvents.isEmpty() );
+            assertTrue( m_replacementEvents.isEmpty() );
+            return m_insertionEvents;
+        }
+
+        private List< ContainerEvent > assertExclusiveRemovalEvents()
+        {
+            assertTrue( m_insertionEvents.isEmpty() );
+            assertFalse( m_removalEvents.isEmpty() );
+            assertTrue( m_replacementEvents.isEmpty() );
+            return m_removalEvents;
+        }
+
+        private void reset()
+        {
+            m_insertionEvents = new ArrayList< ContainerEvent >();
+            m_removalEvents = new ArrayList< ContainerEvent >();
+            m_replacementEvents = new ArrayList< ContainerEvent >();
+        }
+
+        private List< ContainerEvent > getInsertionEvents() { return m_insertionEvents; }
+        private List< ContainerEvent > getRemovalEvents() { return m_removalEvents; }
+
+        final boolean isDisposed() { return m_isDisposed; }
+
+        private List< ContainerEvent > m_insertionEvents = new ArrayList< ContainerEvent >();
+        private List< ContainerEvent > m_removalEvents = new ArrayList< ContainerEvent >();
+        private List< ContainerEvent > m_replacementEvents = new ArrayList< ContainerEvent >();
+        private boolean m_isDisposed = false;
+    };
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private static final OfficeConnection m_connection = new OfficeConnection();
+    private static Random m_randomGenerator = new Random();
+    private final XComponentContext m_context;
+
+    private XPropertySet                    m_gridControlModel;
+    private XGridColumnModel                m_columnModel;
+    private XSortableMutableGridDataModel   m_dataModel;
+}
diff --git a/toolkit/qa/complex/toolkit/UnitConversion.java b/toolkit/qa/complex/toolkit/UnitConversion.java
new file mode 100644
index 000000000000..b4cf8a8e1490
--- /dev/null
+++ b/toolkit/qa/complex/toolkit/UnitConversion.java
@@ -0,0 +1,247 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+package complex.toolkit;
+
+import com.sun.star.awt.XUnitConversion;
+import com.sun.star.uno.UnoRuntime;
+
+import com.sun.star.awt.XWindow;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.awt.XWindowPeer;
+
+import util.DesktopTools;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+/**
+ * This complex test is only for testing the com.sun.star.awt.XUnitConversion methods
+ * These are converter methods to get the size of a well known awt component
+ * in a com.sun.star.util.MeasureUnit you want.
+ * You don't need to know the factors to calculate by hand.
+ *
+ * @author ll93751
+ */
+public class UnitConversion
+{
+    /**
+     * returns the delta value between a and b
+     * @param a
+     * @param b
+     * @return
+     */
+    private int delta(int a, int b)
+    {
+        final int n = Math.abs(a - b);
+        return n;
+    }
+
+    private XUnitConversion m_xConversion = null;
+
+    /**
+     * Not really a check,
+     * only a simple test call to convertSizeToLogic(...) with different parameters
+     * @param _aSize
+     * @param _aMeasureUnit
+     * @param _sEinheit
+     */
+    private void checkSize(com.sun.star.awt.Size _aSize, short _aMeasureUnit, String _sEinheit)
+    {
+        try
+        {
+            com.sun.star.awt.Size aSizeIn = m_xConversion.convertSizeToLogic(_aSize, _aMeasureUnit);
+            System.out.println("Window size:");
+            System.out.println("Width:" + aSizeIn.Width + " " + _sEinheit);
+            System.out.println("Height:" + aSizeIn.Height + " " + _sEinheit);
+            System.out.println("");
+        }
+        catch (com.sun.star.lang.IllegalArgumentException e)
+        {
+            System.out.println("Caught IllegalArgumentException in convertSizeToLogic with '" + _sEinheit + "' " + e.getMessage());
+        }
+    }
+
+    /**
+     * The real test function
+     * 1. try to get the XMultiServiceFactory of an already running office. Therefore make sure an (open|star)office is running with
+     *    parameters like -accept="socket,host=localhost,port=8100;urp;"
+     * 2. try to create an empty window
+     * 3. try to convert the WindowPeer to an XWindow
+     * 4. try to resize and move the window to an other position, so we get a well knowing position and size.
+     * 5. run some more tests
+     *
+     * If no test fails, the test is well done and returns with 'PASSED, OK'
+     *
+     */
+    @Test
+    public void testXUnitConversion()
+    {
+        final XMultiServiceFactory xMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+
+        assertNotNull("failed: There is no office.", xMSF);
+
+        // create a window
+        XWindowPeer xWindowPeer = DesktopTools.createFloatingWindow(xMSF);
+        assertNotNull("failed: there is no window peer", xWindowPeer);
+
+
+        // resize and move the window to a well known position and size
+        XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, xWindowPeer);
+        assertNotNull("failed: there is no window, cast wrong?", xWindow);
+
+        xWindow.setVisible(Boolean.TRUE);
+
+        int x = 100;
+        int y = 100;
+        int width = 640;
+        int height = 480;
+        xWindow.setPosSize(x, y, width, height, com.sun.star.awt.PosSize.POSSIZE);
+
+        com.sun.star.awt.Rectangle aRect = xWindow.getPosSize();
+        com.sun.star.awt.Point aPoint = new com.sun.star.awt.Point(aRect.X, aRect.Y);
+        com.sun.star.awt.Size aSize = new com.sun.star.awt.Size(aRect.Width, aRect.Height);
+
+        System.out.println("Window position and size in pixel:");
+        System.out.println("X:" + aPoint.X);
+        System.out.println("Y:" + aPoint.Y);
+        System.out.println("Width:" + aSize.Width);
+        System.out.println("Height:" + aSize.Height);
+        System.out.println("");
+
+        assertTrue("Window pos size wrong", aSize.Width == width && aSize.Height == height && aPoint.X == x && aPoint.Y == y);
+
+        m_xConversion = UnoRuntime.queryInterface(XUnitConversion.class, xWindowPeer);
+
+        // try to get the position of the window in 1/100mm with the XUnitConversion method
+        try
+        {
+            com.sun.star.awt.Point aPointInMM_100TH = m_xConversion.convertPointToLogic(aPoint, com.sun.star.util.MeasureUnit.MM_100TH);
+            System.out.println("Window position:");
+            System.out.println("X:" + aPointInMM_100TH.X + " 1/100mm");
+            System.out.println("Y:" + aPointInMM_100TH.Y + " 1/100mm");
+            System.out.println("");
+        }
+        catch (com.sun.star.lang.IllegalArgumentException e)
+        {
+            fail("failed: IllegalArgumentException caught in convertPointToLogic " + e.getMessage());
+        }
+
+        // try to get the size of the window in 1/100mm with the XUnitConversion method
+        com.sun.star.awt.Size aSizeInMM_100TH = null;
+        com.sun.star.awt.Size aSizeInMM_10TH = null;
+        try
+        {
+            aSizeInMM_100TH = m_xConversion.convertSizeToLogic(aSize, com.sun.star.util.MeasureUnit.MM_100TH);
+            System.out.println("Window size:");
+            System.out.println("Width:" + aSizeInMM_100TH.Width + " 1/100mm");
+            System.out.println("Height:" + aSizeInMM_100TH.Height + " 1/100mm");
+            System.out.println("");
+
+            // try to get the size of the window in 1/10mm with the XUnitConversion method
+
+            aSizeInMM_10TH = m_xConversion.convertSizeToLogic(aSize, com.sun.star.util.MeasureUnit.MM_10TH);
+            System.out.println("Window size:");
+            System.out.println("Width:" + aSizeInMM_10TH.Width + " 1/10mm");
+            System.out.println("Height:" + aSizeInMM_10TH.Height + " 1/10mm");
+            System.out.println("");
+
+            // check the size with a delta which must be smaller a given difference
+            assertTrue("Size.Width  not correct", delta(aSizeInMM_100TH.Width, aSizeInMM_10TH.Width * 10) < 10);
+            assertTrue("Size.Height not correct", delta(aSizeInMM_100TH.Height, aSizeInMM_10TH.Height * 10) < 10);
+
+            // new
+            checkSize(aSize, com.sun.star.util.MeasureUnit.PIXEL, "pixel");
+            checkSize(aSize, com.sun.star.util.MeasureUnit.APPFONT, "appfont");
+            checkSize(aSize, com.sun.star.util.MeasureUnit.SYSFONT, "sysfont");
+
+            // simply check some more parameters
+            checkSize(aSize, com.sun.star.util.MeasureUnit.MM, "mm");
+            checkSize(aSize, com.sun.star.util.MeasureUnit.CM, "cm");
+            checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_1000TH, "1/1000inch");
+            checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_100TH, "1/100inch");
+            checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_10TH, "1/10inch");
+            checkSize(aSize, com.sun.star.util.MeasureUnit.INCH, "inch");
+            // checkSize(aSize, com.sun.star.util.MeasureUnit.M, "m");
+            checkSize(aSize, com.sun.star.util.MeasureUnit.POINT, "point");
+            checkSize(aSize, com.sun.star.util.MeasureUnit.TWIP, "twip");
+            // checkSize(aSize, com.sun.star.util.MeasureUnit.KM, "km");
+            // checkSize(aSize, com.sun.star.util.MeasureUnit.PICA, "pica");
+            // checkSize(aSize, com.sun.star.util.MeasureUnit.FOOT, "foot");
+            // checkSize(aSize, com.sun.star.util.MeasureUnit.MILE, "mile");
+        }
+        catch (com.sun.star.lang.IllegalArgumentException e)
+        {
+            fail("failed: IllegalArgumentException caught in convertSizeToLogic " + e.getMessage());
+        }
+
+        // convert the 1/100mm window size back to pixel
+        try
+        {
+            com.sun.star.awt.Size aNewSize = m_xConversion.convertSizeToPixel(aSizeInMM_100TH, com.sun.star.util.MeasureUnit.MM_100TH);
+            System.out.println("Window size:");
+            System.out.println("Width:" + aNewSize.Width + " pixel");
+            System.out.println("Height:" + aNewSize.Height + " pixel");
+
+            // assure the pixels are the same as we already know
+            assertTrue("failed: Size from pixel to 1/100mm to pixel", aSize.Width == aNewSize.Width && aSize.Height == aNewSize.Height);
+        }
+        catch (com.sun.star.lang.IllegalArgumentException e)
+        {
+            fail("failed: IllegalArgumentException caught in convertSizeToPixel " + e.getMessage());
+        }
+
+        // close the window.
+        // IMHO a little bit stupid, but the XWindow doesn't support a XCloseable interface
+        xWindow.dispose();
+    }
+
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println( "--------------------------------------------------------------------------------" );
+        System.out.println( "starting class: " + UnitConversion.class.getName() );
+        System.out.println( "connecting ..." );
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println();
+        System.out.println( "tearing down connection" );
+        connection.tearDown();
+        System.out.println( "finished class: " + UnitConversion.class.getName() );
+        System.out.println( "--------------------------------------------------------------------------------" );
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/toolkit/qa/complex/toolkit/_XRequestCallback.java b/toolkit/qa/complex/toolkit/_XRequestCallback.java
deleted file mode 100644
index b9486c04c80a..000000000000
--- a/toolkit/qa/complex/toolkit/_XRequestCallback.java
+++ /dev/null
@@ -1,88 +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.
- *
- ************************************************************************/
-
-package complex.toolkit;
-
-import com.sun.star.awt.XRequestCallback;
-// import lib.MultiMethodTest;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-import com.sun.star.uno.UnoRuntime;
-// import share.LogWriter;
-
-/**
- * Testing <code>com.sun.star.awt.XRequestCallback</code>
- * interface methods :
- * <ul>
- *  <li><code> addCallback()</code></li>
- * </ul> <p>
- * @see com.sun.star.awt.XRequestCallback
- */
-public class _XRequestCallback {
-
-    // private LogWriter log;
-
-    private static final String className =
-        "com.sun.star.awt.XRequestCallback" ;
-
-    public XRequestCallback oObj = null;
-    private XMultiServiceFactory xMSF;
-
-    String text = null;
-
-
-    public _XRequestCallback(XInterface object, XMultiServiceFactory xMSF ) {
-        oObj = UnoRuntime.queryInterface(XRequestCallback.class, object);
-        this.xMSF = xMSF;
-        // this.log = log;
-    }
-
-
-    /**
-     * Calls the method and checks returned value.
-     * Has OK status if returned value is equal to <code>chCount - 1</code>.
-     * The following method tests are to be executed before:
-     * <ul>
-     *  <li> <code>addCallback()</code> </li>
-     * </ul>
-     * @return
-     */
-    public boolean _addCallback() {
-
-        boolean res = true;
-        try {
-            Object a = new Object();
-            oObj.addCallback( null, a );
-        } catch (com.sun.star.uno.RuntimeException ie) {
-            res = false;
-        }
-        System.out.println("addCallback called" );
-
-        return res;
-    }
-
-}
diff --git a/toolkit/qa/complex/toolkit/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
index ae3e293e50fc..7dca37ce18b7 100755
--- a/toolkit/qa/complex/toolkit/_XAccessibleComponent.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
@@ -25,9 +25,8 @@
  *
  ************************************************************************/
 
-package complex.toolkit;
+package complex.toolkit.accessibility;
 
-// import share.LogWriter;
 import com.sun.star.awt.Point;
 import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.Size;
diff --git a/toolkit/qa/complex/toolkit/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java
index de2928fdabe3..14debda92cd8 100755
--- a/toolkit/qa/complex/toolkit/_XAccessibleContext.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.toolkit;
+package complex.toolkit.accessibility;
 
 import com.sun.star.lang.Locale;
 import com.sun.star.uno.XInterface;
diff --git a/toolkit/qa/complex/toolkit/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
index 899028daec87..535c7ce36c68 100755
--- a/toolkit/qa/complex/toolkit/_XAccessibleEventBroadcaster.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.toolkit;
+package complex.toolkit.accessibility;
 
 import com.sun.star.lang.EventObject;
 import com.sun.star.awt.Rectangle;
@@ -33,13 +33,11 @@ import com.sun.star.awt.PosSize;
 import com.sun.star.awt.XWindow;
 import com.sun.star.accessibility.AccessibleEventObject;
 import com.sun.star.accessibility.XAccessible;
-// import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.accessibility.XAccessibleEventBroadcaster;
 import com.sun.star.accessibility.XAccessibleEventListener;
 import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.uno.XInterface;
 import com.sun.star.uno.UnoRuntime;
-// import share.LogWriter;
 
 /**
  * Testing <code>
@@ -62,12 +60,7 @@ import com.sun.star.uno.UnoRuntime;
  */
 public class _XAccessibleEventBroadcaster {
 
-    // private LogWriter log;
-    private static final String className =
-            "com.sun.star.accessibility.XAccessibleEventBroadcaster" ;
-
     public XAccessibleEventBroadcaster oObj = null;
-    public String EventMsg = "";
     EventProducer prod = null ;
     EvListener list = new EvListener();
 
@@ -120,11 +113,9 @@ public class _XAccessibleEventBroadcaster {
      * @param eventMessage
      * @param window
      */
-    public _XAccessibleEventBroadcaster(XInterface object, String eventMessage, XWindow window) {
+    public _XAccessibleEventBroadcaster(XInterface object, XWindow window) {
         oObj = UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class, object);
-        // this.log = log;
         prod = new EventProducer(window);
-        EventMsg = eventMessage;
     }
 
     /**
@@ -157,7 +148,6 @@ public class _XAccessibleEventBroadcaster {
             oObj.removeEventListener(list);
         }
 
-//        System.out.println(EventMsg);
         return works;
     }
 
diff --git a/toolkit/qa/complex/toolkit/_XAccessibleExtendedComponent.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java
index 2ba5c190cf31..551b00acada7 100755
--- a/toolkit/qa/complex/toolkit/_XAccessibleExtendedComponent.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.toolkit;
+package complex.toolkit.accessibility;
 
 // import lib.MultiMethodTest;
 import com.sun.star.accessibility.XAccessibleExtendedComponent;
diff --git a/toolkit/qa/complex/toolkit/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
index 151e6b3f7d0b..a12d93a2d9e2 100755
--- a/toolkit/qa/complex/toolkit/_XAccessibleText.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.toolkit;
+package complex.toolkit.accessibility;
 
 import com.sun.star.accessibility.XAccessibleText;
 // import lib.MultiMethodTest;
diff --git a/toolkit/qa/complex/toolkit/awtgrid/DummyColumn.java b/toolkit/qa/complex/toolkit/awtgrid/DummyColumn.java
new file mode 100755
index 000000000000..11e4a4b19f80
--- /dev/null
+++ b/toolkit/qa/complex/toolkit/awtgrid/DummyColumn.java
@@ -0,0 +1,180 @@
+/*************************************************************************
+ * 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.
+ *
+ *************************************************************************/
+
+package complex.toolkit.awtgrid;
+
+import com.sun.star.awt.grid.XGridColumn;
+import com.sun.star.awt.grid.XGridColumnListener;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.XEventListener;
+import com.sun.star.style.HorizontalAlignment;
+import com.sun.star.util.XCloneable;
+
+/**
+ * a dummy implementation of css.awt.grid.XGridColumn
+ * @author frank.schoenheit@oracle.com
+ */
+public class DummyColumn implements XGridColumn
+{
+    public DummyColumn()
+    {
+    }
+
+    public Object getIdentifier()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void setIdentifier( Object o )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public int getColumnWidth()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void setColumnWidth( int i )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public int getMinWidth()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void setMinWidth( int i )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public int getMaxWidth()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void setMaxWidth( int i )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public boolean getResizeable()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void setResizeable( boolean bln )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public int getFlexibility()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void setFlexibility( int i ) throws IllegalArgumentException
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public HorizontalAlignment getHorizontalAlign()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void setHorizontalAlign( HorizontalAlignment ha )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public String getTitle()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void setTitle( String string )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public String getHelpText()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void setHelpText( String string )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public int getIndex()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public int getDataColumnIndex()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void setDataColumnIndex( int i )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void addGridColumnListener( XGridColumnListener xl )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void removeGridColumnListener( XGridColumnListener xl )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void dispose()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void addEventListener( XEventListener xl )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public void removeEventListener( XEventListener xl )
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+
+    public XCloneable createClone()
+    {
+        throw new UnsupportedOperationException( "Not supported yet." );
+    }
+}
diff --git a/toolkit/qa/complex/toolkit/awtgrid/GridDataListener.java b/toolkit/qa/complex/toolkit/awtgrid/GridDataListener.java
new file mode 100755
index 000000000000..c31f27796cf1
--- /dev/null
+++ b/toolkit/qa/complex/toolkit/awtgrid/GridDataListener.java
@@ -0,0 +1,98 @@
+package complex.toolkit.awtgrid;
+
+import com.sun.star.awt.grid.GridDataEvent;
+import com.sun.star.awt.grid.XGridDataListener;
+import com.sun.star.lang.EventObject;
+import static org.junit.Assert.*;
+
+final public class GridDataListener implements XGridDataListener
+{
+    public GridDataListener()
+    {
+    }
+
+    public void rowsInserted( GridDataEvent i_event )
+    {
+        assertNull( m_rowInsertionEvent );
+        m_rowInsertionEvent = i_event;
+    }
+
+    public void rowsRemoved( GridDataEvent i_event )
+    {
+        assertNull( m_rowRemovalEvent );
+        m_rowRemovalEvent = i_event;
+    }
+
+    public void dataChanged( GridDataEvent i_event )
+    {
+        assertNull( m_dataChangeEvent );
+        m_dataChangeEvent = i_event;
+    }
+
+    public void rowHeadingChanged( GridDataEvent i_event )
+    {
+        assertNull( m_rowHeadingChangeEvent );
+        m_rowHeadingChangeEvent = i_event;
+    }
+
+    public void disposing( EventObject eo )
+    {
+        m_disposed = true;
+    }
+
+    public final GridDataEvent assertSingleRowInsertionEvent()
+    {
+        assertNotNull( m_rowInsertionEvent );
+        assertNull( m_rowRemovalEvent );
+        assertNull( m_dataChangeEvent );
+        assertNull( m_rowHeadingChangeEvent );
+        assertFalse( m_disposed );
+        return m_rowInsertionEvent;
+    }
+
+    public final GridDataEvent assertSingleRowRemovalEvent()
+    {
+        assertNull( m_rowInsertionEvent );
+        assertNotNull( m_rowRemovalEvent );
+        assertNull( m_dataChangeEvent );
+        assertNull( m_rowHeadingChangeEvent );
+        assertFalse( m_disposed );
+        return m_rowRemovalEvent;
+    }
+
+    public final GridDataEvent assertSingleDataChangeEvent()
+    {
+        assertNull( m_rowInsertionEvent );
+        assertNull( m_rowRemovalEvent );
+        assertNotNull( m_dataChangeEvent );
+        assertNull( m_rowHeadingChangeEvent );
+        assertFalse( m_disposed );
+        return m_dataChangeEvent;
+    }
+
+    public final GridDataEvent assertSingleRowHeadingChangeEvent()
+    {
+        assertNull( m_rowInsertionEvent );
+        assertNull( m_rowRemovalEvent );
+        assertNull( m_dataChangeEvent );
+        assertNotNull( m_rowHeadingChangeEvent );
+        assertFalse( m_disposed );
+        return m_rowHeadingChangeEvent;
+    }
+
+    public final boolean isDisposed()
+    {
+        return m_disposed;
+    }
+
+    public final void reset()
+    {
+        m_rowInsertionEvent = m_rowRemovalEvent = m_dataChangeEvent = m_rowHeadingChangeEvent = null;
+        // m_disposed is not reset intentionally
+    }
+    private GridDataEvent m_rowInsertionEvent = null;
+    private GridDataEvent m_rowRemovalEvent = null;
+    private GridDataEvent m_dataChangeEvent = null;
+    private GridDataEvent m_rowHeadingChangeEvent = null;
+    private boolean m_disposed = false;
+}
diff --git a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
new file mode 100755
index 000000000000..c550dd9a047d
--- /dev/null
+++ b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
@@ -0,0 +1,314 @@
+/*************************************************************************
+ * 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.
+ *
+ *************************************************************************/
+
+package complex.toolkit.awtgrid;
+
+import java.lang.reflect.Method;
+import com.sun.star.awt.grid.GridDataEvent;
+import com.sun.star.awt.grid.XMutableGridDataModel;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.IndexOutOfBoundsException;
+import static org.junit.Assert.*;
+import static complex.toolkit.Assert.*;
+
+/** test for the <code>css.awt.grid.XMutableGridData</code> interface
+ *
+ * @author frank.schoenheit@oracle.com
+ */
+public class TMutableGridDataModel
+{
+    public TMutableGridDataModel( final XMutableGridDataModel i_dataModel )
+    {
+        m_dataModel = i_dataModel;
+
+        m_listener = new GridDataListener();
+        m_dataModel.addGridDataListener( m_listener );
+    }
+
+    /*
+     * tests the XMutableGridDataModel.addRow method
+     */
+    public void testAddRow() throws IndexOutOfBoundsException
+    {
+        m_dataModel.addRow( 1, m_rowValues[0] );
+        GridDataEvent event = m_listener.assertSingleRowInsertionEvent();
+        m_listener.reset();
+        assertEquals( "row insertion: wrong FirstRow (1)", 0, event.FirstRow );
+        assertEquals( "row insertion: wrong LastRow (1)", 0, event.LastRow );
+        impl_assertRowData( 0 );
+
+        m_dataModel.addRow( 2, m_rowValues[1] );
+        event = m_listener.assertSingleRowInsertionEvent();
+        m_listener.reset();
+        assertEquals( "row insertion: wrong FirstRow (2)", 1, event.FirstRow );
+        assertEquals( "row insertion: wrong LastRow (2)", 1, event.LastRow );
+        impl_assertRowData( 1 );
+    }
+
+    /**
+     * tests the XMutableGridDataModel.addRows method
+     */
+    public void testAddRows() throws IndexOutOfBoundsException, IllegalArgumentException
+    {
+        assertEquals( "precondition not met: call this directly after testAddRow, please!", 2, m_dataModel.getRowCount() );
+
+        m_dataModel.addRows( new Object[] { "3", 4.0, "5" }, new Object[][] { m_rowValues[2], m_rowValues[3], m_rowValues[4] } );
+        GridDataEvent event = m_listener.assertSingleRowInsertionEvent();
+        assertEquals( "row insertion: wrong FirstRow (1)", 2, event.FirstRow );
+        assertEquals( "row insertion: wrong LastRow (1)", 4, event.LastRow );
+        m_listener.reset();
+
+        assertEquals( "data model's row count is not adjusted when adding rows", m_rowValues.length, m_dataModel.getRowCount() );
+        assertEquals( "data model's column count is not adjusted when adding rows", m_rowValues[0].length, m_dataModel.getColumnCount() );
+        for ( int row=0; row<m_rowValues.length; ++row )
+        {
+            for ( int col=0; col<m_rowValues[row].length; ++col )
+            {
+                assertEquals( "added row values are not preserved",
+                    m_rowValues[row][col], m_dataModel.getCellData( col, row ) );
+            }
+        }
+
+        assertException( "addRows is expected to throw when invoked with different-sized arrays",
+            m_dataModel, "addRows", new Object[] { new Object[0], new Object[1][2] }, IllegalArgumentException.class );
+    }
+
+    /**
+     * tests the XMutableGridDataModel.removeRow method
+     */
+    public void testRemoveRow() throws IndexOutOfBoundsException
+    {
+        assertEquals( "precondition not met: call this directly after testAddRows, please!", m_rowValues.length, m_dataModel.getRowCount() );
+
+        final int rowToRemove = 2;
+        m_dataModel.removeRow( rowToRemove );
+        GridDataEvent event = m_listener.assertSingleRowRemovalEvent();
+        assertEquals( "incorrect notification of row removal (FirstRow)", rowToRemove, event.FirstRow );
+        assertEquals( "incorrect notification of row removal (LastRow)", rowToRemove, event.LastRow );
+        m_listener.reset();
+
+        assertEquals( "data model's row count does not reflect the removed row", m_rowValues.length - 1, m_dataModel.getRowCount() );
+        for ( int row = rowToRemove; row<m_rowValues.length-1; ++row )
+        {
+            for ( int col=0; col<m_rowValues[row].length; ++col )
+            {
+                assertEquals( "unexpected row values after removing a row (col: " + col + ", row: " + row + ")",
+                    m_rowValues[row+1][col], m_dataModel.getCellData( col, row ) );
+            }
+        }
+
+        assertException( "removeRow silently ignores an invalid index (1)",
+            m_dataModel, "removeRow", new Object[] { -1 }, IndexOutOfBoundsException.class );
+        assertException( "removeRow silently ignores an invalid index (2)",
+            m_dataModel, "removeRow", new Object[] { m_dataModel.getRowCount() }, IndexOutOfBoundsException.class );
+    }
+
+    /**
+     * tests the XMutableGridDataModel.removeAllRows method
+     */
+    public void testRemoveAllRows()
+    {
+        assertEquals( "precondition not met: call this directly after testRemoveRow, please!", m_rowValues.length - 1, m_dataModel.getRowCount() );
+
+        m_dataModel.removeAllRows();
+        final GridDataEvent event = m_listener.assertSingleRowRemovalEvent();
+        if ( event.FirstRow != -1 )
+        {   // notifying "-1" is allowed, this means "all rows affected", by definition
+            assertEquals( "removeAllRows is not notifying properly (1)", 0, event.FirstRow );
+            assertEquals( "removeAllRows is not notifying properly (2)", m_rowValues.length - 1, event.LastRow );
+        }
+        m_listener.reset();
+    }
+
+    /**
+     * tests the XMutableGridDataModel.updateCellData method
+     */
+    public void testUpdateCellData() throws IndexOutOfBoundsException, IllegalArgumentException
+    {
+        assertEquals( "precondition not met: call this directly after testRemoveAllRows, please!", 0, m_dataModel.getRowCount() );
+
+        m_dataModel.addRows( new Object[] { 1, 2, 3, 4, 5 }, m_rowValues );
+        m_listener.assertSingleRowInsertionEvent();
+        m_listener.reset();
+
+        final Object[][] modifyValues = new Object[][] {
+            new Object[] { 2, 1, "text" },
+            new Object[] { 3, 0, null },
+            new Object[] { 0, 4, new Double( 33.0 ) }
+        };
+        for ( int i = 0; i < modifyValues.length; ++i )
+        {
+            final int row = ((Integer)modifyValues[i][0]).intValue();
+            final int col = ((Integer)modifyValues[i][1]).intValue();
+            final Object value = modifyValues[i][2];
+            m_dataModel.updateCellData( col, row, value );
+
+            final GridDataEvent event = m_listener.assertSingleDataChangeEvent();
+            assertEquals( "data change notification: FirstRow is invalid", row, event.FirstRow );
+            assertEquals( "data change notification: LastRow is invalid", row, event.LastRow );
+            assertEquals( "data change notification: FirstColumn is invalid", col, event.FirstColumn );
+            assertEquals( "data change notification: LastColumn is invalid", col, event.LastColumn );
+            m_listener.reset();
+
+            assertEquals( "data change at (" + col + ", " + row + ") not successful", value, m_dataModel.getCellData( col, row ) );
+        }
+
+        assertException( "updateCellData silently ignores an invalid index (1)",
+            m_dataModel, "updateCellData", new Class[] { int.class, int.class, Object.class },
+            new Object[] { -1, -1, "text" }, IndexOutOfBoundsException.class );
+        assertException( "updateCellData silently ignores an invalid index (2)",
+            m_dataModel, "updateCellData", new Class[] { int.class, int.class, Object.class },
+            new Object[] { 0, m_dataModel.getRowCount(), "text" }, IndexOutOfBoundsException.class );
+        assertException( "updateCellData silently ignores an invalid index (3)",
+            m_dataModel, "updateCellData", new Class[] { int.class, int.class, Object.class },
+            new Object[] { m_dataModel.getColumnCount(), 0, "text" }, IndexOutOfBoundsException.class );
+    }
+
+    /**
+     * tests the XMutableGridDataModel.updateRowData method
+     */
+    public void testUpdateRowData() throws IndexOutOfBoundsException, IllegalArgumentException
+    {
+        assertEquals( "precondition not met: call this directly after testRemoveAllRows, please!", m_rowValues.length, m_dataModel.getRowCount() );
+
+        // get data from before the update
+        final Object[][] preUpdateValues = impl_getCurrentData();
+
+        // do the update
+        final int[] colIndexes = new int[] {
+            0, 3, 4
+        };
+        final Object[] values = new Object[] {
+            13, null, 42.0
+        };
+        final int rowToUpdate = 2;
+        m_dataModel.updateRowData( colIndexes, rowToUpdate, values );
+        final GridDataEvent event = m_listener.assertSingleDataChangeEvent();
+        assertEquals( "row update notification: FirstRow is invalid", rowToUpdate, event.FirstRow );
+        assertEquals( "row update notification: LastRow is invalid", rowToUpdate, event.LastRow );
+        assertEquals( "row update notification: FirstColumn is invalid", 0, event.FirstColumn );
+        assertEquals( "row update notification: LastColumn is invalid", 4, event.LastColumn );
+        m_listener.reset();
+
+        // reflect the changes made in the pre-update data
+        for ( int i=0; i<colIndexes.length; ++i )
+        {
+            preUpdateValues[rowToUpdate][colIndexes[i]] = values[i];
+        }
+
+        // get data from after the update
+        final Object[][] postUpdateValues = impl_getCurrentData();
+
+        // ensure both the manually updated pre-update data and the post-update data are identical
+        assertArrayEquals( preUpdateValues, postUpdateValues );
+
+
+        assertException( "updateRowData silently ignores an invalid index (1)",
+            m_dataModel, "updateRowData", new Class[] { int[].class, int.class, Object[].class },
+            new Object[] { new int[] { -1 }, 0, new Object[] { "text" } }, IndexOutOfBoundsException.class );
+        assertException( "updateRowData silently ignores an invalid index (2)",
+            m_dataModel, "updateRowData", new Class[] { int[].class, int.class, Object[].class },
+            new Object[] { new int[] { 0 }, -1, new Object[] { "" } }, IndexOutOfBoundsException.class );
+        assertException( "updateRowData silently ignores different-sized arrays",
+            m_dataModel, "updateRowData", new Class[] { int[].class, int.class, Object[].class },
+            new Object[] { new int[] { 0, 0 }, 0, new Object[] { "" } }, IllegalArgumentException.class );
+    }
+
+    /**
+     * tests the XMutableGridDataModel.updateRowHeading method
+     */
+    public void testUpdateRowHeading() throws IndexOutOfBoundsException
+    {
+        assertEquals( "precondition not met: call this directly after testUpdateRowData, please!", m_rowValues.length, m_dataModel.getRowCount() );
+
+        final Object[] preUpdateHeadings = impl_getCurrentRowHeadings();
+
+        final int rowToUpdate = 2;
+        final String valueToUpdate = "some text";
+        m_dataModel.updateRowHeading( rowToUpdate, valueToUpdate );
+        final GridDataEvent event = m_listener.assertSingleRowHeadingChangeEvent();
+        assertEquals( "row heading update notification: FirstRow is invalid", rowToUpdate, event.FirstRow );
+        assertEquals( "row heading update notification: FirstRow is invalid", rowToUpdate, event.LastRow );
+        m_listener.reset();
+
+        preUpdateHeadings[rowToUpdate] = valueToUpdate;
+
+        final Object[] postUpdateHeadings = impl_getCurrentRowHeadings();
+        assertArrayEquals( preUpdateHeadings, postUpdateHeadings );
+
+        assertException( "updateRowHeading silently ignores an invalid index",
+            m_dataModel, "updateRowHeading", new Class[] { int.class, Object.class },
+            new Object[] { -1, "" }, IndexOutOfBoundsException.class );
+    }
+
+    public void cleanup()
+    {
+        m_dataModel.removeGridDataListener( m_listener );
+    }
+
+    private Object[][] impl_getCurrentData() throws IndexOutOfBoundsException
+    {
+        final int rowCount = m_dataModel.getRowCount();
+        final int colCount = m_dataModel.getColumnCount();
+        final Object[][] data = new Object[rowCount][colCount];
+        for ( int row=0; row<rowCount; ++row )
+        {
+            for ( int col=0; col<colCount; ++col )
+            {
+                data[row][col] = m_dataModel.getCellData( col, row );
+            }
+        }
+        return data;
+    }
+
+    private Object[] impl_getCurrentRowHeadings() throws IndexOutOfBoundsException
+    {
+        final int rowCount = m_dataModel.getRowCount();
+        final Object[] headings = new Object[rowCount];
+        for ( int row=0; row<rowCount; ++row )
+            headings[row] = m_dataModel.getRowHeading( row );
+        return headings;
+    }
+
+    private void impl_assertRowData( final int i_rowIndex ) throws IndexOutOfBoundsException
+    {
+        for ( int i=0; i<m_rowValues[i_rowIndex].length; ++i )
+        {
+            assertEquals( m_rowValues[i_rowIndex][i], m_dataModel.getCellData( i, i_rowIndex ) );
+        }
+    }
+
+    private final XMutableGridDataModel m_dataModel;
+    private final GridDataListener      m_listener;
+
+    private final static Object[][] m_rowValues = new Object[][] {
+            new Object[] { 1, 2, "3", 4, 5 },
+            new Object[] { 2, 3, 4, "5", 6 },
+            new Object[] { "3", 4, 5, 6, 7 },
+            new Object[] { 4, 5, 6, 7, "8" },
+            new Object[] { 5, "6", 7, 8, 9 },
+        };
+}
diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk
new file mode 100755
index 000000000000..ecb173f9bdac
--- /dev/null
+++ b/toolkit/qa/complex/toolkit/makefile.mk
@@ -0,0 +1,97 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+.IF "$(OOO_JUNIT_JAR)" == ""
+nothing .PHONY:
+    @echo -----------------------------------------------------
+    @echo - JUnit not available, not building anything
+    @echo -----------------------------------------------------
+.ELSE   # IF "$(OOO_JUNIT_JAR)" != ""
+
+PRJ = ../../..
+PRJNAME = toolkit
+TARGET = qa_complex_toolkit
+PACKAGE = complex/toolkit
+
+# --- Settings -----------------------------------------------------
+.INCLUDE: settings.mk
+
+#----- compile .java files -----------------------------------------
+
+JARFILES = OOoRunnerLight.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+
+JAVAFILES = \
+    $(JAVATESTFILES) \
+    accessibility/_XAccessibleComponent.java \
+    accessibility/_XAccessibleContext.java \
+    accessibility/_XAccessibleEventBroadcaster.java \
+    accessibility/_XAccessibleExtendedComponent.java \
+    accessibility/_XAccessibleText.java \
+    Assert.java \
+    awtgrid/GridDataListener.java \
+    awtgrid/TMutableGridDataModel.java \
+    awtgrid/DummyColumn.java \
+
+#----- create a jar from compiled files ----------------------------
+
+JARTARGET       = $(TARGET).jar
+
+#----- JUnit tests class -------------------------------------------
+
+JAVATESTFILES = \
+    GridControl.java \
+    UnitConversion.java \
+
+
+# disabled for now - the tests fail on at least one platform
+# no issue, yet (not sure this is worth it. Don't know who to give the issue to, and don't know whether the test really makes sense)
+DISABLED_JAVA_TEST_FILES=\
+    AccessibleStatusBar.java\
+    AccessibleStatusBarItem.java
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE: target.mk
+
+ALL :   ALLTAR
+
+# --- subsequent tests ---------------------------------------------
+
+.IF "$(OOO_SUBSEQUENT_TESTS)" != ""
+
+.INCLUDE: installationtest.mk
+
+ALLTAR : javatest
+
+    # Sample how to debug
+    # JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
+
+.END    # "$(OOO_SUBSEQUENT_TESTS)" == ""
+
+.END    # ELSE "$(OOO_JUNIT_JAR)" != ""
diff --git a/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java b/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java
deleted file mode 100644
index f9840e4bde6f..000000000000
--- a/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java
+++ /dev/null
@@ -1,250 +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.
- *
- ************************************************************************/
-
-package complex.xunitconversion;
-
-import com.sun.star.awt.XUnitConversion;
-import com.sun.star.uno.UnoRuntime;
-
-import com.sun.star.awt.XWindow;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.awt.XWindowPeer;
-
-import util.DesktopTools;
-
-// import org.junit.After;
-import org.junit.AfterClass;
-// import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-/**
- * This complex test is only for testing the com.sun.star.awt.XUnitConversion methods
- * These are converter methods to get the size of a well known awt component
- * in a com.sun.star.util.MeasureUnit you want.
- * You don't need to know the factors to calculate by hand.
- *
- * @author ll93751
- */
-public class XUnitConversionTest
-{
-//    public String[] getTestMethodNames()
-//        {
-//            return new String[]{"testXUnitConversion"}; // function name of the test method
-//        }
-
-        /**
-         * returns the delta value between a and b
-         * @param a
-         * @param b
-         * @return
-         */
-    private int delta(int a, int b)
-    {
-        final int n = Math.abs(a - b);
-        return n;
-    }
-
-    private XUnitConversion m_xConversion = null;
-
-    /**
- * Not really a check,
- * only a simple test call to convertSizeToLogic(...) with different parameters
- * @param _aSize
- * @param _aMeasureUnit
- * @param _sEinheit
- */
-    private void checkSize(com.sun.star.awt.Size _aSize, short _aMeasureUnit, String _sEinheit)
-    {
-        try
-        {
-            com.sun.star.awt.Size aSizeIn = m_xConversion.convertSizeToLogic(_aSize, _aMeasureUnit);
-            System.out.println("Window size:");
-            System.out.println("Width:" + aSizeIn.Width + " " + _sEinheit);
-            System.out.println("Height:" + aSizeIn.Height + " " + _sEinheit);
-            System.out.println("");
-        }
-        catch (com.sun.star.lang.IllegalArgumentException e)
-        {
-            System.out.println("Caught IllegalArgumentException in convertSizeToLogic with '" + _sEinheit + "' " + e.getMessage());
-        }
-    }
-
-/**
- * The real test function
- * 1. try to get the XMultiServiceFactory of an already running office. Therefore make sure an (open|star)office is running with
- *    parameters like -accept="socket,host=localhost,port=8100;urp;"
- * 2. try to create an empty window
- * 3. try to convert the WindowPeer to an XWindow
- * 4. try to resize and move the window to an other position, so we get a well knowing position and size.
- * 5. run some more tests
- *
- * If no test fails, the test is well done and returns with 'PASSED, OK'
- *
- */
-    @Test public void testXUnitConversion()
-        {
-            // XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF();
-            final XMultiServiceFactory xMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-
-            assertNotNull("failed: There is no office.", xMSF);
-
-            // create a window
-            XWindowPeer xWindowPeer = DesktopTools.createFloatingWindow(xMSF);
-            assertNotNull("failed: there is no window peer", xWindowPeer);
-
-
-            // resize and move the window to a well known position and size
-            XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, xWindowPeer);
-            assertNotNull("failed: there is no window, cast wrong?", xWindow);
-
-            xWindow.setVisible(Boolean.TRUE);
-
-            int x = 100;
-            int y = 100;
-            int width = 640;
-            int height = 480;
-            xWindow.setPosSize(x, y, width, height, com.sun.star.awt.PosSize.POSSIZE);
-
-            com.sun.star.awt.Rectangle aRect = xWindow.getPosSize();
-            com.sun.star.awt.Point aPoint = new com.sun.star.awt.Point(aRect.X, aRect.Y);
-            com.sun.star.awt.Size aSize = new com.sun.star.awt.Size(aRect.Width, aRect.Height);
-
-            System.out.println("Window position and size in pixel:");
-            System.out.println("X:" + aPoint.X);
-            System.out.println("Y:" + aPoint.Y);
-            System.out.println("Width:" + aSize.Width);
-            System.out.println("Height:" + aSize.Height);
-            System.out.println("");
-
-            assertTrue("Window pos size wrong", aSize.Width == width && aSize.Height == height && aPoint.X == x && aPoint.Y == y);
-
-            // XToolkit aToolkit = xWindowPeer.getToolkit();
-            m_xConversion = UnoRuntime.queryInterface(XUnitConversion.class, xWindowPeer);
-
-            // try to get the position of the window in 1/100mm with the XUnitConversion method
-            try
-            {
-                com.sun.star.awt.Point aPointInMM_100TH = m_xConversion.convertPointToLogic(aPoint, com.sun.star.util.MeasureUnit.MM_100TH);
-                System.out.println("Window position:");
-                System.out.println("X:" + aPointInMM_100TH.X + " 1/100mm");
-                System.out.println("Y:" + aPointInMM_100TH.Y + " 1/100mm");
-                System.out.println("");
-            }
-            catch (com.sun.star.lang.IllegalArgumentException e)
-            {
-                fail("failed: IllegalArgumentException caught in convertPointToLogic " + e.getMessage());
-            }
-
-            // try to get the size of the window in 1/100mm with the XUnitConversion method
-            com.sun.star.awt.Size aSizeInMM_100TH = null;
-            com.sun.star.awt.Size aSizeInMM_10TH = null;
-            try
-            {
-                aSizeInMM_100TH = m_xConversion.convertSizeToLogic(aSize, com.sun.star.util.MeasureUnit.MM_100TH);
-                System.out.println("Window size:");
-                System.out.println("Width:" + aSizeInMM_100TH.Width + " 1/100mm");
-                System.out.println("Height:" + aSizeInMM_100TH.Height + " 1/100mm");
-                System.out.println("");
-
-                // try to get the size of the window in 1/10mm with the XUnitConversion method
-
-                aSizeInMM_10TH = m_xConversion.convertSizeToLogic(aSize, com.sun.star.util.MeasureUnit.MM_10TH);
-                System.out.println("Window size:");
-                System.out.println("Width:" + aSizeInMM_10TH.Width + " 1/10mm");
-                System.out.println("Height:" + aSizeInMM_10TH.Height + " 1/10mm");
-                System.out.println("");
-
-                // check the size with a delta which must be smaller a given difference
-                assertTrue("Size.Width  not correct", delta(aSizeInMM_100TH.Width, aSizeInMM_10TH.Width * 10) < 10);
-                assertTrue("Size.Height not correct", delta(aSizeInMM_100TH.Height, aSizeInMM_10TH.Height * 10) < 10);
-
-                // new
-                checkSize(aSize, com.sun.star.util.MeasureUnit.PIXEL, "pixel");
-                checkSize(aSize, com.sun.star.util.MeasureUnit.APPFONT, "appfont");
-                checkSize(aSize, com.sun.star.util.MeasureUnit.SYSFONT, "sysfont");
-
-                // simply check some more parameters
-                checkSize(aSize, com.sun.star.util.MeasureUnit.MM, "mm");
-                checkSize(aSize, com.sun.star.util.MeasureUnit.CM, "cm");
-                checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_1000TH, "1/1000inch");
-                checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_100TH, "1/100inch");
-                checkSize(aSize, com.sun.star.util.MeasureUnit.INCH_10TH, "1/10inch");
-                checkSize(aSize, com.sun.star.util.MeasureUnit.INCH, "inch");
-                // checkSize(aSize, com.sun.star.util.MeasureUnit.M, "m");
-                checkSize(aSize, com.sun.star.util.MeasureUnit.POINT, "point");
-                checkSize(aSize, com.sun.star.util.MeasureUnit.TWIP, "twip");
-                // checkSize(aSize, com.sun.star.util.MeasureUnit.KM, "km");
-                // checkSize(aSize, com.sun.star.util.MeasureUnit.PICA, "pica");
-                // checkSize(aSize, com.sun.star.util.MeasureUnit.FOOT, "foot");
-                // checkSize(aSize, com.sun.star.util.MeasureUnit.MILE, "mile");
-            }
-            catch (com.sun.star.lang.IllegalArgumentException e)
-            {
-                fail("failed: IllegalArgumentException caught in convertSizeToLogic " + e.getMessage());
-            }
-
-            // convert the 1/100mm window size back to pixel
-            try
-            {
-                com.sun.star.awt.Size aNewSize = m_xConversion.convertSizeToPixel(aSizeInMM_100TH, com.sun.star.util.MeasureUnit.MM_100TH);
-                System.out.println("Window size:");
-                System.out.println("Width:" + aNewSize.Width + " pixel");
-                System.out.println("Height:" + aNewSize.Height + " pixel");
-
-                // assure the pixels are the same as we already know
-                assertTrue("failed: Size from pixel to 1/100mm to pixel", aSize.Width == aNewSize.Width && aSize.Height == aNewSize.Height);
-            }
-            catch (com.sun.star.lang.IllegalArgumentException e)
-            {
-                fail("failed: IllegalArgumentException caught in convertSizeToPixel " + e.getMessage());
-            }
-
-            // close the window.
-            // IMHO a little bit stupid, but the XWindow doesn't support a XCloseable interface
-            xWindow.dispose();
-    }
-
-
-
-    @BeforeClass public static void setUpConnection() throws Exception {
-        System.out.println("setUpConnection()");
-        connection.setUp();
-    }
-
-    @AfterClass public static void tearDownConnection()
-        throws InterruptedException, com.sun.star.uno.Exception
-    {
-        System.out.println("tearDownConnection()");
-        connection.tearDown();
-    }
-
-    private static final OfficeConnection connection = new OfficeConnection();
-
-}
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 03cb2f26f324..c2fd91f1ea46 100755
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -67,6 +67,7 @@ namespace toolkit
     using ::com::sun::star::awt::XWindowPeer;
     using ::com::sun::star::util::XModifyListener;
     using ::com::sun::star::awt::XToolkit;
+    using ::com::sun::star::lang::XMultiServiceFactory;
     /** === end UNO using === **/
     namespace VisualEffect = ::com::sun::star::awt::VisualEffect;
     namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode;
@@ -75,8 +76,8 @@ namespace toolkit
     //= AnimatedImagesControl
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    AnimatedImagesControl::AnimatedImagesControl()
-        :AnimatedImagesControl_Base()
+    AnimatedImagesControl::AnimatedImagesControl( Reference< XMultiServiceFactory > const & i_factory )
+        :AnimatedImagesControl_Base( i_factory )
     {
     }
 
@@ -238,8 +239,9 @@ namespace toolkit
     //= AnimatedImagesControlModel
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    AnimatedImagesControlModel::AnimatedImagesControlModel()
-        :m_pData( new AnimatedImagesControlModel_Data )
+    AnimatedImagesControlModel::AnimatedImagesControlModel( Reference< XMultiServiceFactory > const & i_factory )
+        :AnimatedImagesControlModel_Base( i_factory )
+        ,m_pData( new AnimatedImagesControlModel_Data )
     {
         ImplRegisterProperty( BASEPROPERTY_AUTO_REPEAT );
         ImplRegisterProperty( BASEPROPERTY_BORDER );
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 940b99bd41c3..f037f10bbe31 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -220,8 +220,9 @@ static const ::rtl::OUString& getStepPropertyName( )
 //  ----------------------------------------------------
 //  class ControlModelContainerBase
 //  ----------------------------------------------------
-ControlModelContainerBase::ControlModelContainerBase()
-    :maContainerListeners( *this )
+ControlModelContainerBase::ControlModelContainerBase( const Reference< XMultiServiceFactory >& i_factory )
+    :ControlModelContainer_IBase( i_factory )
+    ,maContainerListeners( *this )
     ,maChangeListeners ( GetMutex() )
     ,mbGroupsUpToDate( sal_False )
 {
@@ -339,61 +340,61 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const ::rtl::
 
     OGeometryControlModel_Base* pNewModel = NULL;
 
+    const Reference< XMultiServiceFactory > xFactory( maContext.getLegacyServiceFactory() );
     if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlEditModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlEditModel >;
+        pNewModel = new OGeometryControlModel< UnoControlEditModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlFormattedFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlFormattedFieldModel >;
+        pNewModel = new OGeometryControlModel< UnoControlFormattedFieldModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlFileControlModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlFileControlModel >;
+        pNewModel = new OGeometryControlModel< UnoControlFileControlModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlButtonModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlButtonModel >;
+        pNewModel = new OGeometryControlModel< UnoControlButtonModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlImageControlModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlImageControlModel >;
+        pNewModel = new OGeometryControlModel< UnoControlImageControlModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlRadioButtonModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlRadioButtonModel >;
+        pNewModel = new OGeometryControlModel< UnoControlRadioButtonModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlCheckBoxModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlCheckBoxModel >;
+        pNewModel = new OGeometryControlModel< UnoControlCheckBoxModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlFixedHyperlinkModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlFixedHyperlinkModel >;
+        pNewModel = new OGeometryControlModel< UnoControlFixedHyperlinkModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlFixedTextModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlFixedTextModel >;
+        pNewModel = new OGeometryControlModel< UnoControlFixedTextModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlGroupBoxModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlGroupBoxModel >;
+        pNewModel = new OGeometryControlModel< UnoControlGroupBoxModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlListBoxModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlListBoxModel >;
+        pNewModel = new OGeometryControlModel< UnoControlListBoxModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlComboBoxModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlComboBoxModel >;
+        pNewModel = new OGeometryControlModel< UnoControlComboBoxModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlDateFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlDateFieldModel >;
+        pNewModel = new OGeometryControlModel< UnoControlDateFieldModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlTimeFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlTimeFieldModel >;
+        pNewModel = new OGeometryControlModel< UnoControlTimeFieldModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlNumericFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlNumericFieldModel >;
+        pNewModel = new OGeometryControlModel< UnoControlNumericFieldModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlCurrencyFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlCurrencyFieldModel >;
+        pNewModel = new OGeometryControlModel< UnoControlCurrencyFieldModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlPatternFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlPatternFieldModel >;
+        pNewModel = new OGeometryControlModel< UnoControlPatternFieldModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlProgressBarModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlProgressBarModel >;
+        pNewModel = new OGeometryControlModel< UnoControlProgressBarModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlScrollBarModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlScrollBarModel >;
+        pNewModel = new OGeometryControlModel< UnoControlScrollBarModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlFixedLineModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlFixedLineModel >;
+        pNewModel = new OGeometryControlModel< UnoControlFixedLineModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlRoadmapModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlRoadmapModel >;
+        pNewModel = new OGeometryControlModel< UnoControlRoadmapModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_TreeControlModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoTreeModel >;
+        pNewModel = new OGeometryControlModel< UnoTreeModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_GridControlModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoGridModel >;
+        pNewModel = new OGeometryControlModel< UnoGridModel >( xFactory );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlTabPageContainerModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlTabPageContainerModel >;
+        pNewModel = new OGeometryControlModel< UnoControlTabPageContainerModel >( xFactory );
 
     if ( !pNewModel )
     {
-        Reference< XMultiServiceFactory > xORB( ::comphelper::getProcessServiceFactory() );
-        if ( xORB.is() )
+        if ( xFactory.is() )
         {
-            Reference< XInterface > xObject = xORB->createInstance( aServiceSpecifier );
+            Reference< XInterface > xObject = xFactory->createInstance( aServiceSpecifier );
             Reference< XServiceInfo > xSI( xObject, UNO_QUERY );
             Reference< XCloneable > xCloneAccess( xSI, UNO_QUERY );
             Reference< XAggregation > xAgg( xCloneAccess, UNO_QUERY );
@@ -1313,9 +1314,10 @@ throw ( RuntimeException )
 //  ----------------------------------------------------
 //  class DialogContainerControl
 //  ----------------------------------------------------
-ControlContainerBase::ControlContainerBase() :
-    mbSizeModified(false),
-    mbPosModified(false)
+ControlContainerBase::ControlContainerBase( const Reference< XMultiServiceFactory >& i_factory )
+    :ContainerControl_IBase( i_factory )
+    ,mbSizeModified(false)
+    ,mbPosModified(false)
 {
     maComponentInfos.nWidth = 280;
     maComponentInfos.nHeight = 400;
@@ -1339,8 +1341,8 @@ void ControlContainerBase::ImplInsertControl( Reference< XControlModel >& rxMode
 
     ::rtl::OUString aDefCtrl;
     xP->getPropertyValue( GetPropertyName( BASEPROPERTY_DEFAULTCONTROL ) ) >>= aDefCtrl;
-    Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-    Reference < XControl > xCtrl( xMSF->createInstance( aDefCtrl ), UNO_QUERY );
+    Reference < XControl > xCtrl;
+    maContext.createComponent( aDefCtrl, xCtrl );
 
     DBG_ASSERT( xCtrl.is(), "UnoDialogControl::ImplInsertControl: could not create the control!" );
     if ( xCtrl.is() )
@@ -1360,7 +1362,18 @@ void ControlContainerBase::ImplRemoveControl( Reference< XControlModel >& rxMode
     Sequence< Reference< XControl > > aControls = getControls();
     Reference< XControl > xCtrl = StdTabController::FindControl( aControls, rxModel );
     if ( xCtrl.is() )
+    {
         removeControl( xCtrl );
+        try
+        {
+            Reference< XComponent > const xControlComp( xCtrl, UNO_QUERY_THROW );
+            xControlComp->dispose();
+        }
+        catch( Exception const & )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
 }
 
 void ControlContainerBase::ImplSetPosSize( Reference< XControl >& rxCtrl )
@@ -1549,7 +1562,16 @@ void ControlContainerBase::elementInserted( const ContainerEvent& Event ) throw(
 
     Event.Accessor >>= aName;
     Event.Element >>= xModel;
-    ImplInsertControl( xModel, aName );
+    ENSURE_OR_RETURN_VOID( xModel.is(), "UnoDialogControl::elementInserted: illegal element!" );
+    try
+    {
+        ImplInsertControl( xModel, aName );
+    }
+    catch ( const RuntimeException& e ) { throw; }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
 }
 
 void ControlContainerBase::elementRemoved( const ContainerEvent& Event ) throw(RuntimeException)
@@ -1558,8 +1580,16 @@ void ControlContainerBase::elementRemoved( const ContainerEvent& Event ) throw(R
 
     Reference< XControlModel > xModel;
     Event.Element >>= xModel;
-    if ( xModel.is() )
+    ENSURE_OR_RETURN_VOID( xModel.is(), "UnoDialogControl::elementRemoved: illegal element!" );
+    try
+    {
         ImplRemoveControl( xModel );
+    }
+    catch ( const RuntimeException& e ) { throw; }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
 }
 
 void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) throw(RuntimeException)
@@ -1568,13 +1598,31 @@ void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) throw(
 
     Reference< XControlModel > xModel;
     Event.ReplacedElement >>= xModel;
-    if ( xModel.is() )
-        ImplRemoveControl( xModel );
+    try
+    {
+        OSL_ENSURE( xModel.is(), "UnoDialogControl::elementReplaced: invalid ReplacedElement!" );
+        if ( xModel.is() )
+            ImplRemoveControl( xModel );
+    }
+    catch ( const RuntimeException& e ) { throw; }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
 
     ::rtl::OUString aName;
     Event.Accessor >>= aName;
     Event.Element >>= xModel;
-    ImplInsertControl( xModel, aName );
+    ENSURE_OR_RETURN_VOID( xModel.is(), "UnoDialogControl::elementReplaced: invalid new element!" );
+    try
+    {
+        ImplInsertControl( xModel, aName );
+    }
+    catch ( const RuntimeException& e ) { throw; }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
 }
 
 // XPropertiesChangeListener
@@ -1761,9 +1809,8 @@ uno::Reference< graphic::XGraphic > ControlContainerBase::Impl_getGraphicFromURL
 
     try
     {
-        ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
         uno::Reference< graphic::XGraphicProvider > xProvider;
-        if ( aContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) )
+        if ( maContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) )
         {
             uno::Sequence< beans::PropertyValue > aMediaProperties(1);
             aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 15eeb2aa1939..8f400ff1945c 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -76,7 +76,8 @@ using namespace ::com::sun::star::util;
 //  ----------------------------------------------------
 //  class UnoControlDialogModel
 //  ----------------------------------------------------
-UnoControlDialogModel::UnoControlDialogModel()
+UnoControlDialogModel::UnoControlDialogModel( const Reference< XMultiServiceFactory >& i_factory )
+    :ControlModelContainerBase( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
 //  ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -163,9 +164,10 @@ Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo(  ) thro
 // = class UnoDialogControl
 // ============================================================================
 
-UnoDialogControl::UnoDialogControl() :
-    maTopWindowListeners( *this ),
-    mbWindowListener(false)
+UnoDialogControl::UnoDialogControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+    :ControlContainerBase( i_factory )
+    ,maTopWindowListeners( *this )
+    ,mbWindowListener(false)
 {
     maComponentInfos.nWidth = 300;
     maComponentInfos.nHeight = 450;
@@ -196,7 +198,8 @@ Any UnoDialogControl::queryAggregation( const Type & rType ) throw(RuntimeExcept
             aRet = ::cppu::queryInterface( rType, SAL_STATIC_CAST( awt::XWindowListener*, this ) );
     return (aRet.hasValue() ? aRet : ControlContainerBase::queryAggregation( rType ));
 }
-//lang::XTypeProvider
+
+ //lang::XTypeProvider
 IMPL_XTYPEPROVIDER_START( UnoDialogControl)
     getCppuType( ( uno::Reference< awt::XTopWindow>* ) NULL ),
     getCppuType( ( uno::Reference< awt::XDialog>* ) NULL ),
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index e9de3c5fac77..fb2d0f720c2e 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -125,8 +125,9 @@ namespace toolkit
     // = UnoControlFormattedFieldModel
     // ===================================================================
     // -------------------------------------------------------------------
-    UnoControlFormattedFieldModel::UnoControlFormattedFieldModel()
-        :m_bRevokedAsClient( false )
+    UnoControlFormattedFieldModel::UnoControlFormattedFieldModel( const Reference< XMultiServiceFactory >& i_factory )
+        :UnoControlModel( i_factory )
+        ,m_bRevokedAsClient( false )
         ,m_bSettingValueAndText( false )
     {
         ImplRegisterProperty( BASEPROPERTY_ALIGN );
@@ -433,7 +434,8 @@ namespace toolkit
     // = UnoFormattedFieldControl
     // ===================================================================
     // -------------------------------------------------------------------
-    UnoFormattedFieldControl::UnoFormattedFieldControl()
+    UnoFormattedFieldControl::UnoFormattedFieldControl( const Reference< XMultiServiceFactory >& i_factory )
+        :UnoSpinFieldControl( i_factory )
     {
     }
 
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 011f3502cdd8..0195ddff09a2 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -27,174 +27,366 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_toolkit.hxx"
+
 #include "defaultgridcolumnmodel.hxx"
-#include <comphelper/sequence.hxx>
-#include <toolkit/helper/servicenames.hxx>
+#include "gridcolumn.hxx"
+
+/** === begin UNO includes === **/
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
-#include <rtl/ref.hxx>
+/** === end UNO includes === **/
 
-using ::rtl::OUString;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::awt::grid;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::style;
+#include <comphelper/sequence.hxx>
+#include <comphelper/componentguard.hxx>
+#include <toolkit/helper/servicenames.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
 
+//......................................................................................................................
 namespace toolkit
+//......................................................................................................................
 {
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::awt::grid::XGridColumn;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::lang::EventObject;
+    using ::com::sun::star::container::XContainerListener;
+    using ::com::sun::star::container::ContainerEvent;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::lang::IndexOutOfBoundsException;
+    using ::com::sun::star::util::XCloneable;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    /** === end UNO using === **/
+
+    //==================================================================================================================
+    //= DefaultGridColumnModel
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridColumnModel::DefaultGridColumnModel( const Reference< XMultiServiceFactory >& i_factory )
+        :DefaultGridColumnModel_Base( m_aMutex )
+        ,m_aContext( i_factory )
+        ,m_aContainerListeners( m_aMutex )
+        ,m_aColumns()
+    {
+    }
 
-///////////////////////////////////////////////////////////////////////
-// class DefaultGridColumnModel
-///////////////////////////////////////////////////////////////////////
-
-DefaultGridColumnModel::DefaultGridColumnModel(const Reference< XMultiServiceFactory >& xFactory)
-: columns(std::vector< Reference< XGridColumn > >())
- ,m_nColumnHeaderHeight(0)
- ,m_xFactory(xFactory)
-{
-}
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridColumnModel::DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource )
+        :cppu::BaseMutex()
+        ,DefaultGridColumnModel_Base( m_aMutex )
+        ,m_aContext( i_copySource.m_aContext )
+        ,m_aContainerListeners( m_aMutex )
+        ,m_aColumns()
+    {
+        Columns aColumns;
+        aColumns.reserve( i_copySource.m_aColumns.size() );
+        try
+        {
+            for (   Columns::const_iterator col = i_copySource.m_aColumns.begin();
+                    col != i_copySource.m_aColumns.end();
+                    ++col
+                )
+            {
+                Reference< XCloneable > const xCloneable( *col, UNO_QUERY_THROW );
+                Reference< XGridColumn > const xClone( xCloneable->createClone(), UNO_QUERY_THROW );
+
+                GridColumn* const pGridColumn = GridColumn::getImplementation( xClone );
+                if ( pGridColumn == NULL )
+                    throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "invalid clone source implementation" ) ), *this );
+                    // that's indeed a RuntimeException, not an IllegalArgumentException or some such:
+                    // a DefaultGridColumnModel implementation whose columns are not GridColumn implementations
+                    // is borked.
+                pGridColumn->setIndex( col - i_copySource.m_aColumns.begin() );
+
+                aColumns.push_back( xClone );
+            }
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        if ( aColumns.size() == i_copySource.m_aColumns.size() )
+            m_aColumns.swap( aColumns );
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridColumnModel::~DefaultGridColumnModel()
+    {
+    }
 
-DefaultGridColumnModel::~DefaultGridColumnModel()
-{
-}
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() throw (RuntimeException)
+    {
+        return m_aColumns.size();
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn(  ) throw (RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return new GridColumn();
+    }
 
-::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() throw (::com::sun::star::uno::RuntimeException)
-{
-    return columns.size();
-}
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL DefaultGridColumnModel::addColumn( const Reference< XGridColumn > & i_column ) throw (RuntimeException, IllegalArgumentException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-//---------------------------------------------------------------------
+        GridColumn* const pGridColumn = GridColumn::getImplementation( i_column );
+        if ( pGridColumn == NULL )
+            throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "invalid column implementation" ) ), *this, 1 );
 
-::sal_Int32 SAL_CALL DefaultGridColumnModel::addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column) throw (::com::sun::star::uno::RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    Reference<XGridColumn> xColumn(column);
-    columns.push_back(xColumn);
-    sal_Int32 index = columns.size() - 1;
-    xColumn->setIndex(index);
-    return index;
-}
+        m_aColumns.push_back( i_column );
+        sal_Int32 index = m_aColumns.size() - 1;
+        pGridColumn->setIndex( index );
 
-//---------------------------------------------------------------------
+        // fire insertion notifications
+        ContainerEvent aEvent;
+        aEvent.Source = *this;
+        aEvent.Accessor <<= index;
+        aEvent.Element <<= i_column;
 
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > > SAL_CALL DefaultGridColumnModel::getColumns() throw (::com::sun::star::uno::RuntimeException)
-{
-    return comphelper::containerToSequence(columns);
-}
+        aGuard.clear();
+        m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, aEvent );
 
-//---------------------------------------------------------------------
+        return index;
+    }
 
-::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL DefaultGridColumnModel::getColumn(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException)
-{
-    if ( index >=0 && index < ((sal_Int32)columns.size()))
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridColumnModel::removeColumn( ::sal_Int32 i_columnIndex )  throw (RuntimeException, IndexOutOfBoundsException)
     {
-        return columns[index];
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+
+        if ( ( i_columnIndex < 0 ) || ( size_t( i_columnIndex ) >= m_aColumns.size() ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+
+        Columns::iterator const pos = m_aColumns.begin() + i_columnIndex;
+        Reference< XGridColumn > const xColumn( *pos );
+        m_aColumns.erase( pos );
+
+        // update indexes of all subsequent columns
+        sal_Int32 columnIndex( i_columnIndex );
+        for (   Columns::iterator updatePos = m_aColumns.begin() + columnIndex;
+                updatePos != m_aColumns.end();
+                ++updatePos, ++columnIndex
+            )
+        {
+            GridColumn* pColumnImpl = GridColumn::getImplementation( *updatePos );
+            ENSURE_OR_CONTINUE( pColumnImpl, "DefaultGridColumnModel::removeColumn: invalid column implementation!" );
+            pColumnImpl->setIndex( columnIndex );
+        }
+
+        // fire removal notifications
+        ContainerEvent aEvent;
+        aEvent.Source = *this;
+        aEvent.Accessor <<= i_columnIndex;
+        aEvent.Element <<= xColumn;
+
+        aGuard.clear();
+        m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvent );
+
+        // dispose the removed column
+        try
+        {
+            Reference< XComponent > const xColComp( xColumn, UNO_QUERY_THROW );
+            xColComp->dispose();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
     }
-    else
-        return Reference< XGridColumn >();
-}
-//---------------------------------------------------------------------
-void SAL_CALL DefaultGridColumnModel::setColumnHeaderHeight(sal_Int32 _value) throw (::com::sun::star::uno::RuntimeException)
-{
-    m_nColumnHeaderHeight = _value;
-}
-//---------------------------------------------------------------------
-sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnHeaderHeight() throw (::com::sun::star::uno::RuntimeException)
-{
-    return m_nColumnHeaderHeight;
-}
-
-//---------------------------------------------------------------------
-void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) throw (::com::sun::star::uno::RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
-    for(sal_Int32 i=0;i<rowElements;i++)
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< Reference< XGridColumn > > SAL_CALL DefaultGridColumnModel::getColumns() throw (RuntimeException)
     {
-        Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn"  ) ), UNO_QUERY );
-        columns.push_back(xColumn);
-        xColumn->setIndex(i);
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return ::comphelper::containerToSequence( m_aColumns );
     }
-}
-::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL DefaultGridColumnModel::copyColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column)  throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn"  ) ), UNO_QUERY );
-    xColumn->setColumnWidth(column->getColumnWidth());
-    xColumn->setPreferredWidth(column->getPreferredWidth());
-    xColumn->setMaxWidth(column->getMaxWidth());
-    xColumn->setMinWidth(column->getMinWidth());
-    xColumn->setPreferredWidth(column->getPreferredWidth());
-    xColumn->setResizeable(column->getResizeable());
-    xColumn->setTitle(column->getTitle());
-    xColumn->setHorizontalAlign(column->getHorizontalAlign());
-    return xColumn;
-}
-//---------------------------------------------------------------------
-// XComponent
-//---------------------------------------------------------------------
-
-void SAL_CALL DefaultGridColumnModel::dispose() throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
-    ::com::sun::star::lang::EventObject aEvent;
-    aEvent.Source.set( static_cast< ::cppu::OWeakObject* >( this ) );
-    BrdcstHelper.aLC.disposeAndClear( aEvent );
-
-}
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::getColumn(::sal_Int32 index) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-//---------------------------------------------------------------------
+        if ( index >=0 && index < ((sal_Int32)m_aColumns.size()))
+            return m_aColumns[index];
 
-void SAL_CALL DefaultGridColumnModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.addListener( XEventListener::static_type(), xListener );
-}
+        throw IndexOutOfBoundsException();
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) throw (RuntimeException)
+    {
+        ::std::vector< ContainerEvent > aRemovedColumns;
+        ::std::vector< ContainerEvent > aInsertedColumns;
+
+        {
+            ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+
+            // remove existing columns
+            while ( !m_aColumns.empty() )
+            {
+                const size_t lastColIndex = m_aColumns.size() - 1;
+
+                ContainerEvent aEvent;
+                aEvent.Source = *this;
+                aEvent.Accessor <<= sal_Int32( lastColIndex );
+                aEvent.Element <<= m_aColumns[ lastColIndex ];
+                aRemovedColumns.push_back( aEvent );
+
+                m_aColumns.erase( m_aColumns.begin() + lastColIndex );
+            }
+
+            // add new columns
+            for ( sal_Int32 i=0; i<rowElements; ++i )
+            {
+                ::rtl::Reference< GridColumn > const pGridColumn = new GridColumn();
+                Reference< XGridColumn > const xColumn( pGridColumn.get() );
+                ::rtl::OUStringBuffer colTitle;
+                colTitle.appendAscii( "Column " );
+                colTitle.append( i + 1 );
+                pGridColumn->setTitle( colTitle.makeStringAndClear() );
+                pGridColumn->setColumnWidth( 80 /* APPFONT */ );
+                pGridColumn->setFlexibility( 1 );
+                pGridColumn->setResizeable( sal_True );
+                pGridColumn->setDataColumnIndex( i );
+
+                ContainerEvent aEvent;
+                aEvent.Source = *this;
+                aEvent.Accessor <<= i;
+                aEvent.Element <<= xColumn;
+                aInsertedColumns.push_back( aEvent );
+
+                m_aColumns.push_back( xColumn );
+                pGridColumn->setIndex( i );
+            }
+        }
+
+        // fire removal notifications
+        for (   ::std::vector< ContainerEvent >::const_iterator event = aRemovedColumns.begin();
+                event != aRemovedColumns.end();
+                ++event
+            )
+        {
+            m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, *event );
+        }
+
+        // fire insertion notifications
+        for (   ::std::vector< ContainerEvent >::const_iterator event = aInsertedColumns.begin();
+                event != aInsertedColumns.end();
+                ++event
+            )
+        {
+            m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, *event );
+        }
+
+        // dispose removed columns
+        for (   ::std::vector< ContainerEvent >::const_iterator event = aRemovedColumns.begin();
+                event != aRemovedColumns.end();
+                ++event
+            )
+        {
+            try
+            {
+                const Reference< XComponent > xColComp( event->Element, UNO_QUERY_THROW );
+                xColComp->dispose();
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+        }
+    }
 
-void SAL_CALL DefaultGridColumnModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.removeListener( XEventListener::static_type(), xListener );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL DefaultGridColumnModel::getImplementationName(  ) throw (RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.toolkit.DefaultGridColumnModel" ) );
+    }
 
-//---------------------------------------------------------------------
-// XServiceInfo
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const ::rtl::OUString& i_serviceName ) throw (RuntimeException)
+    {
+        const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() );
+        for ( sal_Int32 i=0; i<aServiceNames.getLength(); ++i )
+            if ( aServiceNames[i] == i_serviceName )
+                return sal_True;
+        return sal_False;
+    }
 
-::rtl::OUString SAL_CALL DefaultGridColumnModel::getImplementationName(  ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    static const OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "toolkit.DefaultGridColumnModel" ) );
-    return aImplName;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames(  ) throw (RuntimeException)
+    {
+        const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( szServiceName_DefaultGridColumnModel ) );
+        const Sequence< ::rtl::OUString > aSeq( &aServiceName, 1 );
+        return aSeq;
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridColumnModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException)
+    {
+        if ( i_listener.is() )
+            m_aContainerListeners.addInterface( i_listener );
+    }
 
-sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    return ServiceName.equalsAscii( szServiceName_DefaultGridColumnModel );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridColumnModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException)
+    {
+        if ( i_listener.is() )
+            m_aContainerListeners.removeInterface( i_listener );
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridColumnModel::disposing()
+    {
+        DefaultGridColumnModel_Base::disposing();
+
+        EventObject aEvent( *this );
+        m_aContainerListeners.disposeAndClear( aEvent );
+
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        // remove, dispose and clear columns
+        while ( !m_aColumns.empty() )
+        {
+            try
+            {
+                const Reference< XComponent > xColComponent( m_aColumns[ 0 ], UNO_QUERY_THROW );
+                xColComponent->dispose();
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+
+            m_aColumns.erase( m_aColumns.begin() );
+        }
+
+        Columns aEmpty;
+        m_aColumns.swap( aEmpty );
+    }
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames(  ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    static const OUString aServiceName( OUString::createFromAscii( szServiceName_DefaultGridColumnModel ) );
-    static const Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XCloneable > SAL_CALL DefaultGridColumnModel::createClone(  ) throw (RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return new DefaultGridColumnModel( *this );
+    }
 
-}
+//......................................................................................................................
+}   // namespace toolkit
+//......................................................................................................................
 
-Reference< XInterface > SAL_CALL DefaultGridColumnModel_CreateInstance( const Reference< XMultiServiceFactory >& _rFactory)
+//----------------------------------------------------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL DefaultGridColumnModel_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rFactory)
 {
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::DefaultGridColumnModel( _rFactory ) );
+    return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::DefaultGridColumnModel( _rFactory ) );
 }
-
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
index 8b8c8bfc795c..da0ef20e3287 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
@@ -25,76 +25,73 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_toolkit.hxx"
+/** === begin UNO includes === **/
 #include <com/sun/star/awt/grid/XGridColumnModel.hpp>
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
-//#include <com/sun/star/awt/grid/GridColumnEvent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <rtl/ref.hxx>
-#include <vector>
-#include <toolkit/helper/mutexandbroadcasthelper.hxx>
-#include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
-#include <com/sun/star/awt/grid/XGridColumnListener.hpp>
+#include <com/sun/star/util/Color.hpp>
+/** === end UNO includes === **/
 
-using ::rtl::OUString;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::awt::grid;
-using namespace ::com::sun::star::lang;
+#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/compbase2.hxx>
+#include <comphelper/componentcontext.hxx>
+#include <vector>
+
+namespace comphelper
+{
+    class ComponentGuard;
+}
 
 namespace toolkit
 {
 
 //enum broadcast_type { column_added, column_removed, column_changed};
 
-class DefaultGridColumnModel : public ::cppu::WeakImplHelper2< XGridColumnModel, XServiceInfo >,
-                             public MutexAndBroadcastHelper
+typedef ::cppu::WeakComponentImplHelper2    <   ::com::sun::star::awt::grid::XGridColumnModel
+                                            ,   ::com::sun::star::lang::XServiceInfo
+                                            >   DefaultGridColumnModel_Base;
+
+class DefaultGridColumnModel    :public ::cppu::BaseMutex
+                                ,public DefaultGridColumnModel_Base
 {
 public:
-    DefaultGridColumnModel(const Reference< XMultiServiceFactory >& xFactory);
+    DefaultGridColumnModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
+    DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource );
     virtual ~DefaultGridColumnModel();
 
     // XGridColumnModel
-
-    //virtual ::sal_Bool SAL_CALL getColumnSelectionAllowed() throw (::com::sun::star::uno::RuntimeException);
-    //virtual void SAL_CALL setColumnSelectionAllowed(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getColumnCount() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Int32 SAL_CALL addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL createColumn(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException);
+    virtual void SAL_CALL removeColumn( ::sal_Int32 i_columnIndex )  throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > > SAL_CALL getColumns() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL getColumn(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException);
-    //virtual void SAL_CALL addColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException);
-    //virtual void SAL_CALL removeColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException);
-    virtual void SAL_CALL setColumnHeaderHeight( sal_Int32 _value) throw (com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getColumnHeaderHeight() throw (com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL getColumn(::sal_Int32 index) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDefaultColumns(sal_Int32 rowElements) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL copyColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column)  throw (::com::sun::star::uno::RuntimeException);
-    // XComponent
-    virtual void SAL_CALL dispose(  ) throw (RuntimeException);
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException);
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException);
 
     // XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
-private:
 
-    /*void broadcast( broadcast_type eType, const GridColumnEvent& aEvent );
-    void broadcast_changed( ::rtl::OUString name, Any oldValue, Any newValue, sal_Int32 index,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & rColumn );
-    void broadcast_add( sal_Int32 index,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & rColumn );
-    void broadcast_remove( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & rColumn );*/
+    // XContainer
+    virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XCloneable
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // OComponentHelper
+    virtual void SAL_CALL disposing();
+
+private:
+    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > >   Columns;
 
-    std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > > columns;
-    sal_Bool selectionAllowed;
-    sal_Int32 m_nColumnHeaderHeight;
-    Reference< XMultiServiceFactory > m_xFactory;
+    ::comphelper::ComponentContext      m_aContext;
+    ::cppu::OInterfaceContainerHelper   m_aContainerListeners;
+    Columns                             m_aColumns;
 };
 
 }
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index adc40b0426d7..4ef99d749ba1 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -27,318 +27,411 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_toolkit.hxx"
+
 #include "defaultgriddatamodel.hxx"
-#include <comphelper/sequence.hxx>
+
+#include <comphelper/stlunosequence.hxx>
+#include <comphelper/componentguard.hxx>
 #include <toolkit/helper/servicenames.hxx>
+#include <tools/diagnose_ex.h>
 #include <rtl/ref.hxx>
 
-using ::rtl::OUString;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::awt::grid;
-using namespace ::com::sun::star::lang;
-
-#define ROWHEIGHT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowHeight" ))
-#define ROWHEADERS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowHeaders" ))
-#define CELLUPDATED ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellUpdated" ))
-#define ROWUPDATED ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowUpdated" ))
-#define ROWHEADERWIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowHeaderWidth" ))
+#include <algorithm>
 
+//......................................................................................................................
 namespace toolkit
+//......................................................................................................................
 {
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::lang::EventObject;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::util::XCloneable;
+    /** === end UNO using === **/
+
+    using ::comphelper::stl_begin;
+    using ::comphelper::stl_end;
+
+    //==================================================================================================================
+    //= DefaultGridDataModel
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridDataModel::DefaultGridDataModel()
+        :DefaultGridDataModel_Base( m_aMutex )
+        ,m_aRowHeaders()
+        ,m_nColumnCount(0)
+    {
+    }
 
-///////////////////////////////////////////////////////////////////////
-// class DefaultGridDataModel
-///////////////////////////////////////////////////////////////////////
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridDataModel::DefaultGridDataModel( DefaultGridDataModel const & i_copySource )
+        :cppu::BaseMutex()
+        ,DefaultGridDataModel_Base( m_aMutex )
+        ,m_aData( i_copySource.m_aData )
+        ,m_aRowHeaders( i_copySource.m_aRowHeaders )
+        ,m_nColumnCount( i_copySource.m_nColumnCount )
+    {
+    }
 
-DefaultGridDataModel::DefaultGridDataModel()
-: rowHeight(0),
-  rowHeaders(std::vector< ::rtl::OUString >()),
-  m_nRowHeaderWidth(10)
-{
-}
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridDataModel::~DefaultGridDataModel()
+    {
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void DefaultGridDataModel::broadcast( GridDataEvent const & i_event,
+        void ( SAL_CALL XGridDataListener::*i_listenerMethod )( GridDataEvent const & ), ::comphelper::ComponentGuard & i_instanceLock )
+    {
+        ::cppu::OInterfaceContainerHelper* pListeners = rBHelper.getContainer( XGridDataListener::static_type() );
+        if ( !pListeners )
+            return;
 
-DefaultGridDataModel::~DefaultGridDataModel()
-{
-}
+        i_instanceLock.clear();
+        pListeners->notifyEach( i_listenerMethod, i_event );
+    }
 
-void DefaultGridDataModel::broadcast( broadcast_type eType, const GridDataEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException)
-{
-    ::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( XGridDataListener::static_type() );
-    if( pIter )
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (::com::sun::star::uno::RuntimeException)
     {
-        ::cppu::OInterfaceIteratorHelper aListIter(*pIter);
-        while(aListIter.hasMoreElements())
-        {
-            XGridDataListener* pListener = static_cast<XGridDataListener*>(aListIter.next());
-            switch( eType )
-            {
-            case row_added:     pListener->rowAdded(aEvent); break;
-            case row_removed:   pListener->rowRemoved(aEvent); break;
-            case data_changed:  pListener->dataChanged(aEvent); break;
-            }
-        }
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_aData.size();
     }
-}
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount() throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_nColumnCount;
+    }
 
-void DefaultGridDataModel::broadcast_changed( ::rtl::OUString name, sal_Int32 index, Any oldValue, Any newValue) throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
-    GridDataEvent aEvent( xSource, name, oldValue, newValue, index, ::rtl::OUString(), Sequence< Any >());
-    broadcast( data_changed, aEvent);
-}
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridDataModel::CellData const & DefaultGridDataModel::impl_getCellData_throw( sal_Int32 const i_column, sal_Int32 const i_row ) const
+    {
+        if  (   ( i_row < 0 ) || ( size_t( i_row ) > m_aData.size() )
+            ||  ( i_column < 0 ) || ( i_column > m_nColumnCount )
+            )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *const_cast< DefaultGridDataModel* >( this ) );
 
-//---------------------------------------------------------------------
+        RowData const & rRow( m_aData[ i_row ] );
+        if ( size_t( i_column ) < rRow.size() )
+            return rRow[ i_column ];
 
-void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName,
-                                         ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
-    GridDataEvent aEvent( xSource, ::rtl::OUString(), Any(), Any(), index, headerName, (const ::com::sun::star::uno::Sequence< Any >&)rowData );
-    broadcast( row_added, aEvent);
-}
+        static CellData s_aEmpty;
+        return s_aEmpty;
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridDataModel::RowData& DefaultGridDataModel::impl_getRowDataAccess_throw( sal_Int32 const i_rowIndex, size_t const i_requiredColumnCount )
+    {
+        OSL_ENSURE( i_requiredColumnCount <= size_t( m_nColumnCount ), "DefaultGridDataModel::impl_getRowDataAccess_throw: invalid column count!" );
+        if  ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aData.size() ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+
+        RowData& rRowData( m_aData[ i_rowIndex ] );
+        if ( rRowData.size() < i_requiredColumnCount )
+            rRowData.resize( i_requiredColumnCount );
+        return rRowData;
+    }
 
-void DefaultGridDataModel::broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName,
-                                            ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
-    GridDataEvent aEvent( xSource, ::rtl::OUString(), Any(), Any(), index, headerName, rowData );
-    broadcast( row_removed, aEvent);
-}
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridDataModel::CellData& DefaultGridDataModel::impl_getCellDataAccess_throw( sal_Int32 const i_columnIndex, sal_Int32 const i_rowIndex )
+    {
+        if  ( ( i_columnIndex < 0 ) || ( i_columnIndex >= m_nColumnCount ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
 
-//---------------------------------------------------------------------
+        RowData& rRowData( impl_getRowDataAccess_throw( i_rowIndex, size_t( i_columnIndex + 1 ) ) );
+        return rRowData[ i_columnIndex ];
+    }
 
-//---------------------------------------------------------------------
-// XDefaultGridDataModel
-//---------------------------------------------------------------------
-::sal_Int32 SAL_CALL DefaultGridDataModel::getRowHeight() throw (::com::sun::star::uno::RuntimeException)
-{
-    return rowHeight;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    Any SAL_CALL DefaultGridDataModel::getCellData( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return impl_getCellData_throw( i_column, i_row ).first;
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    Any SAL_CALL DefaultGridDataModel::getCellToolTip( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return impl_getCellData_throw( i_column, i_row ).second;
+    }
 
-void SAL_CALL DefaultGridDataModel::setRowHeight(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
-{
-    sal_Int32 oldValue = rowHeight;
-    rowHeight = value;
+    //------------------------------------------------------------------------------------------------------------------
+    Any SAL_CALL DefaultGridDataModel::getRowHeading( ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-    broadcast_changed( ROWHEIGHT, 0, Any(oldValue), Any(value));
-}
+        if ( ( i_row < 0 ) || ( size_t( i_row ) >= m_aRowHeaders.size() ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
 
-//---------------------------------------------------------------------
+        return m_aRowHeaders[ i_row ];
+    }
 
-::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (::com::sun::star::uno::RuntimeException)
-{
-    return data.size();
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-//---------------------------------------------------------------------
+        sal_Int32 const columnCount = i_data.getLength();
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL DefaultGridDataModel::getRowHeaders() throw (::com::sun::star::uno::RuntimeException)
-{
-    return  comphelper::containerToSequence(rowHeaders);
-}
+        // store header name
+        m_aRowHeaders.push_back( i_heading );
 
-//---------------------------------------------------------------------
+        // store row m_aData
+        impl_addRow( i_data );
 
-void SAL_CALL DefaultGridDataModel::setRowHeaders(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & value) throw (::com::sun::star::uno::RuntimeException)
-{
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > oldValue( comphelper::containerToSequence(rowHeaders) );
+        // update column count
+        if ( columnCount > m_nColumnCount )
+            m_nColumnCount = columnCount;
 
-    std::vector< rtl::OUString>::iterator iterator;
-    int i = 0;
-    int sequenceSize = value.getLength();
+        sal_Int32 const rowIndex = sal_Int32( m_aData.size() - 1 );
+        broadcast(
+            GridDataEvent( *this, -1, -1, rowIndex, rowIndex ),
+            &XGridDataListener::rowsInserted,
+            aGuard
+        );
+    }
 
-    for(iterator = rowHeaders.begin(); iterator != rowHeaders.end(); iterator++)
+    //------------------------------------------------------------------------------------------------------------------
+    void DefaultGridDataModel::impl_addRow( Sequence< Any > const & i_rowData, sal_Int32 const i_assumedColCount )
     {
-        if ( sequenceSize > i )
-            *iterator = value[i];
-        else
-            *iterator = ::rtl::OUString();
-        i++;
+        OSL_PRECOND( ( i_assumedColCount <= 0 ) || ( i_assumedColCount >= i_rowData.getLength() ),
+            "DefaultGridDataModel::impl_addRow: invalid column count!" );
+
+        RowData newRow( i_assumedColCount > 0 ? i_assumedColCount : i_rowData.getLength() );
+        RowData::iterator cellData = newRow.begin();
+        for ( const Any* pData = stl_begin( i_rowData ); pData != stl_end( i_rowData ); ++pData, ++cellData )
+            cellData->first = *pData;
+
+        m_aData.push_back( newRow );
     }
 
-    broadcast_changed( ROWHEADERS, 0, Any(oldValue), Any(comphelper::containerToSequence(rowHeaders)) );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException)
+    {
+        if ( i_headings.getLength() != i_data.getLength() )
+            throw IllegalArgumentException( ::rtl::OUString(), *this, -1 );
 
-//---------------------------------------------------------------------
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-void SAL_CALL DefaultGridDataModel::addRow(const ::rtl::OUString & headername, const ::com::sun::star::uno::Sequence< Any > & rRowdata) throw (::com::sun::star::uno::RuntimeException)
-{
-    // store header name
-    rowHeaders.push_back(headername);
+        sal_Int32 const rowCount = i_headings.getLength();
+        if ( rowCount == 0 )
+            return;
 
-    // store row data
-    std::vector< Any > newRow;
-    for ( int i = 0; i < rRowdata.getLength();i++)
-    {
-        newRow.push_back(rRowdata[i]);
-    }
+        // determine max col count in the new data
+        sal_Int32 maxColCount = 0;
+        for ( sal_Int32 row=0; row<rowCount; ++row )
+            if ( i_data[row].getLength() > maxColCount )
+                maxColCount = i_data[row].getLength();
 
-    data.push_back( newRow );
+        if ( maxColCount < m_nColumnCount )
+            maxColCount = m_nColumnCount;
 
-    broadcast_add( data.size()-1, headername, comphelper::containerToSequence(newRow));
+        for ( sal_Int32 row=0; row<rowCount;  ++row )
+        {
+            m_aRowHeaders.push_back( i_headings[row] );
+            impl_addRow( i_data[row], maxColCount );
+        }
 
-}
+        if ( maxColCount > m_nColumnCount )
+            m_nColumnCount = maxColCount;
 
-//---------------------------------------------------------------------
+        sal_Int32 const firstRow = sal_Int32( m_aData.size() - rowCount );
+        sal_Int32 const lastRow = sal_Int32( m_aData.size() - 1 );
+        broadcast(
+            GridDataEvent( *this, -1, -1, firstRow, lastRow ),
+            &XGridDataListener::rowsInserted,
+            aGuard
+        );
+    }
 
-void SAL_CALL DefaultGridDataModel::removeRow(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException)
-{
-    if ( index >= 0 && index <= getRowCount()-1)
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
-        ::rtl::OUString headerName( (::rtl::OUString) rowHeaders[index] );
-        rowHeaders.erase(rowHeaders.begin() + index);
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-        Sequence< Any > rowData ( (Sequence< Any >&)data[index] );
-        data.erase(data.begin() + index);
-        broadcast_remove( index, headerName, rowData);
+        if ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aData.size() ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+
+        m_aRowHeaders.erase( m_aRowHeaders.begin() + i_rowIndex );
+        m_aData.erase( m_aData.begin() + i_rowIndex );
+
+        broadcast(
+            GridDataEvent( *this, -1, -1, i_rowIndex, i_rowIndex ),
+            &XGridDataListener::rowsRemoved,
+            aGuard
+        );
     }
-    else
-        return;
-}
-//---------------------------------------------------------------------
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Any > > SAL_CALL DefaultGridDataModel::getData() throw (::com::sun::star::uno::RuntimeException)
-{
 
-    std::vector< std::vector< Any > >::iterator iterator;
-    std::vector< Sequence< Any  > > dummyContainer(0);
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::removeAllRows(  ) throw (RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+
+        m_aRowHeaders.clear();
+        m_aData.clear();
 
+        broadcast(
+            GridDataEvent( *this, -1, -1, -1, -1 ),
+            &XGridDataListener::rowsRemoved,
+            aGuard
+        );
+    }
 
-    for(iterator = data.begin(); iterator != data.end(); iterator++)
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
     {
-        Sequence< Any > cols(comphelper::containerToSequence(*iterator));
-        dummyContainer.push_back( cols );
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+
+        impl_getCellDataAccess_throw( i_columnIndex, i_rowIndex ).first = i_value;
+
+        broadcast(
+            GridDataEvent( *this, i_columnIndex, i_columnIndex, i_rowIndex, i_rowIndex ),
+            &XGridDataListener::dataChanged,
+            aGuard
+        );
     }
-    Sequence< Sequence< Any  > > dataSequence(comphelper::containerToSequence(dummyContainer));
 
-    return dataSequence;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-//---------------------------------------------------------------------
+        if  ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aData.size() ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
 
-void SAL_CALL DefaultGridDataModel::addDataListener( const Reference< XGridDataListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.addListener( XGridDataListener::static_type(), xListener );
-}
+        if ( i_columnIndexes.getLength() != i_values.getLength() )
+            throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
 
-//---------------------------------------------------------------------
+        sal_Int32 const columnCount = i_columnIndexes.getLength();
+        if ( columnCount == 0 )
+            return;
 
-void SAL_CALL DefaultGridDataModel::removeDataListener( const Reference< XGridDataListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.removeListener( XGridDataListener::static_type(), xListener );
-}
-//---------------------------------------------------------------------
-void SAL_CALL DefaultGridDataModel::removeAll() throw (RuntimeException)
-{
-    rowHeaders.clear();
-    data.clear();
-    broadcast_remove( -1, ::rtl::OUString(), Sequence< Any >());
-}
-//---------------------------------------------------------------------
-void SAL_CALL DefaultGridDataModel::setRowHeaderWidth(sal_Int32 _value) throw (::com::sun::star::uno::RuntimeException)
-{
-    sal_Int32 oldValue = m_nRowHeaderWidth;
-    m_nRowHeaderWidth = _value;
-    broadcast_changed( ROWHEADERWIDTH, 0, Any(oldValue), Any(_value) );
-}
-//---------------------------------------------------------------------
-sal_Int32 SAL_CALL DefaultGridDataModel::getRowHeaderWidth() throw (::com::sun::star::uno::RuntimeException)
-{
-    return m_nRowHeaderWidth;
-}
-//---------------------------------------------------------------------
-void SAL_CALL DefaultGridDataModel::updateCell(::sal_Int32 row, ::sal_Int32 column, const Any& value) throw (::com::sun::star::uno::RuntimeException)
-{
-    if(row >= 0 && row < (signed)data.size())
-    {
-        if(column >= 0 && column < (signed)data[0].size())
+        for ( sal_Int32 col = 0; col < columnCount; ++col )
         {
-            data[row][column] = value;
-            Sequence< Any >dataSeq(comphelper::containerToSequence(data[row]));
-            broadcast_changed( CELLUPDATED, row, Any(column), value );
+            if ( ( i_columnIndexes[col] < 0 ) || ( i_columnIndexes[col] > m_nColumnCount ) )
+                throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
         }
-    }
-}
-//---------------------------------------------------------------------
-void SAL_CALL DefaultGridDataModel::updateRow(::sal_Int32 row, const ::com::sun::star::uno::Sequence< ::sal_Int32 > & columns, const ::com::sun::star::uno::Sequence< Any > & values) throw (::com::sun::star::uno::RuntimeException)
-{
-    if(row >= 0 && row < (signed)data.size())
-    {
-        if(columns.getLength() == values.getLength())
+
+        RowData& rDataRow = m_aData[ i_rowIndex ];
+        for ( sal_Int32 col = 0; col < columnCount; ++col )
         {
-            for(int i = 0; i < columns.getLength(); i++)
-                data[row][i] = values[i];
-            Sequence< Any >dataSeq(comphelper::containerToSequence(data[row]));
-            broadcast_changed( ROWUPDATED, row, Any(columns), Any(values) );
+            sal_Int32 const columnIndex = i_columnIndexes[ col ];
+            if ( size_t( columnIndex ) >= rDataRow.size() )
+                rDataRow.resize( columnIndex + 1 );
+
+            rDataRow[ columnIndex ].first = i_values[ col ];
         }
+
+        sal_Int32 const firstAffectedColumn = *::std::min_element( stl_begin( i_columnIndexes ), stl_end( i_columnIndexes ) );
+        sal_Int32 const lastAffectedColumn = *::std::max_element( stl_begin( i_columnIndexes ), stl_end( i_columnIndexes ) );
+        broadcast(
+            GridDataEvent( *this, firstAffectedColumn, lastAffectedColumn, i_rowIndex, i_rowIndex ),
+            &XGridDataListener::dataChanged,
+            aGuard
+        );
     }
-}
-//---------------------------------------------------------------------
-// XComponent
-//---------------------------------------------------------------------
 
-void SAL_CALL DefaultGridDataModel::dispose() throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-    ::com::sun::star::lang::EventObject aEvent;
-    aEvent.Source.set( static_cast< ::cppu::OWeakObject* >( this ) );
-    BrdcstHelper.aLC.disposeAndClear( aEvent );
+        if  ( ( i_rowIndex < 0 ) || ( size_t( i_rowIndex ) >= m_aRowHeaders.size() ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
 
-}
+        m_aRowHeaders[ i_rowIndex ] = i_heading;
 
-//---------------------------------------------------------------------
+        broadcast(
+            GridDataEvent( *this, -1, -1, i_rowIndex, i_rowIndex ),
+            &XGridDataListener::rowHeadingChanged,
+            aGuard
+        );
+    }
 
-void SAL_CALL DefaultGridDataModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.addListener( XEventListener::static_type(), xListener );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        impl_getCellDataAccess_throw( i_columnIndex, i_rowIndex ).second = i_value;
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
-void SAL_CALL DefaultGridDataModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.removeListener( XEventListener::static_type(), xListener );
-}
-//---------------------------------------------------------------------
-// XServiceInfo
-//---------------------------------------------------------------------
+        RowData& rRowData = impl_getRowDataAccess_throw( i_rowIndex, m_nColumnCount );
+        for ( RowData::iterator cell = rRowData.begin(); cell != rRowData.end(); ++cell )
+            cell->second = i_value;
+    }
 
-::rtl::OUString SAL_CALL DefaultGridDataModel::getImplementationName(  ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    static const OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "toolkit.DefaultGridDataModel" ) );
-    return aImplName;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException)
+    {
+        rBHelper.addListener( XGridDataListener::static_type(), i_listener );
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException)
+    {
+        rBHelper.removeListener( XGridDataListener::static_type(), i_listener );
+    }
 
-sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    return ServiceName.equalsAscii( szServiceName_DefaultGridDataModel );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::disposing()
+    {
+        ::com::sun::star::lang::EventObject aEvent;
+        aEvent.Source.set( *this );
+        rBHelper.aLC.disposeAndClear( aEvent );
 
-//---------------------------------------------------------------------
+        ::osl::MutexGuard aGuard( m_aMutex );
+        GridData aEmptyData;
+        m_aData.swap( aEmptyData );
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames(  ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    static const OUString aServiceName( OUString::createFromAscii( szServiceName_DefaultGridDataModel ) );
-    static const Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
-}
+        ::std::vector< Any > aEmptyRowHeaders;
+        m_aRowHeaders.swap( aEmptyRowHeaders );
 
-}
+        m_nColumnCount = 0;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL DefaultGridDataModel::getImplementationName(  ) throw (RuntimeException)
+    {
+        static const ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "toolkit.DefaultGridDataModel" ) );
+        return aImplName;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException)
+    {
+        return ServiceName.equalsAscii( szServiceName_DefaultGridDataModel );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames(  ) throw (RuntimeException)
+    {
+        static const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( szServiceName_DefaultGridDataModel ) );
+        static const Sequence< ::rtl::OUString > aSeq( &aServiceName, 1 );
+        return aSeq;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XCloneable > SAL_CALL DefaultGridDataModel::createClone(  ) throw (RuntimeException)
+    {
+        return new DefaultGridDataModel( *this );
+    }
+
+//......................................................................................................................
+}   // namespace toolkit
+//......................................................................................................................
 
 Reference< XInterface > SAL_CALL DefaultGridDataModel_CreateInstance( const Reference< XMultiServiceFactory >& )
 {
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.hxx b/toolkit/source/controls/grid/defaultgriddatamodel.hxx
index ea11a8a9a00a..bf4b6cc3355e 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.hxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.hxx
@@ -25,60 +25,68 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_toolkit.hxx"
-#include <com/sun/star/awt/grid/XGridDataModel.hpp>
-#include <com/sun/star/awt/grid/GridDataEvent.hpp>
-#include <com/sun/star/awt/grid/XGridDataListener.hpp>
-#include <com/sun/star/awt/XControl.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/awt/grid/XMutableGridDataModel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <rtl/ref.hxx>
-#include <vector>
+
+#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/compbase2.hxx>
 #include <toolkit/helper/mutexandbroadcasthelper.hxx>
 
-using ::rtl::OUString;
+#include <vector>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::awt::grid;
 using namespace ::com::sun::star::lang;
 
+namespace comphelper
+{
+    class ComponentGuard;
+}
+
 namespace toolkit
 {
 
 enum broadcast_type { row_added, row_removed, data_changed};
 
-class DefaultGridDataModel : public ::cppu::WeakImplHelper2< XGridDataModel, XServiceInfo >,
-                             public MutexAndBroadcastHelper
+typedef ::cppu::WeakComponentImplHelper2    <   XMutableGridDataModel
+                                            ,   XServiceInfo
+                                            >   DefaultGridDataModel_Base;
+
+class DefaultGridDataModel  :public ::cppu::BaseMutex
+                            ,public DefaultGridDataModel_Base
 {
 public:
     DefaultGridDataModel();
+    DefaultGridDataModel( DefaultGridDataModel const & i_copySource );
     virtual ~DefaultGridDataModel();
 
+    // XMutableGridDataModel
+    virtual void SAL_CALL addRow( const Any& i_heading, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Data ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& Headings, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& Data ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeAllRows(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL updateRowData( const ::com::sun::star::uno::Sequence< ::sal_Int32 >& ColumnIndexes, ::sal_Int32 RowIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const ::com::sun::star::uno::Any& Heading ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addGridDataListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeGridDataListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+
     // XGridDataModel
-    virtual ::sal_Int32 SAL_CALL getRowHeight() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setRowHeight(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getRowCount() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowHeaders() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setRowHeaders(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & value) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Any > > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addRow(const ::rtl::OUString & headername, const ::com::sun::star::uno::Sequence< Any > & data) throw (::com::sun::star::uno::RuntimeException);
-       virtual void SAL_CALL removeRow(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addDataListener( const Reference< XGridDataListener >& xListener ) throw (RuntimeException);
-    virtual void SAL_CALL removeDataListener( const Reference< XGridDataListener >& xListener ) throw (RuntimeException);
-    virtual void SAL_CALL removeAll() throw (RuntimeException);
-    virtual void SAL_CALL setRowHeaderWidth(sal_Int32 _value) throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getRowHeaderWidth() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL updateCell( ::sal_Int32 row, ::sal_Int32 column, const ::com::sun::star::uno::Any& value ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL updateRow( ::sal_Int32 row, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& columns, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& values ) throw (::com::sun::star::uno::RuntimeException);
-    // XComponent
-    virtual void SAL_CALL dispose(  ) throw (RuntimeException);
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException);
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getColumnCount() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 Row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 Row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // OComponentHelper
+    virtual void SAL_CALL disposing();
+
+    // XCloneable
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (RuntimeException);
@@ -86,16 +94,25 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException);
 
 private:
+    typedef ::std::pair< Any, Any >     CellData;
+    typedef ::std::vector< CellData >   RowData;
+    typedef ::std::vector< RowData >    GridData;
+
+    void broadcast(
+        GridDataEvent const & i_event,
+        void ( SAL_CALL ::com::sun::star::awt::grid::XGridDataListener::*i_listenerMethod )( ::com::sun::star::awt::grid::GridDataEvent const & ),
+        ::comphelper::ComponentGuard & i_instanceLock
+    );
+
+    void    impl_addRow( Sequence< Any > const & i_rowData, sal_Int32 const i_assumedColCount = -1 );
 
-    void broadcast( broadcast_type eType, const GridDataEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException);
-    void broadcast_changed( ::rtl::OUString name, sal_Int32 index, Any oldValue, Any newValue ) throw (::com::sun::star::uno::RuntimeException);
-    void broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName,  const ::com::sun::star::uno::Sequence< Any  > rowData ) throw (::com::sun::star::uno::RuntimeException);
-    void broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName, const ::com::sun::star::uno::Sequence< Any  > rowData ) throw (::com::sun::star::uno::RuntimeException);
+    CellData const &    impl_getCellData_throw( sal_Int32 const i_columnIndex, sal_Int32 const i_rowIndex ) const;
+    CellData&           impl_getCellDataAccess_throw( sal_Int32 const i_columnIndex, sal_Int32 const i_rowIndex );
+    RowData&            impl_getRowDataAccess_throw( sal_Int32 const i_rowIndex, size_t const i_requiredColumnCount );
 
-    sal_Int32 rowHeight;
-    std::vector< std::vector < Any > > data;
-    std::vector< ::rtl::OUString > rowHeaders;
-    sal_Int32 m_nRowHeaderWidth;
+    GridData                                    m_aData;
+    ::std::vector< ::com::sun::star::uno::Any > m_aRowHeaders;
+    sal_Int32                                   m_nColumnCount;
 };
 
 }
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index 6720d639f5c1..c1216d53f328 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -25,281 +25,305 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_toolkit.hxx"
 #include "gridcolumn.hxx"
+
 #include <comphelper/sequence.hxx>
+#include <cppuhelper/typeprovider.hxx>
 #include <toolkit/helper/servicenames.hxx>
-#include <rtl/ref.hxx>
-
-using ::rtl::OUString;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::awt::grid;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::style;
-
-#define COLWIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ColWidth" ))
-#define MAXWIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MaxWidth" ))
-#define MINWIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MinWidth" ))
-#define PREFWIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "PrefWidth" ))
-#define HALIGN ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HAlign" ))
-#define TITLE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" ))
-#define COLRESIZE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ColumnResize" ))
-#define UPDATE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UpdateWidth" ))
 
 namespace toolkit
 {
-
-///////////////////////////////////////////////////////////////////////
-// class GridColumn
-///////////////////////////////////////////////////////////////////////
-
-GridColumn::GridColumn()
-: identifier(Any())
-,index(0)
-,columnWidth(4)
-,preferredWidth(0)
-,maxWidth(0)
-,minWidth(0)
-,bResizeable(true)
-,horizontalAlign(HorizontalAlignment(0))
-{
-}
-
-//---------------------------------------------------------------------
-
-GridColumn::~GridColumn()
-{
-}
-
-//---------------------------------------------------------------------
-
-void GridColumn::broadcast( broadcast_column_type eType, const GridColumnEvent& aEvent )
-{
-    ::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( XGridColumnListener::static_type() );
-    if( pIter )
-    {
-        ::cppu::OInterfaceIteratorHelper aListIter(*pIter);
-        while(aListIter.hasMoreElements())
-        {
-            XGridColumnListener* pListener = static_cast<XGridColumnListener*>(aListIter.next());
-            switch( eType )
-            {
-                case column_attribute_changed:  pListener->columnChanged(aEvent); break;
-            }
-        }
+    using namespace ::com::sun::star;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::awt;
+    using namespace ::com::sun::star::awt::grid;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star::util;
+    using namespace ::com::sun::star::style;
+
+    //==================================================================================================================
+    //= DefaultGridColumnModel
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    GridColumn::GridColumn()
+        :GridColumn_Base( m_aMutex )
+        ,m_aIdentifier()
+        ,m_nIndex(-1)
+        ,m_nDataColumnIndex(-1)
+        ,m_nColumnWidth(4)
+        ,m_nMaxWidth(0)
+        ,m_nMinWidth(0)
+        ,m_nFlexibility(1)
+        ,m_bResizeable(true)
+        ,m_eHorizontalAlign( HorizontalAlignment_LEFT )
+    {
     }
-}
-
-//---------------------------------------------------------------------
-
-void GridColumn::broadcast_changed(::rtl::OUString name, Any oldValue, Any newValue)
-{
-    Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
-    GridColumnEvent aEvent( xSource, name, oldValue, newValue, index);
-    broadcast( column_attribute_changed, aEvent);
-}
-
-void SAL_CALL GridColumn::updateColumn(const ::rtl::OUString& name, sal_Int32 width) throw (::com::sun::star::uno::RuntimeException)
-{
-    if(PREFWIDTH == name)
-        preferredWidth = width;
-    else if (COLWIDTH == name)
-        columnWidth = width;
-}
-//---------------------------------------------------------------------
-// XGridColumn
-//---------------------------------------------------------------------
-
-::com::sun::star::uno::Any SAL_CALL GridColumn::getIdentifier() throw (::com::sun::star::uno::RuntimeException)
-{
-    return identifier;
-}
 
-//---------------------------------------------------------------------
-
-void SAL_CALL GridColumn::setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException)
-{
-    value >>= identifier;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    GridColumn::GridColumn( GridColumn const & i_copySource )
+        :cppu::BaseMutex()
+        ,GridColumn_Base( m_aMutex )
+        ,m_aIdentifier( i_copySource.m_aIdentifier )
+        ,m_nIndex( -1 )
+        ,m_nDataColumnIndex( i_copySource.m_nDataColumnIndex )
+        ,m_nColumnWidth( i_copySource.m_nColumnWidth )
+        ,m_nMaxWidth( i_copySource.m_nMaxWidth )
+        ,m_nMinWidth( i_copySource.m_nMinWidth )
+        ,m_nFlexibility( i_copySource.m_nFlexibility )
+        ,m_bResizeable( i_copySource.m_bResizeable )
+        ,m_sTitle( i_copySource.m_sTitle )
+        ,m_sHelpText( i_copySource.m_sHelpText )
+        ,m_eHorizontalAlign( i_copySource.m_eHorizontalAlign )
+    {
+    }
 
-//--------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    GridColumn::~GridColumn()
+    {
+    }
 
-::sal_Int32 SAL_CALL GridColumn::getColumnWidth() throw (::com::sun::star::uno::RuntimeException)
-{
-    broadcast_changed(UPDATE, Any(columnWidth), Any());
-    return columnWidth;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void GridColumn::broadcast_changed( sal_Char const * const i_asciiAttributeName, Any i_oldValue, Any i_newValue,
+        ::comphelper::ComponentGuard& i_Guard )
+    {
+        Reference< XInterface > const xSource( static_cast< ::cppu::OWeakObject* >( this ) );
+        GridColumnEvent const aEvent(
+            xSource, ::rtl::OUString::createFromAscii( i_asciiAttributeName ),
+            i_oldValue, i_newValue, m_nIndex
+        );
 
-//--------------------------------------------------------------------
+        ::cppu::OInterfaceContainerHelper* pIter = rBHelper.getContainer( XGridColumnListener::static_type() );
 
-void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
-{
-    columnWidth = value;
-    broadcast_changed(COLWIDTH, Any(columnWidth),Any(value));
-}
-//--------------------------------------------------------------------
+        i_Guard.clear();
+        if( pIter )
+            pIter->notifyEach( &XGridColumnListener::columnChanged, aEvent );
+    }
 
-::sal_Int32 SAL_CALL GridColumn::getPreferredWidth() throw (::com::sun::star::uno::RuntimeException)
-{
-    broadcast_changed(UPDATE, Any(preferredWidth), Any());
-    return preferredWidth;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    ::com::sun::star::uno::Any SAL_CALL GridColumn::getIdentifier() throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_aIdentifier;
+    }
 
-//--------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        m_aIdentifier = value;
+    }
 
-void SAL_CALL GridColumn::setPreferredWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
-{
-    preferredWidth = value;
-    broadcast_changed(PREFWIDTH, Any(preferredWidth),Any(value));
-}
-//--------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL GridColumn::getColumnWidth() throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_nColumnWidth;
+    }
 
-::sal_Int32 SAL_CALL GridColumn::getMaxWidth() throw (::com::sun::star::uno::RuntimeException)
-{
-    return maxWidth;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
+    {
+        impl_set( m_nColumnWidth, value, "ColumnWidth" );
+    }
 
-//--------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL GridColumn::getMaxWidth() throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_nMaxWidth;
+    }
 
-void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
-{
-    maxWidth = value;
-    broadcast_changed(MAXWIDTH, Any(maxWidth),Any(value));
-}
-//--------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
+    {
+        impl_set( m_nMaxWidth, value, "MaxWidth" );
+    }
 
-::sal_Int32 SAL_CALL GridColumn::getMinWidth() throw (::com::sun::star::uno::RuntimeException)
-{
-    return minWidth;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL GridColumn::getMinWidth() throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_nMinWidth;
+    }
 
-//--------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
+    {
+        impl_set( m_nMinWidth, value, "MinWidth" );
+    }
 
-void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
-{
-    minWidth = value;
-    broadcast_changed(MINWIDTH, Any(minWidth),Any(value));
-}
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_sTitle;
+    }
 
-//--------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::setTitle(const ::rtl::OUString & value) throw (::com::sun::star::uno::RuntimeException)
+    {
+        impl_set( m_sTitle, value, "Title" );
+    }
 
-::rtl::OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException)
-{
-    return title;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_sHelpText;
+    }
 
-//--------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::setHelpText( const ::rtl::OUString & value ) throw (RuntimeException)
+    {
+        impl_set( m_sHelpText, value, "HelpText" );
+    }
 
-void SAL_CALL GridColumn::setTitle(const ::rtl::OUString & value) throw (::com::sun::star::uno::RuntimeException)
-{
-    title = value;
-    broadcast_changed(TITLE, Any(title),Any(value));
-}
-//--------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool SAL_CALL GridColumn::getResizeable() throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_bResizeable;
+    }
 
-sal_Bool SAL_CALL GridColumn::getResizeable() throw (::com::sun::star::uno::RuntimeException)
-{
-    return bResizeable;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (::com::sun::star::uno::RuntimeException)
+    {
+        impl_set( m_bResizeable, value, "Resizeable" );
+    }
 
-//--------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL GridColumn::getFlexibility() throw (RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_nFlexibility;
+    }
 
-void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (::com::sun::star::uno::RuntimeException)
-{
-    bResizeable = value;
-    broadcast_changed(COLRESIZE, Any(bResizeable),Any(value));
-}
-//---------------------------------------------------------------------
-HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException)
-{
-    return horizontalAlign;
-}
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value ) throw (IllegalArgumentException, RuntimeException)
+    {
+        if ( i_value < 0 )
+            throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+        impl_set( m_nFlexibility, i_value, "Flexibility" );
+    }
 
-void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException)
-{
-    horizontalAlign = align;
-    broadcast_changed(HALIGN, Any(horizontalAlign),Any(align));
-}
-//---------------------------------------------------------------------
-void SAL_CALL GridColumn::addColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.addListener( XGridColumnListener::static_type(), xListener );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_eHorizontalAlign;
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException)
+    {
+        impl_set( m_eHorizontalAlign, align, "HorizontalAlign" );
+    }
 
-void SAL_CALL GridColumn::removeColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.removeListener( XGridColumnListener::static_type(), xListener );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::addGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException)
+    {
+        rBHelper.addListener( XGridColumnListener::static_type(), xListener );
+    }
 
-//---------------------------------------------------------------------
-// XComponent
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::removeGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException)
+    {
+        rBHelper.removeListener( XGridColumnListener::static_type(), xListener );
+    }
 
-void SAL_CALL GridColumn::dispose() throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::disposing()
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        m_aIdentifier.clear();
+        m_sTitle = m_sHelpText = ::rtl::OUString();
+    }
 
-    ::com::sun::star::lang::EventObject aEvent;
-    aEvent.Source.set( static_cast< ::cppu::OWeakObject* >( this ) );
-    BrdcstHelper.aLC.disposeAndClear( aEvent );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL GridColumn::getIndex() throw (RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_nIndex;
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void GridColumn::setIndex( sal_Int32 const i_index )
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        m_nIndex = i_index;
+    }
 
-void SAL_CALL GridColumn::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.addListener( XEventListener::static_type(), xListener );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL GridColumn::getDataColumnIndex() throw(RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        return m_nDataColumnIndex;
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridColumn::setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(RuntimeException)
+    {
+        impl_set( m_nDataColumnIndex, i_dataColumnIndex, "DataColumnIndex" );
+    }
 
-void SAL_CALL GridColumn::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.removeListener( XEventListener::static_type(), xListener );
-}
-void SAL_CALL GridColumn::setIndex(sal_Int32 _nIndex) throw (::com::sun::star::uno::RuntimeException)
-{
-    index = _nIndex;
-}
-//---------------------------------------------------------------------
-// XServiceInfo
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL GridColumn::getImplementationName(  ) throw (RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.toolkit.GridColumn" ) );
+    }
 
-::rtl::OUString SAL_CALL GridColumn::getImplementationName(  ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    static const OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "toolkit.GridColumn" ) );
-    return aImplName;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool SAL_CALL GridColumn::supportsService( const ::rtl::OUString& i_serviceName ) throw (RuntimeException)
+    {
+        const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() );
+        for ( sal_Int32 i=0; i<aServiceNames.getLength(); ++i )
+            if ( aServiceNames[i] == i_serviceName )
+                return sal_True;
+        return sal_False;
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GridColumn::getSupportedServiceNames(  ) throw (RuntimeException)
+    {
+        const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( szServiceName_GridColumn ) );
+        const Sequence< ::rtl::OUString > aSeq( &aServiceName, 1 );
+        return aSeq;
+    }
 
-sal_Bool SAL_CALL GridColumn::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    return ServiceName.equalsAscii( szServiceName_GridColumn );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XCloneable > SAL_CALL GridColumn::createClone(  ) throw (RuntimeException)
+    {
+        return new GridColumn( *this );
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Int64 SAL_CALL GridColumn::getSomething( const Sequence< sal_Int8 >& i_identifier ) throw(RuntimeException)
+    {
+        if ( ( i_identifier.getLength() == 16 ) && ( i_identifier == getUnoTunnelId() ) )
+            return ::sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ) );
+        return 0;
+    }
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GridColumn::getSupportedServiceNames(  ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    static const OUString aServiceName( OUString::createFromAscii( szServiceName_GridColumn ) );
-    static const Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< sal_Int8 > GridColumn::getUnoTunnelId() throw()
+    {
+        static ::cppu::OImplementationId const aId;
+        return aId.getImplementationId();
+    }
 
+    //------------------------------------------------------------------------------------------------------------------
+    GridColumn* GridColumn::getImplementation( const Reference< XInterface >& i_component )
+    {
+        Reference< XUnoTunnel > const xTunnel( i_component, UNO_QUERY );
+        if ( xTunnel.is() )
+            return reinterpret_cast< GridColumn* >( ::sal::static_int_cast< sal_IntPtr >( xTunnel->getSomething( getUnoTunnelId() ) ) );
+        return NULL;
+    }
 }
 
-Reference< XInterface > SAL_CALL GridColumn_CreateInstance( const Reference< XMultiServiceFactory >& )
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GridColumn_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& )
 {
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::GridColumn );
+    return *( new ::toolkit::GridColumn );
 }
 
diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx
index 38d43d55a07b..b1be836a3862 100644
--- a/toolkit/source/controls/grid/gridcolumn.hxx
+++ b/toolkit/source/controls/grid/gridcolumn.hxx
@@ -25,83 +25,111 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_toolkit.hxx"
+
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
-#include <com/sun/star/awt/grid/XGridColumnListener.hpp>
-#include <com/sun/star/awt/grid/GridColumnEvent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <com/sun/star/style/HorizontalAlignment.hpp>
+
+#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/compbase3.hxx>
+#include <comphelper/componentguard.hxx>
 #include <rtl/ref.hxx>
-#include <vector>
 #include <toolkit/helper/mutexandbroadcasthelper.hxx>
-#include <com/sun/star/style/HorizontalAlignment.hpp>
 
-using ::rtl::OUString;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::awt::grid;
-using namespace ::com::sun::star::lang;
+#include <vector>
 
 namespace toolkit
 {
 
-enum broadcast_column_type { column_attribute_changed};
-class GridColumn : public ::cppu::WeakImplHelper2< XGridColumn, XServiceInfo >,
-                             public MutexAndBroadcastHelper
+typedef ::cppu::WeakComponentImplHelper3    <   ::com::sun::star::awt::grid::XGridColumn
+                                            ,   ::com::sun::star::lang::XServiceInfo
+                                            ,   ::com::sun::star::lang::XUnoTunnel
+                                            >   GridColumn_Base;
+class GridColumn    :public ::cppu::BaseMutex
+                    ,public GridColumn_Base
 {
 public:
     GridColumn();
+    GridColumn( GridColumn const & i_copySource );
     virtual ~GridColumn();
 
-    // XGridColumn
+    // ::com::sun::star::awt::grid::XGridColumn
     virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getColumnWidth() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setColumnWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Int32 SAL_CALL getPreferredWidth() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPreferredWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getMaxWidth() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setMaxWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getMinWidth() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setMinWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL getResizeable() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setResizeable(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getFlexibility() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setTitle(const ::rtl::OUString & value) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getHelpText() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setHelpText(const ::rtl::OUString & value) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getIndex() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getDataColumnIndex() throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::style::HorizontalAlignment SAL_CALL getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setHorizontalAlign(::com::sun::star::style::HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addColumnListener( const Reference< XGridColumnListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeColumnListener( const Reference< XGridColumnListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL updateColumn( const ::rtl::OUString& name, ::sal_Int32 width ) throw (::com::sun::star::uno::RuntimeException);
-    // XComponent
-    virtual void SAL_CALL dispose(  ) throw (RuntimeException);
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException);
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException);
+    virtual void SAL_CALL addGridColumnListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeGridColumnListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    // OComponentHelper
+    virtual void SAL_CALL disposing();
+
+    // XCloneable (base of XGridColumn)
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (RuntimeException);
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XUnoTunnel and friends
+    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& i_identifier ) throw(::com::sun::star::uno::RuntimeException);
+    static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelId() throw();
+    static GridColumn* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_component );
+
+    // attribute access
+    void setIndex( sal_Int32 const i_index );
 
-    virtual void SAL_CALL setIndex(sal_Int32 _nIndex)throw (::com::sun::star::uno::RuntimeException);
 private:
-    void broadcast( broadcast_column_type eType, const GridColumnEvent& aEvent );
-    void broadcast_changed( ::rtl::OUString name, Any oldValue, Any newValue);
-
-    Any identifier;
-    sal_Int32 index;
-    sal_Int32 columnWidth;
-    sal_Int32 preferredWidth;
-    sal_Int32 maxWidth;
-    sal_Int32 minWidth;
-    sal_Bool  bResizeable;
-    ::rtl::OUString title;
-    ::com::sun::star::style::HorizontalAlignment horizontalAlign;
+    void broadcast_changed(
+            sal_Char const * const i_asciiAttributeName,
+            ::com::sun::star::uno::Any i_oldValue,
+            ::com::sun::star::uno::Any i_newValue,
+            ::comphelper::ComponentGuard& i_Guard
+        );
+
+    template< class TYPE >
+    void impl_set( TYPE & io_attribute, TYPE const & i_newValue, sal_Char const * i_attributeName )
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        if ( io_attribute == i_newValue )
+            return;
+
+        TYPE const aOldValue( io_attribute );
+        io_attribute = i_newValue;
+        broadcast_changed( i_attributeName, ::com::sun::star::uno::makeAny( aOldValue ), ::com::sun::star::uno::makeAny( io_attribute ), aGuard );
+    }
+
+    ::com::sun::star::uno::Any                      m_aIdentifier;
+    sal_Int32                                       m_nIndex;
+    sal_Int32                                       m_nDataColumnIndex;
+    sal_Int32                                       m_nColumnWidth;
+    sal_Int32                                       m_nMaxWidth;
+    sal_Int32                                       m_nMinWidth;
+    sal_Int32                                       m_nFlexibility;
+    sal_Bool                                        m_bResizeable;
+    ::rtl::OUString                                 m_sTitle;
+    ::rtl::OUString                                 m_sHelpText;
+    ::com::sun::star::style::HorizontalAlignment    m_eHorizontalAlign;
 };
 
 }
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 5125c1349ade..acda52753a60 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -28,22 +28,27 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_toolkit.hxx"
 
-#include <gridcontrol.hxx>
+#include "gridcontrol.hxx"
+#include "grideventforwarder.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/view/SelectionType.hpp>
 #include <com/sun/star/awt/grid/XGridDataModel.hpp>
+#include <com/sun/star/awt/grid/XMutableGridDataModel.hpp>
+#include <com/sun/star/awt/grid/DefaultGridDataModel.hpp>
+#include <com/sun/star/awt/grid/SortableGridDataModel.hpp>
 #include <com/sun/star/awt/grid/XGridColumnModel.hpp>
-#include <com/sun/star/awt/grid/ScrollBarMode.hpp>
 #include <toolkit/helper/unopropertyarrayhelper.hxx>
 #include <toolkit/helper/property.hxx>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <comphelper/processfactory.hxx>
-#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
+#include <tools/color.hxx>
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::awt::grid;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
@@ -52,10 +57,28 @@ using namespace ::com::sun::star::view;
 
 namespace toolkit
 {
-//  ----------------------------------------------------
-//  class UnoGridModel
-//  ----------------------------------------------------
-UnoGridModel::UnoGridModel()
+//======================================================================================================================
+//= UnoGridModel
+//======================================================================================================================
+namespace
+{
+    Reference< XGridDataModel > lcl_getDefaultDataModel_throw( ::comphelper::ComponentContext const & i_context )
+    {
+        Reference< XMutableGridDataModel > const xDelegatorModel( DefaultGridDataModel::create( i_context.getUNOContext() ), UNO_QUERY_THROW );
+        Reference< XGridDataModel > const xDataModel( SortableGridDataModel::create( i_context.getUNOContext(), xDelegatorModel ), UNO_QUERY_THROW );
+        return xDataModel;
+    }
+
+    Reference< XGridColumnModel > lcl_getDefaultColumnModel_throw( ::comphelper::ComponentContext const & i_context )
+    {
+        Reference< XGridColumnModel > const xColumnModel( i_context.createComponent( "com.sun.star.awt.grid.DefaultGridColumnModel" ), UNO_QUERY_THROW );
+        return xColumnModel;
+    }
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+        :UnoControlModel( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -71,36 +94,131 @@ UnoGridModel::UnoGridModel()
     ImplRegisterProperty( BASEPROPERTY_VSCROLL );
     ImplRegisterProperty( BASEPROPERTY_TABSTOP );
     ImplRegisterProperty( BASEPROPERTY_GRID_SHOWROWHEADER );
+    ImplRegisterProperty( BASEPROPERTY_ROW_HEADER_WIDTH );
     ImplRegisterProperty( BASEPROPERTY_GRID_SHOWCOLUMNHEADER );
-    ImplRegisterProperty( BASEPROPERTY_GRID_DATAMODEL );
-    ImplRegisterProperty( BASEPROPERTY_GRID_COLUMNMODEL );
+    ImplRegisterProperty( BASEPROPERTY_COLUMN_HEADER_HEIGHT );
+    ImplRegisterProperty( BASEPROPERTY_ROW_HEIGHT );
+    ImplRegisterProperty( BASEPROPERTY_GRID_DATAMODEL, makeAny( lcl_getDefaultDataModel_throw( maContext ) ) );
+    ImplRegisterProperty( BASEPROPERTY_GRID_COLUMNMODEL, makeAny( lcl_getDefaultColumnModel_throw( maContext ) ) );
     ImplRegisterProperty( BASEPROPERTY_GRID_SELECTIONMODE );
     ImplRegisterProperty( BASEPROPERTY_FONTRELIEF );
     ImplRegisterProperty( BASEPROPERTY_FONTEMPHASISMARK );
     ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
     ImplRegisterProperty( BASEPROPERTY_TEXTCOLOR );
-    ImplRegisterProperty( BASEPROPERTY_VERTICALALIGN );
-    ImplRegisterProperty( BASEPROPERTY_GRID_EVEN_ROW_BACKGROUND );
-    ImplRegisterProperty( BASEPROPERTY_GRID_HEADER_BACKGROUND );
+    ImplRegisterProperty( BASEPROPERTY_TEXTLINECOLOR );
+    ImplRegisterProperty( BASEPROPERTY_USE_GRID_LINES );
     ImplRegisterProperty( BASEPROPERTY_GRID_LINE_COLOR );
-    ImplRegisterProperty( BASEPROPERTY_GRID_ROW_BACKGROUND );
+    ImplRegisterProperty( BASEPROPERTY_GRID_HEADER_BACKGROUND );
+    ImplRegisterProperty( BASEPROPERTY_GRID_HEADER_TEXT_COLOR );
+    ImplRegisterProperty( BASEPROPERTY_GRID_ROW_BACKGROUND_COLORS );
+    ImplRegisterProperty( BASEPROPERTY_VERTICALALIGN );
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
-: UnoControlModel( rModel )
+    :UnoControlModel( rModel )
 {
+    osl_incrementInterlockedCount( &m_refCount );
+    {
+        Reference< XGridDataModel > xDataModel;
+        // clone the data model
+        const Reference< XFastPropertySet > xCloneSource( &const_cast< UnoGridModel& >( rModel ) );
+        try
+        {
+            const Reference< XCloneable > xCloneable( xCloneSource->getFastPropertyValue( BASEPROPERTY_GRID_DATAMODEL ), UNO_QUERY_THROW );
+            xDataModel.set( xCloneable->createClone(), UNO_QUERY_THROW );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        if ( !xDataModel.is() )
+            xDataModel = lcl_getDefaultDataModel_throw( maContext );
+        UnoControlModel::setFastPropertyValue_NoBroadcast( BASEPROPERTY_GRID_DATAMODEL, makeAny( xDataModel ) );
+            // do *not* use setFastPropertyValue here: The UnoControlModel ctor did a simple copy of all property values,
+            // so before this call here, we share our data model with the own of the clone source. setFastPropertyValue,
+            // then, disposes the old data model - which means the data model which in fact belongs to the clone source.
+            // so, call the UnoControlModel's impl-method for setting the value.
+
+        // clone the column model
+        Reference< XGridColumnModel > xColumnModel;
+        try
+        {
+            const Reference< XCloneable > xCloneable( xCloneSource->getFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL ), UNO_QUERY_THROW );
+            xColumnModel.set( xCloneable->createClone(), UNO_QUERY_THROW );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        if ( !xColumnModel.is() )
+            xColumnModel = lcl_getDefaultColumnModel_throw( maContext );
+        UnoControlModel::setFastPropertyValue_NoBroadcast( BASEPROPERTY_GRID_COLUMNMODEL, makeAny( xColumnModel ) );
+            // same comment as above: do not use our own setPropertyValue here.
+    }
+    osl_decrementInterlockedCount( &m_refCount );
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 UnoControlModel* UnoGridModel::Clone() const
 {
     return new UnoGridModel( *this );
 }
 
+//----------------------------------------------------------------------------------------------------------------------
+namespace
+{
+    void lcl_dispose_nothrow( const Any& i_component )
+    {
+        try
+        {
+            const Reference< XComponent > xComponent( i_component, UNO_QUERY_THROW );
+            xComponent->dispose();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+void SAL_CALL UnoGridModel::dispose(  ) throw(RuntimeException)
+{
+    lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL ) );
+    lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_DATAMODEL ) );
+
+    UnoControlModel::dispose();
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
+{
+    Any aOldSubModel;
+    if ( ( nHandle == BASEPROPERTY_GRID_COLUMNMODEL ) || ( nHandle == BASEPROPERTY_GRID_DATAMODEL ) )
+    {
+        aOldSubModel = getFastPropertyValue( nHandle );
+        if ( aOldSubModel == rValue )
+        {
+            OSL_ENSURE( false, "UnoGridModel::setFastPropertyValue_NoBroadcast: setting the same value, again!" );
+                // shouldn't this have been caught by convertFastPropertyValue?
+            aOldSubModel.clear();
+        }
+    }
+
+    UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
+
+    if ( aOldSubModel.hasValue() )
+        lcl_dispose_nothrow( aOldSubModel );
+}
+
+//----------------------------------------------------------------------------------------------------------------------
 OUString UnoGridModel::getServiceName() throw(RuntimeException)
 {
     return OUString::createFromAscii( szServiceName_GridControlModel );
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 {
     switch( nPropId )
@@ -110,27 +228,26 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
         case BASEPROPERTY_GRID_SELECTIONMODE:
             return uno::makeAny( SelectionType(1) );
         case BASEPROPERTY_GRID_SHOWROWHEADER:
+        case BASEPROPERTY_USE_GRID_LINES:
             return uno::makeAny( (sal_Bool)sal_False );
+        case BASEPROPERTY_ROW_HEADER_WIDTH:
+            return uno::makeAny( sal_Int32( 10 ) );
         case BASEPROPERTY_GRID_SHOWCOLUMNHEADER:
-            return uno::makeAny( (sal_Bool)sal_False );
-        case BASEPROPERTY_GRID_DATAMODEL:
-            return uno::makeAny( Reference<XGridDataModel> ());
-        case BASEPROPERTY_GRID_COLUMNMODEL:
-            return uno::makeAny(Reference<XGridColumnModel>() );
-        case BASEPROPERTY_GRID_EVEN_ROW_BACKGROUND:
-            return uno::makeAny( com::sun::star::util::Color(0xFFFFFF) );
+            return uno::makeAny( (sal_Bool)sal_True );
+        case BASEPROPERTY_COLUMN_HEADER_HEIGHT:
+        case BASEPROPERTY_ROW_HEIGHT:
         case BASEPROPERTY_GRID_HEADER_BACKGROUND:
-            return uno::makeAny( com::sun::star::util::Color(0xFFFFFF) );
+        case BASEPROPERTY_GRID_HEADER_TEXT_COLOR:
         case BASEPROPERTY_GRID_LINE_COLOR:
-            return uno::makeAny( com::sun::star::util::Color(0xFFFFFF) );
-        case BASEPROPERTY_GRID_ROW_BACKGROUND:
-            return uno::makeAny(com::sun::star::util::Color(0xFFFFFF) );
+        case BASEPROPERTY_GRID_ROW_BACKGROUND_COLORS:
+            return Any();
         default:
             return UnoControlModel::ImplGetDefaultValue( nPropId );
     }
 
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper& UnoGridModel::getInfoHelper()
 {
     static UnoPropertyArrayHelper* pHelper = NULL;
@@ -142,6 +259,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     return *pHelper;
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 // XMultiPropertySet
 Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo(  ) throw(RuntimeException)
 {
@@ -150,20 +268,29 @@ Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo(  ) throw(Runtime
 }
 
 
-//  ----------------------------------------------------
-//  class UnoGridControl
-//  ----------------------------------------------------
-UnoGridControl::UnoGridControl()
-: mSelectionMode(SelectionType(1)),
-    m_aSelectionListeners( *this )
+//======================================================================================================================
+//= UnoGridControl
+//======================================================================================================================
+UnoGridControl::UnoGridControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoGridControl_Base( i_factory )
+    ,mSelectionMode(SelectionType(1))
+    ,m_aSelectionListeners( *this )
+    ,m_pEventForwarder( new GridEventForwarder( *this ) )
+{
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+UnoGridControl::~UnoGridControl()
 {
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 OUString UnoGridControl::GetComponentServiceName()
 {
     return OUString::createFromAscii( "Grid" );
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 void SAL_CALL UnoGridControl::dispose(  ) throw(RuntimeException)
 {
     lang::EventObject aEvt;
@@ -172,113 +299,155 @@ void SAL_CALL UnoGridControl::dispose(  ) throw(RuntimeException)
     UnoControl::dispose();
 }
 
-void UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException)
+//----------------------------------------------------------------------------------------------------------------------
+void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException)
 {
     UnoControlBase::createPeer( rxToolkit, rParentPeer );
 
-    Reference< XGridControl >  xGrid( getPeer(), UNO_QUERY_THROW );
+    const Reference< XGridControl >  xGrid( getPeer(), UNO_QUERY_THROW );
     xGrid->addSelectionListener(&m_aSelectionListeners);
+}
 
-    Reference<XGridDataListener> xListener ( getPeer(), UNO_QUERY_THROW );
-    Reference<XGridColumnListener> xColListener ( getPeer(), UNO_QUERY_THROW );
-    Reference<XPropertySet> xPropSet ( getModel(), UNO_QUERY_THROW );
-
-    Reference<XGridDataModel> xGridDataModel ( xPropSet->getPropertyValue(OUString::createFromAscii( "GridDataModel" )), UNO_QUERY_THROW );
-    if(xGridDataModel != NULL)
-        xGridDataModel->addDataListener(xListener);
-    Reference<XGridColumnModel> xGridColumnModel ( xPropSet->getPropertyValue(OUString::createFromAscii( "ColumnModel" )), UNO_QUERY_THROW );
-    if(xGridColumnModel != NULL)
+//----------------------------------------------------------------------------------------------------------------------
+namespace
+{
+    void lcl_setEventForwarding( const Reference< XControlModel >& i_gridControlModel, const ::boost::scoped_ptr< GridEventForwarder >& i_listener,
+        bool const i_add )
     {
-        for(int i = 0;i<xGridColumnModel->getColumnCount();i++)
+        const Reference< XPropertySet > xModelProps( i_gridControlModel, UNO_QUERY );
+        if ( !xModelProps.is() )
+            return;
+
+        try
         {
-            xGridColumnModel->getColumn(i)->addColumnListener(xColListener);
+            Reference< XContainer > const xColModel(
+                xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnModel" ) ) ),
+                UNO_QUERY_THROW );
+            if ( i_add )
+                xColModel->addContainerListener( i_listener.get() );
+            else
+                xColModel->removeContainerListener( i_listener.get() );
+
+            Reference< XGridDataModel > const xDataModel(
+                xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GridDataModel" ) ) ),
+                UNO_QUERY_THROW
+            );
+            Reference< XMutableGridDataModel > const xMutableDataModel( xDataModel, UNO_QUERY );
+            if ( xMutableDataModel.is() )
+            {
+                if ( i_add )
+                    xMutableDataModel->addGridDataListener( i_listener.get() );
+                else
+                    xMutableDataModel->removeGridDataListener( i_listener.get() );
+            }
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 }
 
+//----------------------------------------------------------------------------------------------------------------------
+sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_model ) throw(RuntimeException)
+{
+    lcl_setEventForwarding( getModel(), m_pEventForwarder, false );
+    if ( !UnoGridControl_Base::setModel( i_model ) )
+        return sal_False;
+    lcl_setEventForwarding( getModel(), m_pEventForwarder, true );
+    return sal_True;
+}
 
-// -------------------------------------------------------------------
-// XGridControl
-
-::sal_Int32 UnoGridControl::getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException)
+//----------------------------------------------------------------------------------------------------------------------
+::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException)
 {
-    Reference< XGridControl > xGrid ( getPeer(), UNO_QUERY_THROW );
-    return xGrid->getItemIndexAtPoint( x, y );
+    Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
+    return xGrid->getRowAtPoint( x, y );
 }
 
-void SAL_CALL UnoGridControl::setToolTip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& text, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& columns) throw (::com::sun::star::uno::RuntimeException)
+//----------------------------------------------------------------------------------------------------------------------
+::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException)
 {
-    Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->setToolTip( text, columns );
+    Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
+    return xGrid->getColumnAtPoint( x, y );
 }
-// -------------------------------------------------------------------
-// XGridSelection
-// -------------------------------------------------------------------
 
-::sal_Int32 SAL_CALL UnoGridControl::getMinSelectionIndex() throw (::com::sun::star::uno::RuntimeException)
+//----------------------------------------------------------------------------------------------------------------------
+::sal_Int32 SAL_CALL UnoGridControl::getCurrentColumn(  ) throw (RuntimeException)
 {
-    return Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->getMinSelectionIndex();
+    Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
+    return xGrid->getCurrentColumn();
 }
 
-::sal_Int32 SAL_CALL UnoGridControl::getMaxSelectionIndex() throw (::com::sun::star::uno::RuntimeException)
+//----------------------------------------------------------------------------------------------------------------------
+::sal_Int32 SAL_CALL UnoGridControl::getCurrentRow(  ) throw (RuntimeException)
 {
-    return Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->getMaxSelectionIndex();
+    Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
+    return xGrid->getCurrentRow();
 }
 
-void SAL_CALL UnoGridControl::selectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException)
+//----------------------------------------------------------------------------------------------------------------------
+void SAL_CALL UnoGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException)
 {
-    Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->selectRows( rangeOfRows);
+    Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->selectRow( i_rowIndex );
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 void SAL_CALL UnoGridControl::selectAllRows() throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->selectAllRows();
 }
-void SAL_CALL UnoGridControl::deselectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException)
+
+//----------------------------------------------------------------------------------------------------------------------
+void SAL_CALL UnoGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException)
 {
-    Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->deselectRows( rangeOfRows);
+    Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->deselectRow( i_rowIndex );
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 void SAL_CALL UnoGridControl::deselectAllRows() throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->deselectAllRows();
 }
+
+//----------------------------------------------------------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelection() throw (::com::sun::star::uno::RuntimeException)
 {
     return Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->getSelection();
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 ::sal_Bool SAL_CALL UnoGridControl::isSelectionEmpty() throw (::com::sun::star::uno::RuntimeException)
 {
     return Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->isSelectionEmpty();
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 ::sal_Bool SAL_CALL UnoGridControl::isSelectedIndex(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException)
 {
     return Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->isSelectedIndex( index );
 }
 
-void SAL_CALL UnoGridControl::selectRow(::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->selectRow( y );
-}
-
+//----------------------------------------------------------------------------------------------------------------------
 void SAL_CALL UnoGridControl::addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException)
 {
     m_aSelectionListeners.addInterface( listener );
 }
 
+//----------------------------------------------------------------------------------------------------------------------
 void SAL_CALL UnoGridControl::removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException)
 {
     m_aSelectionListeners.removeInterface( listener );
 }
+
 }//namespace toolkit
 
-Reference< XInterface > SAL_CALL GridControl_CreateInstance( const Reference< XMultiServiceFactory >& )
+Reference< XInterface > SAL_CALL GridControl_CreateInstance( const Reference< XMultiServiceFactory >& i_factory )
 {
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridControl );
+    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridControl( i_factory ) );
 }
 
-Reference< XInterface > SAL_CALL GridControlModel_CreateInstance( const Reference< XMultiServiceFactory >& )
+Reference< XInterface > SAL_CALL GridControlModel_CreateInstance( const Reference< XMultiServiceFactory >& i_factory )
 {
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridModel );
+    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridModel( i_factory ) );
 }
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index 0c8ddb1c02b6..61d9f8fc0232 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -30,21 +30,20 @@
 
 #include <com/sun/star/awt/grid/XGridControl.hpp>
 #include <com/sun/star/view/SelectionType.hpp>
+
 #include <toolkit/controls/unocontrolbase.hxx>
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/helper/servicenames.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/sequence.hxx>
-
 #include <toolkit/helper/listenermultiplexer.hxx>
 
-namespace toolkit {
+#include <boost/scoped_ptr.hpp>
+
+namespace toolkit
+{
 
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
+class GridEventForwarder;
 
 // ===================================================================
 // = UnoGridModel
@@ -52,21 +51,27 @@ using namespace ::com::sun::star::container;
 class UnoGridModel : public UnoControlModel
 {
 protected:
-    Any     ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const;
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-    UnoGridModel();
+    UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     UnoGridModel( const UnoGridModel& rModel );
 
     UnoControlModel* Clone() const;
 
+    // ::com::sun::star::lang::XComponent
+    void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
+
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
 
+    // OPropertySetHelper
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception);
+
     // XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoGridModel, UnoControlModel, szServiceName_GridControlModel )
 };
@@ -75,10 +80,13 @@ public:
 // ===================================================================
 // = UnoGridControl
 // ===================================================================
-class UnoGridControl : public ::cppu::ImplInheritanceHelper1< UnoControlBase, ::com::sun::star::awt::grid::XGridControl >
+typedef ::cppu::ImplInheritanceHelper1  <   UnoControlBase
+                                        ,   ::com::sun::star::awt::grid::XGridControl
+                                        >   UnoGridControl_Base;
+class UnoGridControl : public UnoGridControl_Base
 {
 public:
-    UnoGridControl();
+    UnoGridControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString             GetComponentServiceName();
 
     // ::com::sun::star::lang::XComponent
@@ -86,24 +94,22 @@ public:
 
     // ::com::sun::star::awt::XControl
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
+    sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::grid::XGridControl
-
-    virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setToolTip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& text, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& columns) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getCurrentColumn(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getCurrentRow(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::awt::grid::XGridSelection
-
-    virtual ::sal_Int32 SAL_CALL getMinSelectionIndex() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Int32 SAL_CALL getMaxSelectionIndex() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL selectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL selectAllRows() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL deselectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL deselectAllRows() throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL isSelectionEmpty() throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL isSelectedIndex(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL selectRow(::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException);
 
@@ -111,9 +117,14 @@ public:
     DECLIMPL_SERVICEINFO_DERIVED( UnoGridControl, UnoControlBase, szServiceName_GridControl )
 
     using UnoControl::getPeer;
+
+protected:
+    ~UnoGridControl();
+
 private:
-    ::com::sun::star::view::SelectionType mSelectionMode;
-    SelectionListenerMultiplexer    m_aSelectionListeners;
+    ::com::sun::star::view::SelectionType       mSelectionMode;
+    SelectionListenerMultiplexer                m_aSelectionListeners;
+    ::boost::scoped_ptr< GridEventForwarder >   m_pEventForwarder;
 };
 
 } // toolkit
diff --git a/toolkit/source/controls/grid/grideventforwarder.cxx b/toolkit/source/controls/grid/grideventforwarder.cxx
new file mode 100755
index 000000000000..c3760b8315a3
--- /dev/null
+++ b/toolkit/source/controls/grid/grideventforwarder.cxx
@@ -0,0 +1,149 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#include "precompiled_toolkit.hxx"
+
+#include "grideventforwarder.hxx"
+#include "gridcontrol.hxx"
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+//......................................................................................................................
+namespace toolkit
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::awt::grid::GridDataEvent;
+    using ::com::sun::star::container::ContainerEvent;
+    using ::com::sun::star::lang::EventObject;
+    /** === end UNO using === **/
+
+    //==================================================================================================================
+    //= GridEventForwarder
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    GridEventForwarder::GridEventForwarder( UnoGridControl& i_parent )
+        :m_parent( i_parent )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    GridEventForwarder::~GridEventForwarder()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridEventForwarder::acquire() throw()
+    {
+        m_parent.acquire();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridEventForwarder::release() throw()
+    {
+        m_parent.release();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridEventForwarder::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException)
+    {
+        Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
+        if ( xPeer.is() )
+            xPeer->rowsInserted( i_event );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridEventForwarder::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException)
+    {
+        Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
+        if ( xPeer.is() )
+            xPeer->rowsRemoved( i_event );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridEventForwarder::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException)
+    {
+        Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
+        if ( xPeer.is() )
+            xPeer->dataChanged( i_event );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridEventForwarder::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException)
+    {
+        Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
+        if ( xPeer.is() )
+            xPeer->rowHeadingChanged( i_event );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridEventForwarder::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException)
+    {
+        Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY );
+        if ( xPeer.is() )
+            xPeer->elementInserted( i_event );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridEventForwarder::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException)
+    {
+        Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY );
+        if ( xPeer.is() )
+            xPeer->elementRemoved( i_event );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridEventForwarder::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException)
+    {
+        Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY );
+        if ( xPeer.is() )
+            xPeer->elementReplaced( i_event );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL GridEventForwarder::disposing( const EventObject& i_event ) throw (RuntimeException)
+    {
+        Reference< XEventListener > xPeer( m_parent.getPeer(), UNO_QUERY );
+        if ( xPeer.is() )
+            xPeer->disposing( i_event );
+    }
+
+//......................................................................................................................
+} // namespace toolkit
+//......................................................................................................................
diff --git a/toolkit/source/controls/grid/grideventforwarder.hxx b/toolkit/source/controls/grid/grideventforwarder.hxx
new file mode 100755
index 000000000000..5a8b03f57037
--- /dev/null
+++ b/toolkit/source/controls/grid/grideventforwarder.hxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+ * 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 TOOLKIT_GRIDEVENTFORWARDER_HXX
+#define TOOLKIT_GRIDEVENTFORWARDER_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/awt/grid/XGridDataListener.hpp>
+#include <com/sun/star/awt/grid/XGridColumnListener.hpp>
+#include <com/sun/star/container/XContainerListener.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/implbase2.hxx>
+
+//......................................................................................................................
+namespace toolkit
+{
+//......................................................................................................................
+
+    class UnoGridControl;
+
+    //==================================================================================================================
+    //= GridEventForwarder
+    //==================================================================================================================
+    typedef ::cppu::ImplHelper2 <   ::com::sun::star::awt::grid::XGridDataListener
+                                ,   ::com::sun::star::container::XContainerListener
+                                >   GridEventForwarder_Base;
+
+    class GridEventForwarder : public GridEventForwarder_Base
+    {
+    public:
+        GridEventForwarder( UnoGridControl& i_parent );
+        virtual ~GridEventForwarder();
+
+    public:
+        // XInterface
+        virtual void SAL_CALL acquire() throw();
+        virtual void SAL_CALL release() throw();
+
+        // XGridDataListener
+        virtual void SAL_CALL rowsInserted( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL rowsRemoved( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL dataChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL rowHeadingChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XContainerListener
+        virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XEventListener
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException);
+
+    private:
+        UnoGridControl& m_parent;
+    };
+
+//......................................................................................................................
+} // namespace toolkit
+//......................................................................................................................
+
+#endif // TOOLKIT_GRIDEVENTFORWARDER_HXX
diff --git a/toolkit/source/controls/grid/initguard.hxx b/toolkit/source/controls/grid/initguard.hxx
new file mode 100755
index 000000000000..b2dddd2e5987
--- /dev/null
+++ b/toolkit/source/controls/grid/initguard.hxx
@@ -0,0 +1,64 @@
+/*************************************************************************
+ * 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 SVTOOLS_INITGUARD_HXX
+#define SVTOOLS_INITGUARD_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/NotInitializedException.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/componentguard.hxx>
+
+//......................................................................................................................
+namespace toolkit
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= InitGuard
+    //==================================================================================================================
+    template < class IMPL >
+    class InitGuard : public ::comphelper::ComponentGuard
+    {
+    public:
+        InitGuard( IMPL& i_component, ::cppu::OBroadcastHelper & i_broadcastHelper )
+            :comphelper::ComponentGuard( i_component, i_broadcastHelper )
+        {
+            if ( !i_component.isInitialized() )
+                throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), *&i_component );
+        }
+
+        ~InitGuard()
+        {
+        }
+    };
+
+//......................................................................................................................
+} // namespace toolkit
+//......................................................................................................................
+
+#endif // SVTOOLS_INITGUARD_HXX
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
new file mode 100755
index 000000000000..77a2ffa1637b
--- /dev/null
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -0,0 +1,877 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#include "precompiled_toolkit.hxx"
+
+#include "sortablegriddatamodel.hxx"
+#include "toolkit/helper/servicenames.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/i18n/XCollator.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/anycompare.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+
+#include <set>
+
+//......................................................................................................................
+namespace toolkit
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::TypeClass;
+    using ::com::sun::star::uno::TypeClass_VOID;
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::lang::IndexOutOfBoundsException;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::awt::grid::XGridDataListener;
+    using ::com::sun::star::beans::Pair;
+    using ::com::sun::star::util::XCloneable;
+    using ::com::sun::star::i18n::XCollator;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::lang::XMultiServiceFactory;
+    using ::com::sun::star::awt::grid::GridDataEvent;
+    using ::com::sun::star::lang::EventObject;
+    using ::com::sun::star::ucb::AlreadyInitializedException;
+    /** === end UNO using === **/
+
+#ifdef DBG_UTIL
+    const char* SortableGridDataModel_checkInvariants( const void* _pInstance )
+    {
+        return static_cast< const SortableGridDataModel* >( _pInstance )->checkInvariants();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    const char* SortableGridDataModel::checkInvariants() const
+    {
+        if ( m_publicToPrivateRowIndex.size() != m_privateToPublicRowIndex.size() )
+            return "inconsistent index maps";
+
+        if ( m_delegator.is() )
+        {
+            if ( m_publicToPrivateRowIndex.size() != size_t( m_delegator->getRowCount() ) )
+                return "wrong cached row count";
+        }
+        else
+        {
+            if ( !m_publicToPrivateRowIndex.empty() )
+                return "disposed or not initialized, but having a non-empty map";
+        }
+
+        for ( size_t publicIndex=0; publicIndex<m_publicToPrivateRowIndex.size(); ++publicIndex )
+        {
+            ::sal_Int32 const privateIndex = m_publicToPrivateRowIndex[ publicIndex ];
+            if ( ( privateIndex < 0 ) || ( size_t( privateIndex ) >= m_privateToPublicRowIndex.size() ) )
+                return "invalid cached private index";
+
+            if ( m_privateToPublicRowIndex[ privateIndex ] != sal_Int32( publicIndex ) )
+                return "index map traversal not commutavive";
+        }
+
+        if ( impl_isSorted_nothrow() && m_publicToPrivateRowIndex.empty() )
+            return "sorted, but no row index translation tables";
+
+        if ( !impl_isSorted_nothrow() && !m_publicToPrivateRowIndex.empty() )
+            return "unsorted, but have index translation tables";
+
+        return NULL;
+    }
+#endif
+
+#define DBG_CHECK_ME() \
+    DBG_CHKTHIS( SortableGridDataModel, SortableGridDataModel_checkInvariants )
+
+    //------------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        template< class STLCONTAINER >
+        static void lcl_clear( STLCONTAINER& i_container )
+        {
+            STLCONTAINER empty;
+            empty.swap( i_container );
+        }
+    }
+
+    //==================================================================================================================
+    //= SortableGridDataModel
+    //==================================================================================================================
+    DBG_NAME( SortableGridDataModel )
+    //------------------------------------------------------------------------------------------------------------------
+    SortableGridDataModel::SortableGridDataModel( Reference< XMultiServiceFactory > const & i_factory )
+        :SortableGridDataModel_Base( m_aMutex )
+        ,SortableGridDataModel_PrivateBase()
+        ,m_context( i_factory )
+        ,m_isInitialized( false )
+        ,m_delegator()
+        ,m_collator()
+        ,m_currentSortColumn( -1 )
+        ,m_sortAscending( true )
+        ,m_publicToPrivateRowIndex()
+        ,m_privateToPublicRowIndex()
+    {
+        DBG_CTOR( SortableGridDataModel, SortableGridDataModel_checkInvariants );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    SortableGridDataModel::SortableGridDataModel( SortableGridDataModel const & i_copySource )
+        :cppu::BaseMutex()
+        ,SortableGridDataModel_Base( m_aMutex )
+        ,SortableGridDataModel_PrivateBase()
+        ,m_context( i_copySource.m_context )
+        ,m_isInitialized( true )
+        ,m_delegator()
+        ,m_collator( i_copySource.m_collator )
+        ,m_currentSortColumn( i_copySource.m_currentSortColumn )
+        ,m_sortAscending( i_copySource.m_sortAscending )
+        ,m_publicToPrivateRowIndex( i_copySource.m_publicToPrivateRowIndex )
+        ,m_privateToPublicRowIndex( i_copySource.m_privateToPublicRowIndex )
+    {
+        DBG_CTOR( SortableGridDataModel, SortableGridDataModel_checkInvariants );
+
+        ENSURE_OR_THROW( i_copySource.m_delegator.is(),
+            "not expected to be called for a disposed copy source!" );
+        m_delegator.set( i_copySource.m_delegator->createClone(), UNO_QUERY_THROW );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    SortableGridDataModel::~SortableGridDataModel()
+    {
+        if ( !rBHelper.bDisposed )
+        {
+            acquire();
+            dispose();
+        }
+
+        DBG_DTOR( SortableGridDataModel, SortableGridDataModel_checkInvariants );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType ) throw (RuntimeException)
+    {
+        Any aReturn( SortableGridDataModel_Base::queryInterface( aType ) );
+        if ( !aReturn.hasValue() )
+            aReturn = SortableGridDataModel_PrivateBase::queryInterface( aType );
+        return aReturn;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::acquire(  ) throw ()
+    {
+        SortableGridDataModel_Base::acquire();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::release(  ) throw ()
+    {
+        SortableGridDataModel_Base::release();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< Type > SAL_CALL SortableGridDataModel::getTypes(  ) throw (RuntimeException)
+    {
+        return SortableGridDataModel_Base::getTypes();
+        // don't expose the types got via SortableGridDataModel_PrivateBase - they're private, after all
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId(  ) throw (RuntimeException)
+    {
+        static ::cppu::OImplementationId aId;
+        return aId.getImplementationId();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        Reference< XCollator > lcl_loadDefaultCollator_throw( ::comphelper::ComponentContext const & i_context )
+        {
+            Reference< XCollator > const xCollator( i_context.createComponent( "com.sun.star.i18n.Collator" ), UNO_QUERY_THROW );
+            xCollator->loadDefaultCollator( Application::GetSettings().GetLocale(), 0 );
+            return xCollator;
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::initialize( const Sequence< Any >& i_arguments ) throw (Exception, RuntimeException)
+    {
+        ::comphelper::ComponentGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        if ( m_delegator.is() )
+            throw AlreadyInitializedException( ::rtl::OUString(), *this );
+
+        Reference< XMutableGridDataModel > xDelegator;
+        Reference< XCollator > xCollator;
+        switch ( i_arguments.getLength() )
+        {
+        case 1: // SortableGridDataModel.create( XMutableGridDataModel )
+            xDelegator.set( i_arguments[0], UNO_QUERY );
+            xCollator = lcl_loadDefaultCollator_throw( m_context );
+            break;
+
+        case 2: // SortableGridDataModel.createWithCollator( XMutableGridDataModel, XCollator )
+            xDelegator.set( i_arguments[0], UNO_QUERY );
+            xCollator.set( i_arguments[1], UNO_QUERY );
+            if ( !xCollator.is() )
+                throw IllegalArgumentException( ::rtl::OUString(), *this, 2 );
+            break;
+        }
+        if ( !xDelegator.is() )
+            throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+
+        m_delegator = xDelegator;
+        m_collator = xCollator;
+
+        m_delegator->addGridDataListener( this );
+
+        m_isInitialized = true;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    GridDataEvent SortableGridDataModel::impl_createPublicEvent( GridDataEvent const & i_originalEvent ) const
+    {
+        GridDataEvent aEvent( i_originalEvent );
+        aEvent.Source = *const_cast< SortableGridDataModel* >( this );
+        aEvent.FirstRow = impl_getPublicRowIndex_nothrow( aEvent.FirstRow );
+        aEvent.LastRow = impl_getPublicRowIndex_nothrow( aEvent.LastRow );
+        return aEvent;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SortableGridDataModel::impl_broadcast( void ( SAL_CALL XGridDataListener::*i_listenerMethod )( const GridDataEvent & ),
+            GridDataEvent const & i_publicEvent, MethodGuard& i_instanceLock )
+    {
+        ::cppu::OInterfaceContainerHelper* pListeners = rBHelper.getContainer( XGridDataListener::static_type() );
+        if ( pListeners == NULL )
+            return;
+
+        i_instanceLock.clear();
+        pListeners->notifyEach( i_listenerMethod, i_publicEvent );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        // if the data is not sorted, broadcast the event unchanged
+        if ( !impl_isSorted_nothrow() )
+        {
+            GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
+            impl_broadcast( &XGridDataListener::rowsInserted, aEvent, aGuard );
+            return;
+        }
+
+        bool needReIndex = false;
+        if ( i_event.FirstRow > i_event.LastRow )
+        {
+            OSL_ENSURE( false, "SortableGridDataModel::rowsInserted: invalid event - invalid row indexes!" );
+            needReIndex = true;
+        }
+        else if ( size_t( i_event.FirstRow ) > m_privateToPublicRowIndex.size() )
+        {
+            OSL_ENSURE( false, "SortableGridDataModel::rowsInserted: invalid event - too large row index!" );
+            needReIndex = true;
+        }
+
+        if ( needReIndex )
+        {
+            impl_rebuildIndexesAndNotify( aGuard );
+            return;
+        }
+
+        // we do not insert the new rows into the sort order - if somebody adds rows while we're sorted, s/he has
+        // to resort. Instead, we simply append the rows, no matter where they were inserted in the delegator data
+        // model.
+        sal_Int32 const nPublicFirstRow = sal_Int32( m_privateToPublicRowIndex.size() );
+        sal_Int32 nPublicLastRow = nPublicFirstRow;
+        for ( sal_Int32 newRow = i_event.FirstRow; newRow <= i_event.LastRow; ++newRow, ++nPublicLastRow )
+        {
+            m_privateToPublicRowIndex.push_back( nPublicLastRow );
+            m_publicToPrivateRowIndex.push_back( nPublicLastRow );
+        }
+
+        // broadcast the event
+        GridDataEvent const aEvent( *this, -1, -1, nPublicFirstRow, nPublicLastRow );
+        impl_broadcast( &XGridDataListener::rowsInserted, aEvent, aGuard );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        void lcl_decrementValuesGreaterThan( ::std::vector< ::sal_Int32 > & io_indexMap, sal_Int32 const i_threshold )
+        {
+            for (   ::std::vector< ::sal_Int32 >::iterator loop = io_indexMap.begin();
+                    loop != io_indexMap.end();
+                    ++loop
+                )
+            {
+                if ( *loop >= i_threshold )
+                    --*loop;
+            }
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SortableGridDataModel::impl_rebuildIndexesAndNotify( MethodGuard& i_instanceLock )
+    {
+        OSL_PRECOND( impl_isSorted_nothrow(), "SortableGridDataModel::impl_rebuildIndexesAndNotify: illegal call!" );
+
+        // clear the indexes
+        lcl_clear( m_publicToPrivateRowIndex );
+        lcl_clear( m_privateToPublicRowIndex );
+
+        // broadcast an artificial event, saying that all rows have been removed
+        GridDataEvent const aRemovalEvent( *this, -1, -1, -1, -1 );
+        impl_broadcast( &XGridDataListener::rowsRemoved, aRemovalEvent, i_instanceLock );
+        i_instanceLock.reset();
+
+        // rebuild the index
+        impl_reIndex_nothrow( m_currentSortColumn, m_sortAscending );
+
+        // broadcast an artificial event, saying that n rows have been added
+        GridDataEvent const aAdditionEvent( *this, -1, -1, 0, m_delegator->getRowCount() - 1 );
+        impl_broadcast( &XGridDataListener::rowsInserted, aAdditionEvent, i_instanceLock );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        // if the data is not sorted, broadcast the event unchanged
+        if ( !impl_isSorted_nothrow() )
+        {
+            GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
+            impl_broadcast( &XGridDataListener::rowsRemoved, aEvent, aGuard );
+            return;
+        }
+
+        // if all rows have been removed, also simply multiplex to own listeners
+        if ( i_event.FirstRow < 0 )
+        {
+            lcl_clear( m_publicToPrivateRowIndex );
+            lcl_clear( m_privateToPublicRowIndex );
+            GridDataEvent aEvent( i_event );
+            aEvent.Source = *this;
+            impl_broadcast( &XGridDataListener::rowsRemoved, aEvent, aGuard );
+            return;
+        }
+
+        bool needReIndex = false;
+        if ( i_event.FirstRow != i_event.LastRow )
+        {
+            OSL_ENSURE( false, "SortableGridDataModel::rowsRemoved: missing implementation - removal of multiple rows!" );
+            needReIndex = true;
+        }
+        else if ( size_t( i_event.FirstRow ) >= m_privateToPublicRowIndex.size() )
+        {
+            OSL_ENSURE( false, "SortableGridDataModel::rowsRemoved: inconsistent/wrong data!" );
+            needReIndex = true;
+        }
+
+        if ( needReIndex )
+        {
+            impl_rebuildIndexesAndNotify( aGuard );
+            return;
+        }
+
+        // build public event version
+        GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
+
+        // remove the entries from the index maps
+        sal_Int32 const privateIndex = i_event.FirstRow;
+        sal_Int32 const publicIndex = aEvent.FirstRow;
+
+        m_publicToPrivateRowIndex.erase( m_publicToPrivateRowIndex.begin() + publicIndex );
+        m_privateToPublicRowIndex.erase( m_privateToPublicRowIndex.begin() + privateIndex );
+
+        // adjust remaining entries in the index maps
+        lcl_decrementValuesGreaterThan( m_publicToPrivateRowIndex, privateIndex );
+        lcl_decrementValuesGreaterThan( m_privateToPublicRowIndex, publicIndex );
+
+        // broadcast the event
+        impl_broadcast( &XGridDataListener::rowsRemoved, aEvent, aGuard );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
+        impl_broadcast( &XGridDataListener::dataChanged, aEvent, aGuard );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
+        impl_broadcast( &XGridDataListener::rowHeadingChanged, aEvent, aGuard );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::disposing( const EventObject& i_event ) throw (RuntimeException)
+    {
+        // not interested in
+        OSL_UNUSED( i_event );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        class CellDataLessComparison : public ::std::binary_function< sal_Int32, sal_Int32, bool >
+        {
+        public:
+            CellDataLessComparison(
+                ::std::vector< Any > const & i_data,
+                ::comphelper::IKeyPredicateLess& i_predicate,
+                sal_Bool const i_sortAscending
+            )
+                :m_data( i_data )
+                ,m_predicate( i_predicate )
+                ,m_sortAscending( i_sortAscending )
+            {
+            }
+
+            bool operator()( sal_Int32 const i_lhs, sal_Int32 const i_rhs ) const
+            {
+                Any const & lhs = m_data[ i_lhs ];
+                Any const & rhs = m_data[ i_rhs ];
+                // <VOID/> is less than everything else
+                if ( !lhs.hasValue() )
+                    return m_sortAscending;
+                if ( !rhs.hasValue() )
+                    return !m_sortAscending;
+
+                // actually compare
+                if ( m_sortAscending )
+                    return m_predicate.isLess( lhs, rhs );
+                else
+                    return m_predicate.isLess( rhs, lhs );
+            }
+
+        private:
+            ::std::vector< Any > const &            m_data;
+            ::comphelper::IKeyPredicateLess const & m_predicate;
+            sal_Bool const                          m_sortAscending;
+        };
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SortableGridDataModel::impl_reIndex_nothrow( ::sal_Int32 const i_columnIndex, sal_Bool const i_sortAscending )
+    {
+        ::sal_Int32 const rowCount( getRowCount() );
+        ::std::vector< ::sal_Int32 > aPublicToPrivate( rowCount );
+
+        try
+        {
+            // build an unsorted translation table, and retrieve the unsorted data
+            ::std::vector< Any > aColumnData( rowCount );
+            Type dataType;
+            for ( ::sal_Int32 rowIndex = 0; rowIndex < rowCount; ++rowIndex )
+            {
+                aColumnData[ rowIndex ] = m_delegator->getCellData( i_columnIndex, rowIndex );
+                aPublicToPrivate[ rowIndex ] = rowIndex;
+
+                // determine the data types we assume for the complete column
+                if ( ( dataType.getTypeClass() == TypeClass_VOID ) && aColumnData[ rowIndex ].hasValue() )
+                    dataType = aColumnData[ rowIndex ].getValueType();
+            }
+
+            // get predicate object
+            ::std::auto_ptr< ::comphelper::IKeyPredicateLess > const pPredicate( ::comphelper::getStandardLessPredicate( dataType, m_collator ) );
+            ENSURE_OR_RETURN_VOID( pPredicate.get(), "SortableGridDataModel::impl_reIndex_nothrow: no sortable data found!" );
+
+            // then sort
+            CellDataLessComparison const aComparator( aColumnData, *pPredicate, i_sortAscending );
+            ::std::sort( aPublicToPrivate.begin(), aPublicToPrivate.end(), aComparator );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+            return;
+        }
+
+        // also build the "private to public" mapping
+        ::std::vector< sal_Int32 > aPrivateToPublic( aPublicToPrivate.size() );
+        for ( size_t i=0; i<aPublicToPrivate.size(); ++i )
+            aPrivateToPublic[ aPublicToPrivate[i] ] = i;
+
+        m_publicToPrivateRowIndex.swap( aPublicToPrivate );
+        m_privateToPublicRowIndex.swap( aPrivateToPublic );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::sortByColumn( ::sal_Int32 i_columnIndex, ::sal_Bool i_sortAscending ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= getColumnCount() ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+
+        impl_reIndex_nothrow( i_columnIndex, i_sortAscending );
+
+        m_currentSortColumn = i_columnIndex;
+        m_sortAscending = i_sortAscending;
+
+        impl_broadcast(
+            &XGridDataListener::dataChanged,
+            GridDataEvent( *this, -1, -1, -1, -1 ),
+            aGuard
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::removeColumnSort(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        lcl_clear( m_publicToPrivateRowIndex );
+        lcl_clear( m_privateToPublicRowIndex );
+
+        m_currentSortColumn = -1;
+        m_sortAscending = sal_True;
+
+        impl_broadcast(
+            &XGridDataListener::dataChanged,
+            GridDataEvent( *this, -1, -1, -1, -1 ),
+            aGuard
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Pair< ::sal_Int32, ::sal_Bool > SAL_CALL SortableGridDataModel::getCurrentSortOrder(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        return Pair< ::sal_Int32, ::sal_Bool >( m_currentSortColumn, m_sortAscending );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        delegator->addRow( i_heading, i_data );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        delegator->addRows( i_headings, i_data );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        ::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        delegator->removeRow( rowIndex );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::removeAllRows(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        delegator->removeAllRows();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        ::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        delegator->updateCellData( i_columnIndex, rowIndex, i_value );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        ::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        delegator->updateRowData( i_columnIndexes, rowIndex, i_values );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        ::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        delegator->updateRowHeading( rowIndex, i_heading );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        ::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        delegator->updateCellToolTip( i_columnIndex, rowIndex, i_value );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        ::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        delegator->updateRowToolTip( rowIndex, i_value );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::addGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException)
+    {
+        rBHelper.addListener( XGridDataListener::static_type(), i_listener );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException)
+    {
+        rBHelper.removeListener( XGridDataListener::static_type(), i_listener );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL SortableGridDataModel::getRowCount() throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        return delegator->getRowCount();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL SortableGridDataModel::getColumnCount() throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        return delegator->getColumnCount();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Any SAL_CALL SortableGridDataModel::getCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        ::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        return delegator->getCellData( i_columnIndex, rowIndex );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Any SAL_CALL SortableGridDataModel::getCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        ::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        return delegator->getCellToolTip( i_columnIndex, rowIndex );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Any SAL_CALL SortableGridDataModel::getRowHeading( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        ::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
+
+        Reference< XMutableGridDataModel > const delegator( m_delegator );
+        aGuard.clear();
+        return delegator->getRowHeading( rowIndex );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL SortableGridDataModel::disposing()
+    {
+        m_currentSortColumn = -1;
+
+        Reference< XComponent > const delegatorComponent( m_delegator.get() );
+        m_delegator->removeGridDataListener( this );
+        m_delegator.clear();
+        delegatorComponent->dispose();
+
+        Reference< XComponent > const collatorComponent( m_collator, UNO_QUERY );
+        m_collator.clear();
+        if ( collatorComponent.is() )
+            collatorComponent->dispose();
+
+        lcl_clear( m_publicToPrivateRowIndex );
+        lcl_clear( m_privateToPublicRowIndex );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XCloneable > SAL_CALL SortableGridDataModel::createClone(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *this, rBHelper );
+        DBG_CHECK_ME();
+
+        return new SortableGridDataModel( *this );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL SortableGridDataModel::getImplementationName(  ) throw (RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.toolkit.SortableGridDataModel" ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL SortableGridDataModel::supportsService( const ::rtl::OUString& i_serviceName ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > const aServiceNames( getSupportedServiceNames() );
+        for ( sal_Int32 i=0; i<aServiceNames.getLength(); ++i )
+            if ( aServiceNames[i] == i_serviceName )
+                return sal_True;
+        return sal_False;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL SortableGridDataModel::getSupportedServiceNames(  ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aServiceNames(1);
+        aServiceNames[0] = ::rtl::OUString::createFromAscii( szServiceName_SortableGridDataModel );
+        return aServiceNames;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SortableGridDataModel::impl_getPrivateRowIndex_throw( ::sal_Int32 const i_publicRowIndex ) const
+    {
+        if ( ( i_publicRowIndex < 0 ) || ( i_publicRowIndex >= m_delegator->getRowCount() ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *const_cast< SortableGridDataModel* >( this ) );
+
+        if ( !impl_isSorted_nothrow() )
+            // no need to translate anything
+            return i_publicRowIndex;
+
+        ENSURE_OR_RETURN( size_t( i_publicRowIndex ) < m_publicToPrivateRowIndex.size(),
+            "SortableGridDataModel::impl_getPrivateRowIndex_throw: inconsistency!", i_publicRowIndex );
+                // obviously the translation table contains too few elements - it should have exactly |getRowCount()|
+                // elements
+
+        return m_publicToPrivateRowIndex[ i_publicRowIndex ];
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SortableGridDataModel::impl_getPublicRowIndex_nothrow( ::sal_Int32 const i_privateRowIndex ) const
+    {
+        if ( !impl_isSorted_nothrow() )
+            // no need to translate anything
+            return i_privateRowIndex;
+
+        if ( i_privateRowIndex < 0 )
+            return i_privateRowIndex;
+
+        ENSURE_OR_RETURN( size_t( i_privateRowIndex ) < m_privateToPublicRowIndex.size(),
+            "SortableGridDataModel::impl_getPublicRowIndex_nothrow: invalid index!", i_privateRowIndex );
+
+        return m_privateToPublicRowIndex[ i_privateRowIndex ];
+    }
+
+//......................................................................................................................
+} // namespace toolkit
+//......................................................................................................................
+
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SortableGridDataModel_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+{
+    return *( new ::toolkit::SortableGridDataModel( i_factory ) );
+}
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.hxx b/toolkit/source/controls/grid/sortablegriddatamodel.hxx
new file mode 100755
index 000000000000..50f08d3a7113
--- /dev/null
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.hxx
@@ -0,0 +1,198 @@
+/*************************************************************************
+ * 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 TOOLKIT_SORTABLEGRIDDATAMODEL_HXX
+#define TOOLKIT_SORTABLEGRIDDATAMODEL_HXX
+
+#include "initguard.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/awt/grid/XSortableMutableGridDataModel.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/i18n/XCollator.hpp>
+#include <com/sun/star/awt/grid/XGridDataListener.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/componentcontext.hxx>
+#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/implbase1.hxx>
+
+//......................................................................................................................
+namespace toolkit
+{
+//......................................................................................................................
+
+    class SortableGridDataModel;
+    typedef InitGuard< SortableGridDataModel >  MethodGuard;
+
+    //==================================================================================================================
+    //= SortableGridDataModel
+    //==================================================================================================================
+    typedef ::cppu::WeakComponentImplHelper3    <   ::com::sun::star::awt::grid::XSortableMutableGridDataModel
+                                                ,   ::com::sun::star::lang::XServiceInfo
+                                                ,   ::com::sun::star::lang::XInitialization
+                                                >   SortableGridDataModel_Base;
+    typedef ::cppu::ImplHelper1 <   ::com::sun::star::awt::grid::XGridDataListener
+                                >   SortableGridDataModel_PrivateBase;
+    class SortableGridDataModel :public ::cppu::BaseMutex
+                                ,public SortableGridDataModel_Base
+                                ,public SortableGridDataModel_PrivateBase
+    {
+    public:
+        SortableGridDataModel( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & i_factory );
+        SortableGridDataModel( SortableGridDataModel const & i_copySource );
+
+        bool    isInitialized() const { return m_isInitialized; }
+
+#ifdef DBG_UTIL
+        const char* checkInvariants() const;
+#endif
+
+    protected:
+        ~SortableGridDataModel();
+
+    public:
+        // XSortableGridData
+        virtual void SAL_CALL sortByColumn( ::sal_Int32 ColumnIndex, ::sal_Bool SortAscending ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeColumnSort(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::beans::Pair< ::sal_Int32, ::sal_Bool > SAL_CALL getCurrentSortOrder(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XMutableGridDataModel
+        virtual void SAL_CALL addRow( const ::com::sun::star::uno::Any& Heading, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Data ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Headings, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& Data ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeAllRows(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL updateRowData( const ::com::sun::star::uno::Sequence< ::sal_Int32 >& ColumnIndexes, ::sal_Int32 RowIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const ::com::sun::star::uno::Any& Heading ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addGridDataListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeGridDataListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XGridDataModel
+        virtual ::sal_Int32 SAL_CALL getRowCount() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int32 SAL_CALL getColumnCount() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 Row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 Row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        // OComponentHelper
+        virtual void SAL_CALL disposing();
+
+        // XCloneable
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XInitialization
+        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+        // XGridDataListener
+        virtual void SAL_CALL rowsInserted( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL rowsRemoved( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL dataChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL rowHeadingChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XEventListener
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XInterface
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL acquire(  ) throw ();
+        virtual void SAL_CALL release(  ) throw ();
+
+        // XTypeProvider
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    private:
+        /** translates the given public index into one to be passed to our delegator
+            @throws ::com::sun::star::lang::IndexOutOfBoundsException
+                if the given index does not denote a valid row
+        */
+        ::sal_Int32 impl_getPrivateRowIndex_throw( ::sal_Int32 const i_publicRowIndex ) const;
+
+        /** translates the given private row index to a public one
+        */
+        ::sal_Int32 impl_getPublicRowIndex_nothrow( ::sal_Int32 const i_privateRowIndex ) const;
+
+        inline bool impl_isSorted_nothrow() const
+        {
+            return m_currentSortColumn >= 0;
+        }
+
+        /** rebuilds the index translation structure.
+
+            Neither <member>m_currentSortColumn</member> nor <member>m_sortAscending</member> are touched by this method.
+            Also, the given column index is not checked, this is the responsibility of the caller.
+        */
+        void    impl_reIndex_nothrow( ::sal_Int32 const i_columnIndex, sal_Bool const i_sortAscending );
+
+        /** translates the given event, obtained from our delegator, to a version which can be broadcasted to our own
+            clients.
+        */
+        ::com::sun::star::awt::grid::GridDataEvent
+                impl_createPublicEvent( ::com::sun::star::awt::grid::GridDataEvent const & i_originalEvent ) const;
+
+        /** broadcasts the given event to our registered XGridDataListeners
+        */
+        void    impl_broadcast(
+                    void ( SAL_CALL ::com::sun::star::awt::grid::XGridDataListener::*i_listenerMethod )( const ::com::sun::star::awt::grid::GridDataEvent & ),
+                    ::com::sun::star::awt::grid::GridDataEvent const & i_publicEvent,
+                    MethodGuard& i_instanceLock
+                );
+
+        /** rebuilds our indexes, notifying row removal and row addition events
+
+            First, a rowsRemoved event is notified to our registered listeners. Then, the index translation tables are
+            rebuilt, and a rowsInserted event is notified.
+
+            Only to be called when we're sorted.
+        */
+        void    impl_rebuildIndexesAndNotify( MethodGuard& i_instanceLock );
+
+    private:
+        ::comphelper::ComponentContext                                                          m_context;
+        bool                                                                                    m_isInitialized;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XMutableGridDataModel >  m_delegator;
+        ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator >                   m_collator;
+        ::sal_Int32                                                                             m_currentSortColumn;
+        ::sal_Bool                                                                              m_sortAscending;
+        ::std::vector< ::sal_Int32 >                                                            m_publicToPrivateRowIndex;
+        ::std::vector< ::sal_Int32 >                                                            m_privateToPublicRowIndex;
+    };
+
+//......................................................................................................................
+} // namespace toolkit
+//......................................................................................................................
+
+#endif // TOOLKIT_SORTABLEGRIDDATAMODEL_HXX
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 96f51b39dc72..875f05e2f80d 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -66,7 +66,9 @@ static void lcl_throwIndexOutOfBoundsException( )
     // = UnoControlRoadmapModel
     // ===================================================================
     // -------------------------------------------------------------------
-    UnoControlRoadmapModel::UnoControlRoadmapModel() : maContainerListeners( *this )
+    UnoControlRoadmapModel::UnoControlRoadmapModel( const Reference< XMultiServiceFactory >& i_factory )
+        :UnoControlRoadmapModel_Base( i_factory )
+        ,maContainerListeners( *this )
     {
         ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
         ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -368,7 +370,9 @@ static void lcl_throwIndexOutOfBoundsException( )
     // = UnoRoadmapControl
     // ===================================================================
     // -------------------------------------------------------------------
-    UnoRoadmapControl::UnoRoadmapControl(): maItemListeners( *this )
+    UnoRoadmapControl::UnoRoadmapControl( const Reference< XMultiServiceFactory >& i_factory )
+        :UnoControlRoadmap_Base( i_factory )
+        ,maItemListeners( *this )
     {
     }
 
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index d4b89d5123ec..cb02274e3997 100755
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -55,13 +55,15 @@ namespace toolkit
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::uno::Type;
     using ::com::sun::star::beans::XPropertySetInfo;
+    using ::com::sun::star::lang::XMultiServiceFactory;
     /** === end UNO using === **/
 
     //==================================================================================================================
     //= SpinningProgressControlModel
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    SpinningProgressControlModel::SpinningProgressControlModel()
+    SpinningProgressControlModel::SpinningProgressControlModel( Reference< XMultiServiceFactory > const & i_factory )
+        :SpinningProgressControlModel_Base( i_factory )
     {
         // default image sets
         osl_incrementInterlockedCount( &m_refCount );
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index b7e381ae27c7..808feca02e8a 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -54,7 +54,9 @@ using namespace ::com::sun::star::view;
 //  ----------------------------------------------------
 //  class UnoControlTabPageContainerModel
 //  ----------------------------------------------------
-UnoControlTabPageContainerModel::UnoControlTabPageContainerModel() : maContainerListeners( *this )
+UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlTabPageContainerModel_Base( i_factory )
+    ,maContainerListeners( *this )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -176,8 +178,9 @@ void UnoControlTabPageContainerModel::removeContainerListener( const Reference<
 //  ----------------------------------------------------
 //  class UnoControlTabPageContainer
 //  ----------------------------------------------------
-UnoControlTabPageContainer::UnoControlTabPageContainer():
-    m_aTabPageListeners( *this )
+UnoControlTabPageContainer::UnoControlTabPageContainer( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlTabPageContainer_Base( i_factory )
+    ,m_aTabPageListeners( *this )
 {
 }
 
@@ -290,12 +293,3 @@ void SAL_CALL UnoControlTabPageContainer::addControl( const ::rtl::OUString& Nam
     xContainerListener->elementInserted( aEvent );
 }
 
-Reference< XInterface > SAL_CALL UnoControlTabPageContainer_CreateInstance( const Reference< XMultiServiceFactory >& )
-{
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new UnoControlTabPageContainer );
-}
-
-Reference< XInterface > SAL_CALL UnoControlTabPageContainerModel_CreateInstance( const Reference< XMultiServiceFactory >& )
-{
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new OGeometryControlModel<UnoControlTabPageContainerModel>() );
-}
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 4afd46724cab..f498fefd761b 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -143,7 +143,8 @@ using namespace ::com::sun::star::util;
 //  ----------------------------------------------------
 //  class UnoControlTabPageModel
 //  ----------------------------------------------------
-UnoControlTabPageModel::UnoControlTabPageModel(Reference< XComponentContext >const & i_xCompContext) : m_xCompContext(i_xCompContext)
+UnoControlTabPageModel::UnoControlTabPageModel( Reference< XMultiServiceFactory > const & i_factory )
+    :ControlModelContainerBase( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_TITLE );
@@ -209,7 +210,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument
         ::rtl::OUString sURL;
         if ( !( rArguments[ 1 ] >>= sURL ))
             throw lang::IllegalArgumentException();
-        Reference<container::XNameContainer > xDialogModel = awt::UnoControlDialogModelProvider::create(m_xCompContext,sURL);
+        Reference<container::XNameContainer > xDialogModel = awt::UnoControlDialogModelProvider::create( maContext.getUNOContext(),sURL);
         if ( xDialogModel.is() )
         {
             Sequence< ::rtl::OUString> aNames = xDialogModel->getElementNames();
@@ -246,16 +247,6 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument
         m_nTabPageId = -1;
 }
 //===== Service ===============================================================
-Reference< XInterface > SAL_CALL UnoControlTabPageModel_CreateInstance( const Reference< XMultiServiceFactory >&  xServiceFactory)
-{
-    Reference < ::com::sun::star::beans::XPropertySet > xPropertySet (xServiceFactory, UNO_QUERY);
-    Any any = xPropertySet->getPropertyValue(::rtl::OUString::createFromAscii("DefaultContext"));
-    Reference < XComponentContext > xCompCtx;
-    any >>= xCompCtx;
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new OGeometryControlModel<UnoControlTabPageModel>(xCompCtx) );
-    //return Reference < XInterface > ( (::cppu::OWeakObject* ) new UnoControlTabPageModel(xCompCtx));
-}
-
 ::rtl::OUString UnoControlTabPageModel_getImplementationName (void) throw(RuntimeException)
 {
     return rtl::OUString::createFromAscii("com.sun.star.awt.tab.UnoControlTabPageModel");
@@ -272,8 +263,9 @@ Sequence<rtl::OUString> SAL_CALL UnoControlTabPageModel_getSupportedServiceNames
 // = class UnoControlTabPage
 // ============================================================================
 
-UnoControlTabPage::UnoControlTabPage() :
-    m_bWindowListener(false)
+UnoControlTabPage::UnoControlTabPage( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlTabPage_Base( i_factory )
+    ,m_bWindowListener(false)
 {
     maComponentInfos.nWidth = 280;
     maComponentInfos.nHeight = 400;
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 2de8b56131c8..f75183186610 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -47,7 +47,8 @@ namespace toolkit
     //= UnoControlScrollBarModel
     //====================================================================
     //--------------------------------------------------------------------
-    UnoControlScrollBarModel::UnoControlScrollBarModel()
+    UnoControlScrollBarModel::UnoControlScrollBarModel( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+        :UnoControlModel( i_factory )
     {
         UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXScrollBar );
     }
@@ -96,8 +97,9 @@ namespace toolkit
     //====================================================================
     //= UnoControlScrollBarModel
     //====================================================================
-    UnoScrollBarControl::UnoScrollBarControl()
-        : maAdjustmentListeners( *this )
+    UnoScrollBarControl::UnoScrollBarControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+        :UnoControlBase( i_factory )
+        ,maAdjustmentListeners( *this )
     {
     }
 
diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
index 6ad33608f6ee..90f56d5ad4bd 100644
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ b/toolkit/source/controls/tksimpleanimation.cxx
@@ -44,7 +44,8 @@ namespace toolkit
     //= UnoSimpleAnimationControlModel
     //====================================================================
     //--------------------------------------------------------------------
-    UnoSimpleAnimationControlModel::UnoSimpleAnimationControlModel()
+    UnoSimpleAnimationControlModel::UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+        :UnoControlModel( i_factory )
     {
         ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
         ImplRegisterProperty( BASEPROPERTY_REPEAT );
@@ -119,7 +120,8 @@ namespace toolkit
     //= UnoSimpleAnimationControl
     //====================================================================
     //--------------------------------------------------------------------
-    UnoSimpleAnimationControl::UnoSimpleAnimationControl()
+    UnoSimpleAnimationControl::UnoSimpleAnimationControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+        :UnoSimpleAnimationControl_Base( i_factory )
     {
     }
 
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 5929dc7a4635..9396aea43290 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -50,7 +50,8 @@ namespace toolkit
     //= UnoSpinButtonModel
     //====================================================================
     //--------------------------------------------------------------------
-    UnoSpinButtonModel::UnoSpinButtonModel()
+    UnoSpinButtonModel::UnoSpinButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+        :UnoControlModel( i_factory )
     {
         ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
         ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -137,8 +138,9 @@ namespace toolkit
     //= UnoSpinButtonControl
     //====================================================================
     //--------------------------------------------------------------------
-    UnoSpinButtonControl::UnoSpinButtonControl()
-        :maAdjustmentListeners( *this )
+    UnoSpinButtonControl::UnoSpinButtonControl( const Reference< XMultiServiceFactory >& i_factory )
+        :UnoControlBase( i_factory )
+        ,maAdjustmentListeners( *this )
     {
     }
 
diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx
index 1dc83f860e34..8a1927a732cb 100644
--- a/toolkit/source/controls/tkthrobber.cxx
+++ b/toolkit/source/controls/tkthrobber.cxx
@@ -44,7 +44,8 @@ namespace toolkit
     //= UnoThrobberControlModel
     //====================================================================
     //--------------------------------------------------------------------
-    UnoThrobberControlModel::UnoThrobberControlModel()
+    UnoThrobberControlModel::UnoThrobberControlModel( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+        :UnoControlModel( i_factory )
     {
         ImplRegisterProperty( BASEPROPERTY_BORDER );
         ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
@@ -117,7 +118,8 @@ namespace toolkit
     //= UnoThrobberControl
     //====================================================================
     //--------------------------------------------------------------------
-    UnoThrobberControl::UnoThrobberControl()
+    UnoThrobberControl::UnoThrobberControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+        :UnoControlBase( i_factory )
     {
     }
 
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index d56ca82bb845..d2c66c64b41a 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -55,7 +55,8 @@ namespace toolkit
 //  ----------------------------------------------------
 //  class UnoTreeModel
 //  ----------------------------------------------------
-UnoTreeModel::UnoTreeModel()
+UnoTreeModel::UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -74,7 +75,7 @@ UnoTreeModel::UnoTreeModel()
     ImplRegisterProperty( BASEPROPERTY_TREE_ROOTDISPLAYED );
     ImplRegisterProperty( BASEPROPERTY_TREE_SHOWSHANDLES );
     ImplRegisterProperty( BASEPROPERTY_TREE_SHOWSROOTHANDLES );
-    ImplRegisterProperty( BASEPROPERTY_TREE_ROWHEIGHT );
+    ImplRegisterProperty( BASEPROPERTY_ROW_HEIGHT );
     ImplRegisterProperty( BASEPROPERTY_TREE_INVOKESSTOPNODEEDITING );
     ImplRegisterProperty( BASEPROPERTY_HIDEINACTIVESELECTION );
 }
@@ -100,7 +101,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     {
     case BASEPROPERTY_TREE_SELECTIONTYPE:
         return Any( SelectionType_NONE );
-    case BASEPROPERTY_TREE_ROWHEIGHT:
+    case BASEPROPERTY_ROW_HEIGHT:
         return Any( sal_Int32( 0 ) );
     case BASEPROPERTY_TREE_DATAMODEL:
         return Any( Reference< XTreeDataModel >( 0 ) );
@@ -140,8 +141,9 @@ Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo(  ) throw(Runtime
 //  ----------------------------------------------------
 //  class UnoTreeControl
 //  ----------------------------------------------------
-UnoTreeControl::UnoTreeControl()
-: maSelectionListeners( *this )
+UnoTreeControl::UnoTreeControl( const Reference< XMultiServiceFactory >& i_factory )
+: UnoTreeControl_Base( i_factory )
+, maSelectionListeners( *this )
 , maTreeExpansionListeners( *this )
 , maTreeEditListeners( *this )
 {
@@ -452,14 +454,14 @@ void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk
 
 }
 
-Reference< XInterface > SAL_CALL TreeControl_CreateInstance( const Reference< XMultiServiceFactory >& )
+Reference< XInterface > SAL_CALL TreeControl_CreateInstance( const Reference< XMultiServiceFactory >& i_factory )
 {
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoTreeControl );
+    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoTreeControl( i_factory ) );
 }
 
-Reference< XInterface > SAL_CALL TreeControlModel_CreateInstance( const Reference< XMultiServiceFactory >& )
+Reference< XInterface > SAL_CALL TreeControlModel_CreateInstance( const Reference< XMultiServiceFactory >& i_factory )
 {
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoTreeModel );
+    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoTreeModel( i_factory ) );
 }
 
 void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNode >& Node ) throw (RuntimeException, ::com::sun::star::util::VetoException)
diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx
index e646664c4a64..ff5ddb4e348c 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.hxx
@@ -54,7 +54,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-    UnoTreeModel();
+    UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     UnoTreeModel( const UnoTreeModel& rModel );
 
     UnoControlModel* Clone() const;
@@ -73,10 +73,11 @@ public:
 // ===================================================================
 // = UnoTreeControl
 // ===================================================================
-class UnoTreeControl : public ::cppu::ImplInheritanceHelper1< UnoControlBase, ::com::sun::star::awt::tree::XTreeControl >
+typedef ::cppu::ImplInheritanceHelper1< UnoControlBase, ::com::sun::star::awt::tree::XTreeControl > UnoTreeControl_Base;
+class UnoTreeControl : public UnoTreeControl_Base
 {
 public:
-    UnoTreeControl();
+    UnoTreeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
     ::rtl::OUString             GetComponentServiceName();
 
     // ::com::sun::star::lang::XComponent
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 075080906900..7fbac44035c6 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -52,6 +52,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <comphelper/stl_types.hxx>
+#include <comphelper/processfactory.hxx>
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/servicenames.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -164,7 +165,26 @@ struct UnoControl_Data
 //  ----------------------------------------------------
 DBG_NAME( UnoControl )
 UnoControl::UnoControl()
-    : maDisposeListeners( *this )
+    :maContext( ::comphelper::getProcessServiceFactory() )
+    ,maDisposeListeners( *this )
+    ,maWindowListeners( *this )
+    ,maFocusListeners( *this )
+    ,maKeyListeners( *this )
+    ,maMouseListeners( *this )
+    ,maMouseMotionListeners( *this )
+    ,maPaintListeners( *this )
+    ,maModeChangeListeners( GetMutex() )
+    ,mpData( new UnoControl_Data )
+{
+    DBG_CTOR( UnoControl, NULL );
+    OSL_ENSURE( false, "UnoControl::UnoControl: not implemented. Well, not really." );
+    // just implemented to let the various FooImplInheritanceHelper compile, you should use the
+    // version taking a service factory
+}
+
+UnoControl::UnoControl( const Reference< XMultiServiceFactory >& i_factory )
+    : maContext( i_factory )
+    , maDisposeListeners( *this )
     , maWindowListeners( *this )
     , maFocusListeners( *this )
     , maKeyListeners( *this )
diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx
index bbd0fc507e80..4dc1412ba661 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.cxx
@@ -32,6 +32,7 @@
 
 #include <toolkit/controls/unocontrolbase.hxx>
 #include <toolkit/helper/property.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <tools/debug.hxx>
 
@@ -39,6 +40,14 @@
 //  class UnoControlBase
 //  ----------------------------------------------------
 
+UnoControlBase::UnoControlBase()
+    :UnoControl( ::comphelper::getProcessServiceFactory() )
+{
+    OSL_ENSURE( false, "UnoControlBase::UnoControlBase: not implemented. Well, not really." );
+    // just implemented to let the various FooImplInheritanceHelper compile, you should use the
+    // version taking a service factory
+}
+
 sal_Bool UnoControlBase::ImplHasProperty( sal_uInt16 nPropId )
 {
     ::rtl::OUString aPropName( GetPropertyName( nPropId ) );
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 3afe3a90f1ee..bdbdc9aae7f1 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -412,13 +412,16 @@ void SAL_CALL DialogStepChangedListener::propertyChange( const  beans::PropertyC
 //  ----------------------------------------------------
 //  class UnoControlContainer
 //  ----------------------------------------------------
-UnoControlContainer::UnoControlContainer() : maCListeners( *this )
+UnoControlContainer::UnoControlContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+    :UnoControlContainer_Base( i_factory )
+    ,maCListeners( *this )
 {
     mpControls = new UnoControlHolderList;
 }
 
-UnoControlContainer::UnoControlContainer( uno::Reference< awt::XWindowPeer >  xP )
-    :   maCListeners( *this )
+UnoControlContainer::UnoControlContainer( const uno::Reference< lang::XMultiServiceFactory >& i_factory, const uno::Reference< awt::XWindowPeer >& xP )
+    :UnoControlContainer_Base( i_factory )
+    ,maCListeners( *this )
 {
     setPeer( xP );
     mbDisposePeer = sal_False;
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 7630971d8a57..66948ce095d1 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -36,7 +36,8 @@
 //  ----------------------------------------------------
 //  class UnoControlContainerModel
 //  ----------------------------------------------------
-UnoControlContainerModel::UnoControlContainerModel()
+UnoControlContainerModel::UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_BORDER );
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 18bf0d9f02f7..7a2742abae57 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -154,7 +154,24 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId,
 //  class UnoControlModel
 //  ----------------------------------------------------
 UnoControlModel::UnoControlModel()
-    : OPropertySetHelper( BrdcstHelper ), maDisposeListeners( *this )
+    :UnoControlModel_Base()
+    ,MutexAndBroadcastHelper()
+    ,OPropertySetHelper( BrdcstHelper )
+    ,maDisposeListeners( *this )
+    ,maContext( ::comphelper::getProcessServiceFactory() )
+{
+    OSL_ENSURE( false, "UnoControlModel::UnoControlModel: not implemented. Well, not really." );
+    // just implemented to let the various FooImplInheritanceHelper compile, you should use the
+    // version taking a service factory
+    mpData = new ImplPropertyTable;
+}
+
+UnoControlModel::UnoControlModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel_Base()
+    ,MutexAndBroadcastHelper()
+    ,OPropertySetHelper( BrdcstHelper )
+    ,maDisposeListeners( *this )
+    ,maContext( i_factory )
 {
     // Die Properties muessen vom Model in die Tabelle gestopft werden,
     // nur vorhandene Properties sind gueltige Properties, auch wenn VOID.
@@ -162,18 +179,11 @@ UnoControlModel::UnoControlModel()
 }
 
 UnoControlModel::UnoControlModel( const UnoControlModel& rModel )
-    : XControlModel()
-    , XPropertyState()
-    , XPersistObject()
-    , XComponent()
-    , XServiceInfo()
-    , XTypeProvider()
-    , XUnoTunnel()
-    , XCloneable()
+    : UnoControlModel_Base()
     , MutexAndBroadcastHelper()
     , OPropertySetHelper( BrdcstHelper )
-    , OWeakAggObject()
     , maDisposeListeners( *this )
+    , maContext( rModel.maContext )
 {
     mpData = new ImplPropertyTable;
 
@@ -403,7 +413,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
                     aLocale.Country = sDefaultCurrency.copy( nSepPos + 1 );
                 }
 
-                LocaleDataWrapper aLocaleInfo( ::comphelper::getProcessServiceFactory(), aLocale );
+                LocaleDataWrapper aLocaleInfo( maContext.getLegacyServiceFactory(), aLocale );
                 if ( !sBankSymbol.getLength() )
                     sBankSymbol = aLocaleInfo.getCurrBankSymbol();
 
@@ -484,36 +494,20 @@ void UnoControlModel::ImplRegisterProperties( const std::list< sal_uInt16 > &rId
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any UnoControlModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XControlModel*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::io::XPersistObject*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XComponent*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XServiceInfo*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::util::XCloneable*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::beans::XPropertyState*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::beans::XMultiPropertySet*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::beans::XFastPropertySet*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::beans::XPropertySet*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ),
-                                        SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ) );
-    return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType ));
+    Any aRet = UnoControlModel_Base::queryAggregation( rType );
+    if ( !aRet.hasValue() )
+        aRet = ::cppu::OPropertySetHelper::queryInterface( rType );
+    return aRet;
 }
 
 // ::com::sun::star::lang::XUnoTunnel
 IMPL_XUNOTUNNEL( UnoControlModel )
 
+// XInterface
+IMPLEMENT_FORWARD_REFCOUNT( UnoControlModel, UnoControlModel_Base )
+
 // ::com::sun::star::lang::XTypeProvider
-IMPL_XTYPEPROVIDER_START( UnoControlModel )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet>* ) NULL ),
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>* ) NULL )
-IMPL_XTYPEPROVIDER_END
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlModel, UnoControlModel_Base, ::cppu::OPropertySetHelper )
 
 
 uno::Reference< util::XCloneable > UnoControlModel::createClone() throw(::com::sun::star::uno::RuntimeException)
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 1cc305462b38..210fc08a2680 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -42,7 +42,6 @@
 #include <toolkit/controls/formattedcontrol.hxx>
 #include <toolkit/controls/roadmapcontrol.hxx>
 #include <toolkit/controls/unocontrols.hxx>
-#include <toolkit/controls/geometrycontrolmodel.hxx>
 #include <toolkit/controls/stdtabcontroller.hxx>
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/unopropertyarrayhelper.hxx>
@@ -95,7 +94,8 @@ using namespace ::toolkit;
 //  ----------------------------------------------------
 //  class UnoControlEditModel
 //  ----------------------------------------------------
-UnoControlEditModel::UnoControlEditModel()
+UnoControlEditModel::UnoControlEditModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit );
 }
@@ -146,8 +146,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInf
 //  ----------------------------------------------------
 //  class UnoEditControl
 //  ----------------------------------------------------
-UnoEditControl::UnoEditControl()
-    :maTextListeners( *this )
+UnoEditControl::UnoEditControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlBase( i_factory )
+    ,maTextListeners( *this )
     ,mnMaxTextLen( 0 )
     ,mbSetTextInPeer( sal_False )
     ,mbSetMaxTextLenInPeer( sal_False )
@@ -460,7 +461,8 @@ void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) t
 //  ----------------------------------------------------
 //  class UnoControlFileControlModel
 //  ----------------------------------------------------
-UnoControlFileControlModel::UnoControlFileControlModel()
+UnoControlFileControlModel::UnoControlFileControlModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_ALIGN );
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -519,7 +521,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropert
 //  ----------------------------------------------------
 //  class UnoFileControl
 //  ----------------------------------------------------
-UnoFileControl::UnoFileControl()
+UnoFileControl::UnoFileControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoEditControl( i_factory )
 {
 }
 
@@ -547,8 +550,7 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
             // graphic manager uniqueid
             rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 );
             // get the DefaultContext
-            ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
-            mxGrfObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
+            mxGrfObj = graphic::GraphicObject::createWithId( maContext.getUNOContext(), sID );
         }
         else // linked
             mxGrfObj = NULL; // release the GraphicObject
@@ -558,9 +560,8 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
         try
         {
-            ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
             uno::Reference< graphic::XGraphicProvider > xProvider;
-            if ( aContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) )
+            if ( maContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) )
             {
                 uno::Sequence< beans::PropertyValue > aMediaProperties(1);
                 aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
@@ -638,7 +639,8 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
 //  ----------------------------------------------------
 //  class UnoControlButtonModel
 //  ----------------------------------------------------
-UnoControlButtonModel::UnoControlButtonModel()
+UnoControlButtonModel::UnoControlButtonModel( const Reference< XMultiServiceFactory >& i_factory )
+    :GraphicControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXButton );
 
@@ -694,9 +696,10 @@ uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetI
 //  ----------------------------------------------------
 //  class UnoButtonControl
 //  ----------------------------------------------------
-UnoButtonControl::UnoButtonControl()
-    : maActionListeners( *this )
-    , maItemListeners( *this )
+UnoButtonControl::UnoButtonControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+    :UnoButtonControl_Base( i_factory )
+    ,maActionListeners( *this )
+    ,maItemListeners( *this )
 {
     maComponentInfos.nWidth = 50;
     maComponentInfos.nHeight = 14;
@@ -833,8 +836,9 @@ awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(
 //  ----------------------------------------------------
 //  class UnoControlImageControlModel
 //  ----------------------------------------------------
-UnoControlImageControlModel::UnoControlImageControlModel()
-    :mbAdjustingImageScaleMode( false )
+UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XMultiServiceFactory >& i_factory )
+    :GraphicControlModel( i_factory )
+    ,mbAdjustingImageScaleMode( false )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXImageControl );
 }
@@ -914,8 +918,9 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal
 //  ----------------------------------------------------
 //  class UnoImageControlControl
 //  ----------------------------------------------------
-UnoImageControlControl::UnoImageControlControl()
-    : maActionListeners( *this )
+UnoImageControlControl::UnoImageControlControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoImageControlControl_Base( i_factory )
+    ,maActionListeners( *this )
 {
     // Woher die Defaults nehmen?
     maComponentInfos.nWidth = 100;
@@ -958,7 +963,8 @@ awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize )
 //  ----------------------------------------------------
 //  class UnoControlRadioButtonModel
 //  ----------------------------------------------------
-UnoControlRadioButtonModel::UnoControlRadioButtonModel()
+UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XMultiServiceFactory >& i_factory )
+    :GraphicControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton );
 }
@@ -1005,8 +1011,10 @@ uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropert
 //  ----------------------------------------------------
 //  class UnoRadioButtonControl
 //  ----------------------------------------------------
-UnoRadioButtonControl::UnoRadioButtonControl()
-    : maItemListeners( *this ), maActionListeners( *this )
+UnoRadioButtonControl::UnoRadioButtonControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoRadioButtonControl_Base( i_factory )
+    ,maItemListeners( *this )
+    ,maActionListeners( *this )
 {
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 12;
@@ -1165,7 +1173,8 @@ awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) t
 //  ----------------------------------------------------
 //  class UnoControlCheckBoxModel
 //  ----------------------------------------------------
-UnoControlCheckBoxModel::UnoControlCheckBoxModel()
+UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XMultiServiceFactory >& i_factory )
+    :GraphicControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox );
 }
@@ -1212,8 +1221,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySe
 //  ----------------------------------------------------
 //  class UnoCheckBoxControl
 //  ----------------------------------------------------
-UnoCheckBoxControl::UnoCheckBoxControl()
-    : maItemListeners( *this ), maActionListeners( *this )
+UnoCheckBoxControl::UnoCheckBoxControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+    :UnoCheckBoxControl_Base( i_factory )
+    ,maItemListeners( *this ), maActionListeners( *this )
 {
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 12;
@@ -1348,7 +1358,8 @@ awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) thro
 //  ----------------------------------------------------
 //  class UnoControlFixedHyperlinkModel
 //  ----------------------------------------------------
-UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel()
+UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink );
 }
@@ -1403,8 +1414,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getProp
 //  ----------------------------------------------------
 //  class UnoFixedHyperlinkControl
 //  ----------------------------------------------------
-UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
-    : maActionListeners( *this )
+UnoFixedHyperlinkControl::UnoFixedHyperlinkControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlBase( i_factory )
+    ,maActionListeners( *this )
 {
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 12;
@@ -1533,7 +1545,8 @@ void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::X
 //  ----------------------------------------------------
 //  class UnoControlFixedTextModel
 //  ----------------------------------------------------
-UnoControlFixedTextModel::UnoControlFixedTextModel()
+UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedText );
 }
@@ -1583,7 +1596,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertyS
 //  ----------------------------------------------------
 //  class UnoFixedTextControl
 //  ----------------------------------------------------
-UnoFixedTextControl::UnoFixedTextControl()
+UnoFixedTextControl::UnoFixedTextControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlBase( i_factory )
 {
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 12;
@@ -1663,7 +1677,8 @@ awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) thr
 //  ----------------------------------------------------
 //  class UnoControlGroupBoxModel
 //  ----------------------------------------------------
-UnoControlGroupBoxModel::UnoControlGroupBoxModel()
+UnoControlGroupBoxModel::UnoControlGroupBoxModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_ENABLED );
@@ -1714,7 +1729,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySe
 //  ----------------------------------------------------
 //  class UnoGroupBoxControl
 //  ----------------------------------------------------
-UnoGroupBoxControl::UnoGroupBoxControl()
+UnoGroupBoxControl::UnoGroupBoxControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlBase( i_factory )
 {
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 100;
@@ -1836,21 +1852,16 @@ private:
 // = UnoControlListBoxModel
 // =====================================================================================================================
 // ---------------------------------------------------------------------------------------------------------------------
-UnoControlListBoxModel::UnoControlListBoxModel()
-    :UnoControlListBoxModel_Base()
-    ,m_pData( new UnoControlListBoxModel_Data( *this ) )
-    ,m_aItemListListeners( GetMutex() )
-{
-    UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXListBox );
-}
-// ---------------------------------------------------------------------------------------------------------------------
-UnoControlListBoxModel::UnoControlListBoxModel(bool)
-    :UnoControlListBoxModel_Base()
+UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XMultiServiceFactory >& i_factory, ConstructorMode const i_mode )
+    :UnoControlListBoxModel_Base( i_factory )
     ,m_pData( new UnoControlListBoxModel_Data( *this ) )
     ,m_aItemListListeners( GetMutex() )
 {
+    if ( i_mode == ConstructDefault )
+    {
+        UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXListBox );
+    }
 }
-
 // ---------------------------------------------------------------------------------------------------------------------
 UnoControlListBoxModel::UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource )
     :UnoControlListBoxModel_Base( i_rSource )
@@ -1868,6 +1879,7 @@ IMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, szServiceName
 {
     return ::rtl::OUString::createFromAscii( szServiceName_UnoControlListBoxModel );
 }
+
 // ---------------------------------------------------------------------------------------------------------------------
 uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 {
@@ -2283,8 +2295,9 @@ void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_n
 //  ----------------------------------------------------
 //  class UnoListBoxControl
 //  ----------------------------------------------------
-UnoListBoxControl::UnoListBoxControl()
-    :maActionListeners( *this )
+UnoListBoxControl::UnoListBoxControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoListBoxControl_Base( i_factory )
+    ,maActionListeners( *this )
     ,maItemListeners( *this )
 {
     maComponentInfos.nWidth = 100;
@@ -2713,7 +2726,8 @@ ItemListenerMultiplexer&    UnoListBoxControl::getItemListeners()
 //  ----------------------------------------------------
 //  class UnoControlComboBoxModel
 //  ----------------------------------------------------
-UnoControlComboBoxModel::UnoControlComboBoxModel() : UnoControlListBoxModel(true)
+UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlListBoxModel( i_factory, ConstructWithoutProperties )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXComboBox );
 }
@@ -2788,9 +2802,10 @@ uno::Any UnoControlComboBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
 //  ----------------------------------------------------
 //  class UnoComboBoxControl
 //  ----------------------------------------------------
-UnoComboBoxControl::UnoComboBoxControl()
-    :   maActionListeners( *this ),
-        maItemListeners( *this )
+UnoComboBoxControl::UnoComboBoxControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoEditControl( i_factory )
+    ,maActionListeners( *this )
+    ,maItemListeners( *this )
 {
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 12;
@@ -3108,7 +3123,9 @@ sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException
 //  ----------------------------------------------------
 //  UnoSpinFieldControl
 //  ----------------------------------------------------
-UnoSpinFieldControl::UnoSpinFieldControl() : maSpinListeners( *this )
+UnoSpinFieldControl::UnoSpinFieldControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoEditControl( i_factory )
+    ,maSpinListeners( *this )
 {
     mbRepeat = sal_False;
 }
@@ -3198,7 +3215,8 @@ void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::sta
 //  ----------------------------------------------------
 //  class UnoControlDateFieldModel
 //  ----------------------------------------------------
-UnoControlDateFieldModel::UnoControlDateFieldModel()
+UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField );
 }
@@ -3243,7 +3261,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertyS
 //  ----------------------------------------------------
 //  class UnoDateFieldControl
 //  ----------------------------------------------------
-UnoDateFieldControl::UnoDateFieldControl()
+UnoDateFieldControl::UnoDateFieldControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoSpinFieldControl( i_factory )
 {
     mnFirst = Date( 1, 1, 1900 ).GetDate();
     mnLast = Date( 31, 12, 2200 ).GetDate();
@@ -3438,7 +3457,8 @@ sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException)
 //  ----------------------------------------------------
 //  class UnoControlTimeFieldModel
 //  ----------------------------------------------------
-UnoControlTimeFieldModel::UnoControlTimeFieldModel()
+UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField );
 }
@@ -3483,7 +3503,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertyS
 //  ----------------------------------------------------
 //  class UnoTimeFieldControl
 //  ----------------------------------------------------
-UnoTimeFieldControl::UnoTimeFieldControl()
+UnoTimeFieldControl::UnoTimeFieldControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoSpinFieldControl( i_factory )
 {
     mnFirst = Time( 0, 0 ).GetTime();
     mnLast = Time( 23, 59, 59, 99 ).GetTime();
@@ -3637,7 +3658,8 @@ sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException)
 //  ----------------------------------------------------
 //  class UnoControlNumericFieldModel
 //  ----------------------------------------------------
-UnoControlNumericFieldModel::UnoControlNumericFieldModel()
+UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField );
 }
@@ -3682,7 +3704,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getProper
 //  ----------------------------------------------------
 //  class UnoNumericFieldControl
 //  ----------------------------------------------------
-UnoNumericFieldControl::UnoNumericFieldControl()
+UnoNumericFieldControl::UnoNumericFieldControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoSpinFieldControl( i_factory )
 {
     mnFirst = 0;
     mnLast = 0x7FFFFFFF;
@@ -3833,7 +3856,8 @@ sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException
 //  ----------------------------------------------------
 //  class UnoControlCurrencyFieldModel
 //  ----------------------------------------------------
-UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel()
+UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField );
 }
@@ -3882,7 +3906,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPrope
 //  ----------------------------------------------------
 //  class UnoCurrencyFieldControl
 //  ----------------------------------------------------
-UnoCurrencyFieldControl::UnoCurrencyFieldControl()
+UnoCurrencyFieldControl::UnoCurrencyFieldControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoSpinFieldControl( i_factory )
 {
     mnFirst = 0;
     mnLast = 0x7FFFFFFF;
@@ -4032,7 +4057,8 @@ sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeExceptio
 //  ----------------------------------------------------
 //  class UnoControlPatternFieldModel
 //  ----------------------------------------------------
-UnoControlPatternFieldModel::UnoControlPatternFieldModel()
+UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField );
 }
@@ -4075,7 +4101,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getProper
 //  ----------------------------------------------------
 //  class UnoPatternFieldControl
 //  ----------------------------------------------------
-UnoPatternFieldControl::UnoPatternFieldControl()
+UnoPatternFieldControl::UnoPatternFieldControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoSpinFieldControl( i_factory )
 {
 }
 
@@ -4164,7 +4191,8 @@ sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException)
 //  ----------------------------------------------------
 //  class UnoControlProgressBarModel
 //  ----------------------------------------------------
-UnoControlProgressBarModel::UnoControlProgressBarModel()
+UnoControlProgressBarModel::UnoControlProgressBarModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -4220,7 +4248,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropert
 //  ----------------------------------------------------
 //  class UnoProgressBarControl
 //  ----------------------------------------------------
-UnoProgressBarControl::UnoProgressBarControl()
+UnoProgressBarControl::UnoProgressBarControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlBase( i_factory )
 {
 }
 
@@ -4296,7 +4325,8 @@ sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::Runtime
 //  ----------------------------------------------------
 //  class UnoControlFixedLineModel
 //  ----------------------------------------------------
-UnoControlFixedLineModel::UnoControlFixedLineModel()
+UnoControlFixedLineModel::UnoControlFixedLineModel( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlModel( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
@@ -4347,7 +4377,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertyS
 //  ----------------------------------------------------
 //  class UnoFixedLineControl
 //  ----------------------------------------------------
-UnoFixedLineControl::UnoFixedLineControl()
+UnoFixedLineControl::UnoFixedLineControl( const Reference< XMultiServiceFactory >& i_factory )
+    :UnoControlBase( i_factory )
 {
     maComponentInfos.nWidth = 100;      // ??
     maComponentInfos.nHeight = 100;     // ??
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 1e90c0172e83..a418b4a00b7b 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -48,7 +48,6 @@
 #include <com/sun/star/awt/tree/XTreeDataModel.hpp>
 #include <com/sun/star/awt/grid/XGridDataModel.hpp>
 #include <com/sun/star/awt/grid/XGridColumnModel.hpp>
-#include <com/sun/star/awt/grid/ScrollBarMode.hpp>
 #include <com/sun/star/view/SelectionType.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
@@ -273,23 +272,26 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
             DECL_PROP_2     ( "RootDisplayed",          TREE_ROOTDISPLAYED,     sal_Bool,           BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "ShowsHandles",           TREE_SHOWSHANDLES,      sal_Bool,           BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "ShowsRootHandles",       TREE_SHOWSROOTHANDLES,  sal_Bool,           BOUND, MAYBEDEFAULT ),
-            DECL_PROP_3     ( "RowHeight",              TREE_ROWHEIGHT,         sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_3     ( "RowHeight",              ROW_HEIGHT,             sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_2     ( "InvokesStopNodeEditing", TREE_INVOKESSTOPNODEEDITING, sal_Bool,      BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "DialogSourceURL",        DIALOGSOURCEURL,        ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "URL",                    URL,                    ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
             DECL_PROP_2     ( "WritingMode",            WRITING_MODE,           sal_Int16,          BOUND, MAYBEDEFAULT ),
             DECL_PROP_3     ( "ContextWritingMode",     CONTEXT_WRITING_MODE,   sal_Int16,          BOUND, MAYBEDEFAULT, TRANSIENT ),
-            DECL_PROP_2     ( "ShowRowHeader",          GRID_SHOWROWHEADER,     sal_Bool,          BOUND, MAYBEDEFAULT ),
-            DECL_PROP_2     ( "ShowColumnHeader",       GRID_SHOWCOLUMNHEADER,  sal_Bool,          BOUND, MAYBEDEFAULT ),
-            DECL_PROP_3     ( "GridDataModel",          GRID_DATAMODEL,         Reference< ::com::sun::star::awt::grid::XGridDataModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_3     ( "ColumnModel",            GRID_COLUMNMODEL,       Reference< ::com::sun::star::awt::grid::XGridColumnModel >,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_2     ( "ShowRowHeader",          GRID_SHOWROWHEADER,     sal_Bool,           BOUND, MAYBEDEFAULT ),
+            DECL_PROP_2     ( "RowHeaderWidth",         ROW_HEADER_WIDTH,       sal_Int32,          BOUND, MAYBEDEFAULT ),
+            DECL_PROP_2     ( "ShowColumnHeader",       GRID_SHOWCOLUMNHEADER,  sal_Bool,           BOUND, MAYBEDEFAULT ),
+            DECL_PROP_3     ( "ColumnHeaderHeight",     COLUMN_HEADER_HEIGHT,   sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_1     ( "GridDataModel",          GRID_DATAMODEL,         Reference< ::com::sun::star::awt::grid::XGridDataModel >,          BOUND ),
+            DECL_PROP_1     ( "ColumnModel",            GRID_COLUMNMODEL,       Reference< ::com::sun::star::awt::grid::XGridColumnModel >,          BOUND ),
             DECL_PROP_3     ( "SelectionModel",         GRID_SELECTIONMODE,     ::com::sun::star::view::SelectionType,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_2     ( "EnableVisible",          ENABLEVISIBLE,          sal_Bool,           BOUND, MAYBEDEFAULT ),
             DECL_PROP_3     ( "ReferenceDevice",        REFERENCE_DEVICE,       Reference< XDevice >,BOUND, MAYBEDEFAULT, TRANSIENT ),
-            DECL_PROP_3     ( "EvenRowBackgroundColor", GRID_EVEN_ROW_BACKGROUND, sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_3     ( "HeaderBackgroundColor",  GRID_HEADER_BACKGROUND,  sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_3     ( "GridLineColor",          GRID_LINE_COLOR,         sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_3     ( "RowBackgroundColor",     GRID_ROW_BACKGROUND,     sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID )
+            DECL_PROP_3     ( "HeaderBackgroundColor",  GRID_HEADER_BACKGROUND,     sal_Int32,              BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_3     ( "HeaderTextColor",        GRID_HEADER_TEXT_COLOR,     sal_Int32,              BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_3     ( "GridLineColor",          GRID_LINE_COLOR,            sal_Int32,              BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_3     ( "RowBackgroundColors",    GRID_ROW_BACKGROUND_COLORS, Sequence< sal_Int32 >,  BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_2     ( "UseGridLines",           USE_GRID_LINES,             sal_Bool,               BOUND, MAYBEDEFAULT ),
     };
             pPropertyInfos = aImplPropertyInfos;
             nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index 37f33c4168ff..8a6b1d8de4b9 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -125,97 +125,92 @@ namespace toolkit
     { return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ImplName ); }
 
 #define IMPL_CREATEINSTANCE2( ImplName ) \
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ImplName##_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMgr) \
-    { return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ImplName( rSMgr ) ); }
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ImplName##_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory ) \
+    { return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ImplName( i_factory ) ); }
 
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL UnoControlDialogModel_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& )
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL UnoControlDialogModel_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
 {
-    return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new OGeometryControlModel<UnoControlDialogModel> );
+    return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new OGeometryControlModel<UnoControlDialogModel>( i_factory ) );
 }
 
-#define CHECKANDCREATEFACTORY( ImplName, ServiceName1, ServiceName2 ) \
-    pRet = tryCreateFactory( sImplementationName, "stardiv.Toolkit." #ImplName, \
+#define GET_FACTORY_WITH_IMPL_PREFIX( ClassName, ImplNamePrefix, ServiceName1, ServiceName2 ) \
+    pRet = tryCreateFactory( sImplementationName, ImplNamePrefix "." #ClassName, \
                 ServiceName1, ServiceName2, \
-                ImplName##_CreateInstance, xServiceFactory \
+                ClassName##_CreateInstance, xServiceFactory \
             ); \
     if ( pRet ) \
         return pRet; \
 
-#define TRY_OOO_FACTORY( ImplName, ServiceName ) \
-    pRet = tryCreateFactory( sImplementationName, "org.openoffice.comp.toolkit." #ImplName, \
-                ServiceName, NULL, \
-                ImplName##_CreateInstance, xServiceFactory \
-            ); \
-    if ( pRet ) \
-        return pRet; \
+#define GET_FACTORY( ImplName, ServiceName1, ServiceName2 ) \
+    GET_FACTORY_WITH_IMPL_PREFIX( ImplName, "stardiv.Toolkit", ServiceName1, ServiceName2 )
 
 using namespace toolkit;
 
 IMPL_CREATEINSTANCE2( VCLXToolkit )
 IMPL_CREATEINSTANCE( StdTabController )
 IMPL_CREATEINSTANCE( StdTabControllerModel )
-IMPL_CREATEINSTANCE( UnoButtonControl )
-IMPL_CREATEINSTANCE( UnoCheckBoxControl )
-IMPL_CREATEINSTANCE( UnoComboBoxControl )
-IMPL_CREATEINSTANCE( UnoControlButtonModel )
-IMPL_CREATEINSTANCE( UnoControlCheckBoxModel )
-IMPL_CREATEINSTANCE( UnoControlComboBoxModel )
-IMPL_CREATEINSTANCE( UnoControlContainer )
-IMPL_CREATEINSTANCE( UnoControlContainerModel )
-IMPL_CREATEINSTANCE( UnoControlCurrencyFieldModel )
-IMPL_CREATEINSTANCE( UnoControlDateFieldModel )
-IMPL_CREATEINSTANCE( UnoControlEditModel )
-IMPL_CREATEINSTANCE( UnoControlFileControlModel )
-IMPL_CREATEINSTANCE( UnoControlFixedHyperlinkModel )
-IMPL_CREATEINSTANCE( UnoControlFixedTextModel )
-IMPL_CREATEINSTANCE( UnoControlFormattedFieldModel )
-IMPL_CREATEINSTANCE( UnoControlGroupBoxModel )
-IMPL_CREATEINSTANCE( UnoControlImageControlModel )
-IMPL_CREATEINSTANCE( UnoControlListBoxModel )
-IMPL_CREATEINSTANCE( UnoControlNumericFieldModel )
-IMPL_CREATEINSTANCE( UnoControlPatternFieldModel )
-IMPL_CREATEINSTANCE( UnoControlRadioButtonModel )
-IMPL_CREATEINSTANCE( UnoControlTimeFieldModel )
-IMPL_CREATEINSTANCE( UnoControlProgressBarModel )
-IMPL_CREATEINSTANCE( UnoControlScrollBarModel )
-IMPL_CREATEINSTANCE( UnoSpinButtonModel )
-IMPL_CREATEINSTANCE( UnoControlFixedLineModel )
-IMPL_CREATEINSTANCE( UnoCurrencyFieldControl )
-IMPL_CREATEINSTANCE( UnoDateFieldControl )
-IMPL_CREATEINSTANCE( UnoDialogControl )
-IMPL_CREATEINSTANCE( UnoEditControl )
-IMPL_CREATEINSTANCE( UnoFileControl )
-IMPL_CREATEINSTANCE( UnoFixedHyperlinkControl )
-IMPL_CREATEINSTANCE( UnoFixedTextControl )
-IMPL_CREATEINSTANCE( UnoFormattedFieldControl )
-IMPL_CREATEINSTANCE( UnoGroupBoxControl )
-IMPL_CREATEINSTANCE( UnoImageControlControl )
-IMPL_CREATEINSTANCE( UnoListBoxControl )
-IMPL_CREATEINSTANCE( UnoNumericFieldControl )
-IMPL_CREATEINSTANCE( UnoPatternFieldControl )
-IMPL_CREATEINSTANCE( UnoRadioButtonControl )
-IMPL_CREATEINSTANCE( UnoTimeFieldControl )
-IMPL_CREATEINSTANCE( UnoProgressBarControl )
-IMPL_CREATEINSTANCE( UnoScrollBarControl )
-IMPL_CREATEINSTANCE( UnoSpinButtonControl )
-IMPL_CREATEINSTANCE( UnoFixedLineControl )
+IMPL_CREATEINSTANCE2( UnoButtonControl )
+IMPL_CREATEINSTANCE2( UnoCheckBoxControl )
+IMPL_CREATEINSTANCE2( UnoComboBoxControl )
+IMPL_CREATEINSTANCE2( UnoControlButtonModel )
+IMPL_CREATEINSTANCE2( UnoControlCheckBoxModel )
+IMPL_CREATEINSTANCE2( UnoControlComboBoxModel )
+IMPL_CREATEINSTANCE2( UnoControlContainer )
+IMPL_CREATEINSTANCE2( UnoControlContainerModel )
+IMPL_CREATEINSTANCE2( UnoControlCurrencyFieldModel )
+IMPL_CREATEINSTANCE2( UnoControlDateFieldModel )
+IMPL_CREATEINSTANCE2( UnoControlEditModel )
+IMPL_CREATEINSTANCE2( UnoControlFileControlModel )
+IMPL_CREATEINSTANCE2( UnoControlFixedHyperlinkModel )
+IMPL_CREATEINSTANCE2( UnoControlFixedTextModel )
+IMPL_CREATEINSTANCE2( UnoControlFormattedFieldModel )
+IMPL_CREATEINSTANCE2( UnoControlGroupBoxModel )
+IMPL_CREATEINSTANCE2( UnoControlImageControlModel )
+IMPL_CREATEINSTANCE2( UnoControlListBoxModel )
+IMPL_CREATEINSTANCE2( UnoControlNumericFieldModel )
+IMPL_CREATEINSTANCE2( UnoControlPatternFieldModel )
+IMPL_CREATEINSTANCE2( UnoControlRadioButtonModel )
+IMPL_CREATEINSTANCE2( UnoControlTimeFieldModel )
+IMPL_CREATEINSTANCE2( UnoControlProgressBarModel )
+IMPL_CREATEINSTANCE2( UnoControlScrollBarModel )
+IMPL_CREATEINSTANCE2( UnoSpinButtonModel )
+IMPL_CREATEINSTANCE2( UnoControlFixedLineModel )
+IMPL_CREATEINSTANCE2( UnoCurrencyFieldControl )
+IMPL_CREATEINSTANCE2( UnoDateFieldControl )
+IMPL_CREATEINSTANCE2( UnoDialogControl )
+IMPL_CREATEINSTANCE2( UnoEditControl )
+IMPL_CREATEINSTANCE2( UnoFileControl )
+IMPL_CREATEINSTANCE2( UnoFixedHyperlinkControl )
+IMPL_CREATEINSTANCE2( UnoFixedTextControl )
+IMPL_CREATEINSTANCE2( UnoFormattedFieldControl )
+IMPL_CREATEINSTANCE2( UnoGroupBoxControl )
+IMPL_CREATEINSTANCE2( UnoImageControlControl )
+IMPL_CREATEINSTANCE2( UnoListBoxControl )
+IMPL_CREATEINSTANCE2( UnoNumericFieldControl )
+IMPL_CREATEINSTANCE2( UnoPatternFieldControl )
+IMPL_CREATEINSTANCE2( UnoRadioButtonControl )
+IMPL_CREATEINSTANCE2( UnoTimeFieldControl )
+IMPL_CREATEINSTANCE2( UnoProgressBarControl )
+IMPL_CREATEINSTANCE2( UnoScrollBarControl )
+IMPL_CREATEINSTANCE2( UnoSpinButtonControl )
+IMPL_CREATEINSTANCE2( UnoFixedLineControl )
 IMPL_CREATEINSTANCE( VCLXMenuBar )
 IMPL_CREATEINSTANCE( VCLXPointer )
 IMPL_CREATEINSTANCE( VCLXPopupMenu )
 IMPL_CREATEINSTANCE( VCLXPrinterServer )
-IMPL_CREATEINSTANCE( UnoRoadmapControl )
-IMPL_CREATEINSTANCE( UnoControlRoadmapModel )
-IMPL_CREATEINSTANCE( UnoSimpleAnimationControl )
-IMPL_CREATEINSTANCE( UnoSimpleAnimationControlModel )
-IMPL_CREATEINSTANCE( UnoThrobberControl )
-IMPL_CREATEINSTANCE( UnoThrobberControlModel )
-IMPL_CREATEINSTANCE( UnoControlTabPage )
-//IMPL_CREATEINSTANCE( UnoControlTabPageModel )
-//IMPL_CREATEINSTANCE( UnoControlTabPageContainer )
-//IMPL_CREATEINSTANCE( UnoControlTabPageContainerModel )
-IMPL_CREATEINSTANCE( AnimatedImagesControl )
-IMPL_CREATEINSTANCE( AnimatedImagesControlModel )
-IMPL_CREATEINSTANCE( SpinningProgressControlModel )
+IMPL_CREATEINSTANCE2( UnoRoadmapControl )
+IMPL_CREATEINSTANCE2( UnoControlRoadmapModel )
+IMPL_CREATEINSTANCE2( UnoSimpleAnimationControl )
+IMPL_CREATEINSTANCE2( UnoSimpleAnimationControlModel )
+IMPL_CREATEINSTANCE2( UnoThrobberControl )
+IMPL_CREATEINSTANCE2( UnoThrobberControlModel )
+IMPL_CREATEINSTANCE2( UnoControlTabPage )
+IMPL_CREATEINSTANCE2( UnoControlTabPageModel )
+IMPL_CREATEINSTANCE2( UnoControlTabPageContainer )
+IMPL_CREATEINSTANCE2( UnoControlTabPageContainerModel )
+IMPL_CREATEINSTANCE2( AnimatedImagesControl )
+IMPL_CREATEINSTANCE2( AnimatedImagesControlModel )
+IMPL_CREATEINSTANCE2( SpinningProgressControlModel )
 
 extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL TreeControl_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
 extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL TreeControlModel_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
@@ -225,11 +220,7 @@ extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL
 extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL DefaultGridDataModel_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
 extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL DefaultGridColumnModel_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
 extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GridColumn_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
-extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL UnoControlTabPageContainer_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
-extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL UnoControlTabPageContainerModel_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
-
-//extern sal_Bool SAL_CALL UnoControlTabPageModel_component_writeInfo(void * serviceManager, void * registryKey);
-extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL UnoControlTabPageModel_CreateInstance (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
+extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SortableGridDataModel_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
 
 extern void * SAL_CALL comp_AsyncCallback_component_getFactory( const char * implName, void * serviceManager, void * registryKey );
 
@@ -252,83 +243,83 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory =
             static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( _pServiceManager );
 
-        CHECKANDCREATEFACTORY( VCLXToolkit, szServiceName_Toolkit, szServiceName2_Toolkit )
-        CHECKANDCREATEFACTORY( VCLXPopupMenu, szServiceName_PopupMenu, szServiceName2_PopupMenu )
-        CHECKANDCREATEFACTORY( VCLXMenuBar, szServiceName_MenuBar, szServiceName2_MenuBar )
-        CHECKANDCREATEFACTORY( VCLXPointer, szServiceName_Pointer, szServiceName2_Pointer )
-        CHECKANDCREATEFACTORY( UnoControlContainer, szServiceName_UnoControlContainer, szServiceName2_UnoControlContainer )
-        CHECKANDCREATEFACTORY( UnoControlContainerModel, szServiceName_UnoControlContainerModel, szServiceName2_UnoControlContainerModel )
-        CHECKANDCREATEFACTORY( StdTabController, szServiceName_TabController, szServiceName2_TabController )
-        CHECKANDCREATEFACTORY( StdTabControllerModel, szServiceName_TabControllerModel, szServiceName2_TabControllerModel )
-        CHECKANDCREATEFACTORY( UnoDialogControl, szServiceName_UnoControlDialog, szServiceName2_UnoControlDialog )
-        CHECKANDCREATEFACTORY( UnoControlDialogModel, szServiceName_UnoControlDialogModel, szServiceName2_UnoControlDialogModel )
-        CHECKANDCREATEFACTORY( UnoEditControl, szServiceName_UnoControlEdit, szServiceName2_UnoControlEdit )
-        CHECKANDCREATEFACTORY( UnoControlEditModel, szServiceName_UnoControlEditModel, szServiceName2_UnoControlEditModel )
-        CHECKANDCREATEFACTORY( UnoDateFieldControl, szServiceName_UnoControlDateField, szServiceName2_UnoControlDateField )
-        CHECKANDCREATEFACTORY( UnoControlDateFieldModel, szServiceName_UnoControlDateFieldModel, szServiceName2_UnoControlDateFieldModel )
-        CHECKANDCREATEFACTORY( UnoTimeFieldControl, szServiceName_UnoControlTimeField, szServiceName2_UnoControlTimeField )
-        CHECKANDCREATEFACTORY( UnoControlTimeFieldModel, szServiceName_UnoControlTimeFieldModel, szServiceName2_UnoControlTimeFieldModel )
-        CHECKANDCREATEFACTORY( UnoNumericFieldControl, szServiceName_UnoControlNumericField, szServiceName2_UnoControlNumericField )
-        CHECKANDCREATEFACTORY( UnoControlNumericFieldModel, szServiceName_UnoControlNumericFieldModel, szServiceName2_UnoControlNumericFieldModel )
-        CHECKANDCREATEFACTORY( UnoCurrencyFieldControl, szServiceName_UnoControlCurrencyField, szServiceName2_UnoControlCurrencyField )
-        CHECKANDCREATEFACTORY( UnoControlCurrencyFieldModel, szServiceName_UnoControlCurrencyFieldModel, szServiceName2_UnoControlCurrencyFieldModel )
-        CHECKANDCREATEFACTORY( UnoPatternFieldControl, szServiceName_UnoControlPatternField, szServiceName2_UnoControlPatternField )
-        CHECKANDCREATEFACTORY( UnoControlPatternFieldModel, szServiceName_UnoControlPatternFieldModel, szServiceName2_UnoControlPatternFieldModel )
-        CHECKANDCREATEFACTORY( UnoFormattedFieldControl, szServiceName_UnoControlFormattedField, szServiceName2_UnoControlFormattedField )
-        CHECKANDCREATEFACTORY( UnoControlFormattedFieldModel, szServiceName_UnoControlFormattedFieldModel, szServiceName2_UnoControlFormattedFieldModel )
-        CHECKANDCREATEFACTORY( UnoFileControl, szServiceName_UnoControlFileControl, szServiceName2_UnoControlFileControl )
-        CHECKANDCREATEFACTORY( UnoControlFileControlModel, szServiceName_UnoControlFileControlModel, szServiceName2_UnoControlFileControlModel )
-        CHECKANDCREATEFACTORY( UnoButtonControl, szServiceName_UnoControlButton, szServiceName2_UnoControlButton )
-        CHECKANDCREATEFACTORY( UnoControlButtonModel, szServiceName_UnoControlButtonModel, szServiceName2_UnoControlButtonModel )
-        CHECKANDCREATEFACTORY( UnoImageControlControl, szServiceName_UnoControlImageButton, szServiceName2_UnoControlImageButton )
-        CHECKANDCREATEFACTORY( UnoControlImageControlModel, szServiceName_UnoControlImageButtonModel, szServiceName2_UnoControlImageButtonModel )
-        CHECKANDCREATEFACTORY( UnoImageControlControl, szServiceName_UnoControlImageControl, szServiceName2_UnoControlImageControl )
-        CHECKANDCREATEFACTORY( UnoControlImageControlModel, szServiceName_UnoControlImageControlModel, szServiceName2_UnoControlImageControlModel )
-        CHECKANDCREATEFACTORY( UnoRadioButtonControl, szServiceName_UnoControlRadioButton, szServiceName2_UnoControlRadioButton )
-        CHECKANDCREATEFACTORY( UnoControlRadioButtonModel, szServiceName_UnoControlRadioButtonModel, szServiceName2_UnoControlRadioButtonModel )
-        CHECKANDCREATEFACTORY( UnoCheckBoxControl, szServiceName_UnoControlCheckBox, szServiceName2_UnoControlCheckBox )
-        CHECKANDCREATEFACTORY( UnoControlCheckBoxModel, szServiceName_UnoControlCheckBoxModel, szServiceName2_UnoControlCheckBoxModel )
-        CHECKANDCREATEFACTORY( UnoListBoxControl, szServiceName_UnoControlListBox, szServiceName2_UnoControlListBox )
-        CHECKANDCREATEFACTORY( UnoControlListBoxModel, szServiceName_UnoControlListBoxModel, szServiceName2_UnoControlListBoxModel )
-        CHECKANDCREATEFACTORY( UnoComboBoxControl, szServiceName_UnoControlComboBox, szServiceName2_UnoControlComboBox )
-        CHECKANDCREATEFACTORY( UnoControlComboBoxModel, szServiceName_UnoControlComboBoxModel, szServiceName2_UnoControlComboBoxModel )
-        CHECKANDCREATEFACTORY( UnoFixedTextControl, szServiceName_UnoControlFixedText, szServiceName2_UnoControlFixedText )
-        CHECKANDCREATEFACTORY( UnoControlFixedTextModel, szServiceName_UnoControlFixedTextModel, szServiceName2_UnoControlFixedTextModel )
-        CHECKANDCREATEFACTORY( UnoGroupBoxControl, szServiceName_UnoControlGroupBox, szServiceName2_UnoControlGroupBox )
-        CHECKANDCREATEFACTORY( UnoControlGroupBoxModel, szServiceName_UnoControlGroupBoxModel, szServiceName2_UnoControlGroupBoxModel )
-        CHECKANDCREATEFACTORY( UnoProgressBarControl, szServiceName_UnoControlProgressBar, szServiceName2_UnoControlProgressBar )
-        CHECKANDCREATEFACTORY( UnoControlProgressBarModel, szServiceName_UnoControlProgressBarModel, szServiceName2_UnoControlProgressBarModel )
-        CHECKANDCREATEFACTORY( UnoScrollBarControl, szServiceName_UnoControlScrollBar, szServiceName2_UnoControlScrollBar )
-        CHECKANDCREATEFACTORY( UnoControlScrollBarModel, szServiceName_UnoControlScrollBarModel, szServiceName2_UnoControlScrollBarModel )
-        CHECKANDCREATEFACTORY( UnoFixedLineControl, szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine )
-        CHECKANDCREATEFACTORY( UnoControlFixedLineModel, szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel )
-        CHECKANDCREATEFACTORY( VCLXPrinterServer, szServiceName_PrinterServer, szServiceName2_PrinterServer )
-        CHECKANDCREATEFACTORY( UnoRoadmapControl, szServiceName_UnoControlRoadmap, szServiceName2_UnoControlRoadmap )
-        CHECKANDCREATEFACTORY( UnoControlRoadmapModel, szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel )
-        CHECKANDCREATEFACTORY( UnoSpinButtonModel, szServiceName_UnoSpinButtonModel, NULL )
-        CHECKANDCREATEFACTORY( UnoSpinButtonControl, szServiceName_UnoSpinButtonControl, NULL )
-        CHECKANDCREATEFACTORY( TreeControl, szServiceName_TreeControl, NULL )
-        CHECKANDCREATEFACTORY( TreeControlModel, szServiceName_TreeControlModel, NULL )
-        CHECKANDCREATEFACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL )
-        CHECKANDCREATEFACTORY( UnoSimpleAnimationControlModel, szServiceName_UnoSimpleAnimationControlModel, szServiceName2_UnoSimpleAnimationControlModel )
-        CHECKANDCREATEFACTORY( UnoSimpleAnimationControl, szServiceName_UnoSimpleAnimationControl, szServiceName2_UnoSimpleAnimationControl )
-        CHECKANDCREATEFACTORY( UnoThrobberControlModel, szServiceName_UnoThrobberControlModel, szServiceName2_UnoThrobberControlModel )
-        CHECKANDCREATEFACTORY( UnoThrobberControl, szServiceName_UnoThrobberControl, szServiceName2_UnoThrobberControl )
-        TRY_OOO_FACTORY( AnimatedImagesControl, szServiceName_AnimatedImagesControl )
-        TRY_OOO_FACTORY( AnimatedImagesControlModel, szServiceName_AnimatedImagesControlModel )
-        TRY_OOO_FACTORY( SpinningProgressControlModel, szServiceName_SpinningProgressControlModel )
-        CHECKANDCREATEFACTORY( UnoFixedHyperlinkControl, szServiceName_UnoControlFixedHyperlink, NULL )
-        CHECKANDCREATEFACTORY( UnoControlFixedHyperlinkModel, szServiceName_UnoControlFixedHyperlinkModel, NULL )
-        CHECKANDCREATEFACTORY( GridControl, szServiceName_GridControl, NULL )
-         CHECKANDCREATEFACTORY( GridControlModel, szServiceName_GridControlModel, NULL )
-        CHECKANDCREATEFACTORY( DefaultGridDataModel, szServiceName_DefaultGridDataModel, NULL )
-        CHECKANDCREATEFACTORY( DefaultGridColumnModel, szServiceName_DefaultGridColumnModel, NULL )
-        CHECKANDCREATEFACTORY( GridColumn, szServiceName_GridColumn, NULL )
-        CHECKANDCREATEFACTORY( UnoControlTabPageModel, szServiceName_UnoControlTabPageModel, NULL )
-        CHECKANDCREATEFACTORY( UnoControlTabPage, szServiceName_UnoControlTabPage, NULL )
-        CHECKANDCREATEFACTORY( UnoControlTabPageContainerModel, szServiceName_UnoControlTabPageContainerModel, NULL )
-        CHECKANDCREATEFACTORY( UnoControlTabPageContainer, szServiceName_UnoControlTabPageContainer, NULL )
-
+        GET_FACTORY( VCLXToolkit, szServiceName_Toolkit, szServiceName2_Toolkit )
+        GET_FACTORY( VCLXPopupMenu, szServiceName_PopupMenu, szServiceName2_PopupMenu )
+        GET_FACTORY( VCLXMenuBar, szServiceName_MenuBar, szServiceName2_MenuBar )
+        GET_FACTORY( VCLXPointer, szServiceName_Pointer, szServiceName2_Pointer )
+        GET_FACTORY( UnoControlContainer, szServiceName_UnoControlContainer, szServiceName2_UnoControlContainer )
+        GET_FACTORY( UnoControlContainerModel, szServiceName_UnoControlContainerModel, szServiceName2_UnoControlContainerModel )
+        GET_FACTORY( StdTabController, szServiceName_TabController, szServiceName2_TabController )
+        GET_FACTORY( StdTabControllerModel, szServiceName_TabControllerModel, szServiceName2_TabControllerModel )
+        GET_FACTORY( UnoDialogControl, szServiceName_UnoControlDialog, szServiceName2_UnoControlDialog )
+        GET_FACTORY( UnoControlDialogModel, szServiceName_UnoControlDialogModel, szServiceName2_UnoControlDialogModel )
+        GET_FACTORY( UnoEditControl, szServiceName_UnoControlEdit, szServiceName2_UnoControlEdit )
+        GET_FACTORY( UnoControlEditModel, szServiceName_UnoControlEditModel, szServiceName2_UnoControlEditModel )
+        GET_FACTORY( UnoDateFieldControl, szServiceName_UnoControlDateField, szServiceName2_UnoControlDateField )
+        GET_FACTORY( UnoControlDateFieldModel, szServiceName_UnoControlDateFieldModel, szServiceName2_UnoControlDateFieldModel )
+        GET_FACTORY( UnoTimeFieldControl, szServiceName_UnoControlTimeField, szServiceName2_UnoControlTimeField )
+        GET_FACTORY( UnoControlTimeFieldModel, szServiceName_UnoControlTimeFieldModel, szServiceName2_UnoControlTimeFieldModel )
+        GET_FACTORY( UnoNumericFieldControl, szServiceName_UnoControlNumericField, szServiceName2_UnoControlNumericField )
+        GET_FACTORY( UnoControlNumericFieldModel, szServiceName_UnoControlNumericFieldModel, szServiceName2_UnoControlNumericFieldModel )
+        GET_FACTORY( UnoCurrencyFieldControl, szServiceName_UnoControlCurrencyField, szServiceName2_UnoControlCurrencyField )
+        GET_FACTORY( UnoControlCurrencyFieldModel, szServiceName_UnoControlCurrencyFieldModel, szServiceName2_UnoControlCurrencyFieldModel )
+        GET_FACTORY( UnoPatternFieldControl, szServiceName_UnoControlPatternField, szServiceName2_UnoControlPatternField )
+        GET_FACTORY( UnoControlPatternFieldModel, szServiceName_UnoControlPatternFieldModel, szServiceName2_UnoControlPatternFieldModel )
+        GET_FACTORY( UnoFormattedFieldControl, szServiceName_UnoControlFormattedField, szServiceName2_UnoControlFormattedField )
+        GET_FACTORY( UnoControlFormattedFieldModel, szServiceName_UnoControlFormattedFieldModel, szServiceName2_UnoControlFormattedFieldModel )
+        GET_FACTORY( UnoFileControl, szServiceName_UnoControlFileControl, szServiceName2_UnoControlFileControl )
+        GET_FACTORY( UnoControlFileControlModel, szServiceName_UnoControlFileControlModel, szServiceName2_UnoControlFileControlModel )
+        GET_FACTORY( UnoButtonControl, szServiceName_UnoControlButton, szServiceName2_UnoControlButton )
+        GET_FACTORY( UnoControlButtonModel, szServiceName_UnoControlButtonModel, szServiceName2_UnoControlButtonModel )
+        GET_FACTORY( UnoImageControlControl, szServiceName_UnoControlImageButton, szServiceName2_UnoControlImageButton )
+        GET_FACTORY( UnoControlImageControlModel, szServiceName_UnoControlImageButtonModel, szServiceName2_UnoControlImageButtonModel )
+        GET_FACTORY( UnoImageControlControl, szServiceName_UnoControlImageControl, szServiceName2_UnoControlImageControl )
+        GET_FACTORY( UnoControlImageControlModel, szServiceName_UnoControlImageControlModel, szServiceName2_UnoControlImageControlModel )
+        GET_FACTORY( UnoRadioButtonControl, szServiceName_UnoControlRadioButton, szServiceName2_UnoControlRadioButton )
+        GET_FACTORY( UnoControlRadioButtonModel, szServiceName_UnoControlRadioButtonModel, szServiceName2_UnoControlRadioButtonModel )
+        GET_FACTORY( UnoCheckBoxControl, szServiceName_UnoControlCheckBox, szServiceName2_UnoControlCheckBox )
+        GET_FACTORY( UnoControlCheckBoxModel, szServiceName_UnoControlCheckBoxModel, szServiceName2_UnoControlCheckBoxModel )
+        GET_FACTORY( UnoListBoxControl, szServiceName_UnoControlListBox, szServiceName2_UnoControlListBox )
+        GET_FACTORY( UnoControlListBoxModel, szServiceName_UnoControlListBoxModel, szServiceName2_UnoControlListBoxModel )
+        GET_FACTORY( UnoComboBoxControl, szServiceName_UnoControlComboBox, szServiceName2_UnoControlComboBox )
+        GET_FACTORY( UnoControlComboBoxModel, szServiceName_UnoControlComboBoxModel, szServiceName2_UnoControlComboBoxModel )
+        GET_FACTORY( UnoFixedTextControl, szServiceName_UnoControlFixedText, szServiceName2_UnoControlFixedText )
+        GET_FACTORY( UnoControlFixedTextModel, szServiceName_UnoControlFixedTextModel, szServiceName2_UnoControlFixedTextModel )
+        GET_FACTORY( UnoGroupBoxControl, szServiceName_UnoControlGroupBox, szServiceName2_UnoControlGroupBox )
+        GET_FACTORY( UnoControlGroupBoxModel, szServiceName_UnoControlGroupBoxModel, szServiceName2_UnoControlGroupBoxModel )
+        GET_FACTORY( UnoProgressBarControl, szServiceName_UnoControlProgressBar, szServiceName2_UnoControlProgressBar )
+        GET_FACTORY( UnoControlProgressBarModel, szServiceName_UnoControlProgressBarModel, szServiceName2_UnoControlProgressBarModel )
+        GET_FACTORY( UnoScrollBarControl, szServiceName_UnoControlScrollBar, szServiceName2_UnoControlScrollBar )
+        GET_FACTORY( UnoControlScrollBarModel, szServiceName_UnoControlScrollBarModel, szServiceName2_UnoControlScrollBarModel )
+        GET_FACTORY( UnoFixedLineControl, szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine )
+        GET_FACTORY( UnoControlFixedLineModel, szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel )
+        GET_FACTORY( VCLXPrinterServer, szServiceName_PrinterServer, szServiceName2_PrinterServer )
+        GET_FACTORY( UnoRoadmapControl, szServiceName_UnoControlRoadmap, szServiceName2_UnoControlRoadmap )
+        GET_FACTORY( UnoControlRoadmapModel, szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel )
+        GET_FACTORY( UnoSpinButtonModel, szServiceName_UnoSpinButtonModel, NULL )
+        GET_FACTORY( UnoSpinButtonControl, szServiceName_UnoSpinButtonControl, NULL )
+        GET_FACTORY( TreeControl, szServiceName_TreeControl, NULL )
+        GET_FACTORY( TreeControlModel, szServiceName_TreeControlModel, NULL )
+        GET_FACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL )
+        GET_FACTORY( UnoSimpleAnimationControlModel, szServiceName_UnoSimpleAnimationControlModel, szServiceName2_UnoSimpleAnimationControlModel )
+        GET_FACTORY( UnoSimpleAnimationControl, szServiceName_UnoSimpleAnimationControl, szServiceName2_UnoSimpleAnimationControl )
+        GET_FACTORY( UnoThrobberControlModel, szServiceName_UnoThrobberControlModel, szServiceName2_UnoThrobberControlModel )
+        GET_FACTORY( UnoThrobberControl, szServiceName_UnoThrobberControl, szServiceName2_UnoThrobberControl )
+        GET_FACTORY( UnoFixedHyperlinkControl, szServiceName_UnoControlFixedHyperlink, NULL )
+        GET_FACTORY( UnoControlFixedHyperlinkModel, szServiceName_UnoControlFixedHyperlinkModel, NULL )
+        GET_FACTORY( GridControl, szServiceName_GridControl, NULL );
+         GET_FACTORY( GridControlModel, szServiceName_GridControlModel, NULL );
+        GET_FACTORY( DefaultGridDataModel, szServiceName_DefaultGridDataModel, NULL );
+        GET_FACTORY( DefaultGridColumnModel, szServiceName_DefaultGridColumnModel, NULL );
+        GET_FACTORY_WITH_IMPL_PREFIX( GridColumn, "org.openoffice.comp.toolkit", szServiceName_GridColumn, NULL );
+        GET_FACTORY_WITH_IMPL_PREFIX( SortableGridDataModel, "org.openoffice.comp.toolkit", szServiceName_SortableGridDataModel, NULL );
+        GET_FACTORY_WITH_IMPL_PREFIX( AnimatedImagesControl, "org.openoffice.comp.toolkit", szServiceName_AnimatedImagesControl, NULL )
+        GET_FACTORY_WITH_IMPL_PREFIX( AnimatedImagesControlModel, "org.openoffice.comp.toolkit", szServiceName_AnimatedImagesControlModel, NULL )
+        GET_FACTORY_WITH_IMPL_PREFIX( SpinningProgressControlModel, "org.openoffice.comp.toolkit", szServiceName_SpinningProgressControlModel, NULL )
+        GET_FACTORY( UnoControlTabPageModel, szServiceName_UnoControlTabPageModel, NULL )
+        GET_FACTORY( UnoControlTabPage, szServiceName_UnoControlTabPage, NULL )
+        GET_FACTORY( UnoControlTabPageContainerModel, szServiceName_UnoControlTabPageContainerModel, NULL )
+        GET_FACTORY( UnoControlTabPageContainer, szServiceName_UnoControlTabPageContainer, NULL )
 
         if ( rtl_str_compare( sImplementationName, "com.sun.star.awt.comp.AsyncCallback" ) == 0 )
             return comp_AsyncCallback_component_getFactory( sImplementationName, _pServiceManager, _pRegistryKey );
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index 383adb22b9de..293d257da832 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.cxx
@@ -109,4 +109,5 @@ const sal_Char __FAR_DATA szServiceName_UnoControlTabPage[] = "com.sun.star.awt.
 const sal_Char __FAR_DATA szServiceName_UnoControlTabPageModel[] = "com.sun.star.awt.tab.UnoControlTabPageModel";
 const sal_Char __FAR_DATA szServiceName_UnoControlTabPageContainerModel[] = "com.sun.star.awt.tab.UnoControlTabPageContainerModel";
 const sal_Char __FAR_DATA szServiceName_UnoControlTabPageContainer[] = "com.sun.star.awt.tab.UnoControlTabPageContainer";
+const sal_Char __FAR_DATA szServiceName_SortableGridDataModel[] = "com.sun.star.awt.grid.SortableGridDataModel";
 
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index da91945c0b0e..600687a3633b 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -212,10 +212,11 @@ Polygon VCLUnoHelper::CreatePolygon( const ::com::sun::star::uno::Sequence< sal_
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> VCLUnoHelper::CreateControlContainer( Window* pWindow )
 {
-    UnoControlContainer* pContainer = new UnoControlContainer( pWindow->GetComponentInterface( sal_True ) );
+    const uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
+    UnoControlContainer* pContainer = new UnoControlContainer( xFactory, pWindow->GetComponentInterface( sal_True ) );
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > x = pContainer;
 
-    UnoControlModel* pContainerModel = new UnoControlContainerModel;
+    UnoControlModel* pContainerModel = new UnoControlContainerModel( xFactory );
     pContainer->setModel( (::com::sun::star::awt::XControlModel*)pContainerModel );
 
     return x;
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component
index c147d2b2521d..690b3f324498 100644
--- a/toolkit/util/tk.component
+++ b/toolkit/util/tk.component
@@ -53,9 +53,12 @@
   <implementation name="stardiv.Toolkit.DefaultGridDataModel">
     <service name="com.sun.star.awt.grid.DefaultGridDataModel"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.GridColumn">
+  <implementation name="org.openoffice.comp.toolkit.GridColumn">
     <service name="com.sun.star.awt.grid.GridColumn"/>
   </implementation>
+  <implementation name="org.openoffice.comp.toolkit.SortableGridDataModel">
+    <service name="com.sun.star.awt.grid.SortableGridDataModel"/>
+  </implementation>
   <implementation name="stardiv.Toolkit.GridControl">
     <service name="com.sun.star.awt.grid.UnoControlGrid"/>
   </implementation>