fdo#46808, convert UnoControl and sub-classes to XComponentContext

Change-Id: I4ade267a44620f5a3af8009ac57a2456c62b83bc

23 files changed, 267 insertions, 291 deletions

diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index cbab23368ca3..18231f487283 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -66,8 +66,8 @@ namespace toolkit
     //= AnimatedImagesControl
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    AnimatedImagesControl::AnimatedImagesControl( Reference< XMultiServiceFactory > const & i_factory )
-        :AnimatedImagesControl_Base( i_factory )
+    AnimatedImagesControl::AnimatedImagesControl()
+        :AnimatedImagesControl_Base()
     {
     }
 
@@ -229,7 +229,7 @@ namespace toolkit
     //= AnimatedImagesControlModel
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    AnimatedImagesControlModel::AnimatedImagesControlModel( Reference< XMultiServiceFactory > const & i_factory )
+    AnimatedImagesControlModel::AnimatedImagesControlModel( Reference< com::sun::star::uno::XComponentContext > const & i_factory )
         :AnimatedImagesControlModel_Base( i_factory )
         ,m_pData( new AnimatedImagesControlModel_Data )
     {
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index cfa436e5c58b..2a9cbf866350 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -212,8 +212,8 @@ static const ::rtl::OUString& getStepPropertyName( )
 //  ----------------------------------------------------
 //  class ControlModelContainerBase
 //  ----------------------------------------------------
-ControlModelContainerBase::ControlModelContainerBase( const Reference< XMultiServiceFactory >& i_factory )
-    :ControlModelContainer_IBase( i_factory )
+ControlModelContainerBase::ControlModelContainerBase( const Reference< XComponentContext >& rxContext )
+    :ControlModelContainer_IBase( rxContext )
     ,maContainerListeners( *this )
     ,maChangeListeners ( GetMutex() )
     ,mbGroupsUpToDate( sal_False )
@@ -332,83 +332,79 @@ 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 >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlEditModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlFormattedFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlFormattedFieldModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlFormattedFieldModel >( m_xContext);
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlFileControlModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlFileControlModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlFileControlModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlButtonModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlButtonModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlButtonModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlImageControlModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlImageControlModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlImageControlModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlRadioButtonModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlRadioButtonModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlRadioButtonModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlCheckBoxModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlCheckBoxModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlCheckBoxModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlFixedHyperlinkModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlFixedHyperlinkModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlFixedHyperlinkModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlFixedTextModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlFixedTextModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlFixedTextModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlGroupBoxModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlGroupBoxModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlGroupBoxModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlListBoxModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlListBoxModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlListBoxModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlComboBoxModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlComboBoxModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlComboBoxModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlDateFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlDateFieldModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlDateFieldModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlTimeFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlTimeFieldModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlTimeFieldModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlNumericFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlNumericFieldModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlNumericFieldModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlCurrencyFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlCurrencyFieldModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlCurrencyFieldModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlPatternFieldModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlPatternFieldModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlPatternFieldModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlProgressBarModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlProgressBarModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlProgressBarModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlScrollBarModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlScrollBarModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlScrollBarModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlFixedLineModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlFixedLineModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlFixedLineModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlRoadmapModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlRoadmapModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlRoadmapModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_TreeControlModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoTreeModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoTreeModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_GridControlModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoGridModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoGridModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlTabPageContainerModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlTabPageContainerModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlTabPageContainerModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoMultiPageModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoMultiPageModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoMultiPageModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlTabPageModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoControlTabPageModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoControlTabPageModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoPageModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoPageModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoPageModel >( m_xContext );
     else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoFrameModel ) == 0 )
-        pNewModel = new OGeometryControlModel< UnoFrameModel >( xFactory );
+        pNewModel = new OGeometryControlModel< UnoFrameModel >( m_xContext );
 
     if ( !pNewModel )
     {
-        if ( xFactory.is() )
+        Reference< XInterface > xObject = m_xContext->getServiceManager()->createInstanceWithContext(aServiceSpecifier, m_xContext);
+        Reference< XServiceInfo > xSI( xObject, UNO_QUERY );
+        Reference< XCloneable > xCloneAccess( xSI, UNO_QUERY );
+        Reference< XAggregation > xAgg( xCloneAccess, UNO_QUERY );
+        if ( xAgg.is() )
         {
-            Reference< XInterface > xObject = xFactory->createInstance( aServiceSpecifier );
-            Reference< XServiceInfo > xSI( xObject, UNO_QUERY );
-            Reference< XCloneable > xCloneAccess( xSI, UNO_QUERY );
-            Reference< XAggregation > xAgg( xCloneAccess, UNO_QUERY );
-            if ( xAgg.is() )
+            if ( xSI->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel"))) )
             {
-                if ( xSI->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel"))) )
-                {
-                    // release 3 of the 4 references we have to the object
-                    xAgg.clear();
-                    xSI.clear();
-                    xObject.clear();
+                // release 3 of the 4 references we have to the object
+                xAgg.clear();
+                xSI.clear();
+                xObject.clear();
 
-                    pNewModel = new OCommonGeometryControlModel( xCloneAccess, aServiceSpecifier );
-                }
+                pNewModel = new OCommonGeometryControlModel( xCloneAccess, aServiceSpecifier );
             }
         }
     }
@@ -1358,8 +1354,9 @@ throw ( RuntimeException )
 //  ----------------------------------------------------
 //  class DialogContainerControl
 //  ----------------------------------------------------
-ControlContainerBase::ControlContainerBase( const Reference< XMultiServiceFactory >& i_factory )
-    :ContainerControl_IBase( i_factory )
+ControlContainerBase::ControlContainerBase( const Reference< XComponentContext >& rxContext )
+    :ContainerControl_IBase()
+    ,m_xContext(rxContext)
     ,mbSizeModified(false)
     ,mbPosModified(false)
 {
@@ -1385,8 +1382,7 @@ void ControlContainerBase::ImplInsertControl( Reference< XControlModel >& rxMode
 
     ::rtl::OUString aDefCtrl;
     xP->getPropertyValue( GetPropertyName( BASEPROPERTY_DEFAULTCONTROL ) ) >>= aDefCtrl;
-    Reference < XControl > xCtrl;
-    maContext.createComponent( aDefCtrl, xCtrl );
+    Reference < XControl > xCtrl( m_xContext->getServiceManager()->createInstanceWithContext(aDefCtrl, m_xContext), UNO_QUERY );
 
     DBG_ASSERT( xCtrl.is(), "ControlContainerBase::ImplInsertControl: could not create the control!" );
     if ( xCtrl.is() )
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 1d711d3ccfc0..7ad8b7e5dc7a 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -146,8 +146,8 @@ public:
 //  ----------------------------------------------------
 //  class UnoControlDialogModel
 //  ----------------------------------------------------
-UnoControlDialogModel::UnoControlDialogModel( const Reference< XMultiServiceFactory >& i_factory )
-    :ControlModelContainerBase( i_factory )
+UnoControlDialogModel::UnoControlDialogModel( const Reference< XComponentContext >& rxContext )
+    :ControlModelContainerBase( rxContext )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
 //  ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -279,8 +279,8 @@ void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32
 // = class UnoDialogControl
 // ============================================================================
 
-UnoDialogControl::UnoDialogControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
-    :UnoDialogControl_Base( i_factory )
+UnoDialogControl::UnoDialogControl( const uno::Reference< uno::XComponentContext >& rxContext )
+    :UnoDialogControl_Base( rxContext )
     ,maTopWindowListeners( *this )
     ,mbWindowListener(false)
 {
@@ -626,7 +626,7 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang
 //  ----------------------------------------------------
 //  class MultiPageControl
 //  ----------------------------------------------------
-UnoMultiPageControl::UnoMultiPageControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory) : ControlContainerBase( i_factory ), maTabListeners( *this )
+UnoMultiPageControl::UnoMultiPageControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext), maTabListeners( *this )
 {
     maComponentInfos.nWidth = 280;
     maComponentInfos.nHeight = 400;
@@ -825,7 +825,7 @@ void    UnoMultiPageControl::impl_createControlPeerIfNecessary( const uno::Refer
 
 // ------------- UnoMultiPageModel -----------------
 
-UnoMultiPageModel::UnoMultiPageModel( const Reference< XMultiServiceFactory >& i_factory ) : ControlModelContainerBase( i_factory )
+UnoMultiPageModel::UnoMultiPageModel( const Reference< XComponentContext >& rxContext ) : ControlModelContainerBase( rxContext )
 {
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -929,7 +929,7 @@ sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl(  ) throw (RuntimeException
 //  ----------------------------------------------------
 //  class UnoPageControl
 //  ----------------------------------------------------
-UnoPageControl::UnoPageControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory ) : ControlContainerBase( i_factory )
+UnoPageControl::UnoPageControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext)
 {
     maComponentInfos.nWidth = 280;
     maComponentInfos.nHeight = 400;
@@ -947,7 +947,7 @@ UnoPageControl::~UnoPageControl()
 
 // ------------- UnoPageModel -----------------
 
-UnoPageModel::UnoPageModel( const Reference< XMultiServiceFactory >& i_factory ) : ControlModelContainerBase( i_factory )
+UnoPageModel::UnoPageModel( const Reference< XComponentContext >& rxContext ) : ControlModelContainerBase( rxContext )
 {
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -1036,7 +1036,7 @@ sal_Bool SAL_CALL UnoPageModel::getGroupControl(  ) throw (RuntimeException)
 //  ----------------------------------------------------
 //  class UnoFrameControl
 //  ----------------------------------------------------
-UnoFrameControl::UnoFrameControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory ) : ControlContainerBase( i_factory )
+UnoFrameControl::UnoFrameControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext)
 {
     maComponentInfos.nWidth = 280;
     maComponentInfos.nHeight = 400;
@@ -1112,7 +1112,7 @@ void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
 
 // ------------- UnoFrameModel -----------------
 
-UnoFrameModel::UnoFrameModel(  const Reference< XMultiServiceFactory >& i_factory ) : ControlModelContainerBase( i_factory )
+UnoFrameModel::UnoFrameModel(  const Reference< XComponentContext >& rxContext ) : ControlModelContainerBase( rxContext )
 {
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 79e905bbe11e..bb7bd383625d 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -112,8 +112,8 @@ namespace toolkit
     // = UnoControlFormattedFieldModel
     // ===================================================================
     // -------------------------------------------------------------------
-    UnoControlFormattedFieldModel::UnoControlFormattedFieldModel( const Reference< XMultiServiceFactory >& i_factory )
-        :UnoControlModel( i_factory )
+    UnoControlFormattedFieldModel::UnoControlFormattedFieldModel( const Reference< XComponentContext >& rxContext )
+        :UnoControlModel( rxContext )
         ,m_bRevokedAsClient( false )
         ,m_bSettingValueAndText( false )
     {
@@ -421,8 +421,8 @@ namespace toolkit
     // = UnoFormattedFieldControl
     // ===================================================================
     // -------------------------------------------------------------------
-    UnoFormattedFieldControl::UnoFormattedFieldControl( const Reference< XMultiServiceFactory >& i_factory )
-        :UnoSpinFieldControl( i_factory )
+    UnoFormattedFieldControl::UnoFormattedFieldControl()
+        :UnoSpinFieldControl()
     {
     }
 
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 94f1d9eb41af..22bc2d743624 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -68,8 +68,8 @@ namespace
 }
 
 //----------------------------------------------------------------------------------------------------------------------
-UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
-        :UnoControlModel( i_factory )
+UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+        :UnoControlModel( rxContext )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -89,8 +89,8 @@ UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::
     ImplRegisterProperty( BASEPROPERTY_GRID_SHOWCOLUMNHEADER );
     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_DATAMODEL, makeAny( lcl_getDefaultDataModel_throw( m_xContext ) ) );
+    ImplRegisterProperty( BASEPROPERTY_GRID_COLUMNMODEL, makeAny( lcl_getDefaultColumnModel_throw( m_xContext ) ) );
     ImplRegisterProperty( BASEPROPERTY_GRID_SELECTIONMODE );
     ImplRegisterProperty( BASEPROPERTY_FONTRELIEF );
     ImplRegisterProperty( BASEPROPERTY_FONTEMPHASISMARK );
@@ -128,7 +128,7 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
             DBG_UNHANDLED_EXCEPTION();
         }
         if ( !xDataModel.is() )
-            xDataModel = lcl_getDefaultDataModel_throw( maContext );
+            xDataModel = lcl_getDefaultDataModel_throw( m_xContext );
         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,
@@ -147,7 +147,7 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
             DBG_UNHANDLED_EXCEPTION();
         }
         if ( !xColumnModel.is() )
-            xColumnModel = lcl_getDefaultColumnModel_throw( maContext );
+            xColumnModel = lcl_getDefaultColumnModel_throw( m_xContext );
         UnoControlModel::setFastPropertyValue_NoBroadcast( BASEPROPERTY_GRID_COLUMNMODEL, makeAny( xColumnModel ) );
             // same comment as above: do not use our own setPropertyValue here.
     }
@@ -270,8 +270,8 @@ Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo(  ) throw(Runtime
 //======================================================================================================================
 //= UnoGridControl
 //======================================================================================================================
-UnoGridControl::UnoGridControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoGridControl_Base( i_factory )
+UnoGridControl::UnoGridControl()
+    :UnoGridControl_Base()
     ,m_aSelectionListeners( *this )
     ,m_pEventForwarder( new GridEventForwarder( *this ) )
 {
@@ -447,14 +447,14 @@ void SAL_CALL UnoGridControl::removeSelectionListener(const ::com::sun::star::un
 
 }//namespace toolkit
 
-Reference< XInterface > SAL_CALL GridControl_CreateInstance( const Reference< XMultiServiceFactory >& i_factory )
+Reference< XInterface > SAL_CALL GridControl_CreateInstance( const Reference< XMultiServiceFactory >& )
 {
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridControl( i_factory ) );
+    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridControl() );
 }
 
 Reference< XInterface > SAL_CALL GridControlModel_CreateInstance( const Reference< XMultiServiceFactory >& i_factory )
 {
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridModel( i_factory ) );
+    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridModel( comphelper::getComponentContext(i_factory) ) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index 383d36e8e756..607d4552fe98 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -47,7 +47,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-    UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+    UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
     UnoGridModel( const UnoGridModel& rModel );
 
     UnoControlModel* Clone() const;
@@ -79,7 +79,7 @@ typedef ::cppu::ImplInheritanceHelper2  <   UnoControlBase
 class UnoGridControl : public UnoGridControl_Base
 {
 public:
-    UnoGridControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+    UnoGridControl();
     ::rtl::OUString             GetComponentServiceName();
 
     // ::com::sun::star::lang::XComponent
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 1afd7c9e2c62..04049a06856b 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -54,7 +54,7 @@ static void lcl_throwIndexOutOfBoundsException( )
     // = UnoControlRoadmapModel
     // ===================================================================
     // -------------------------------------------------------------------
-    UnoControlRoadmapModel::UnoControlRoadmapModel( const Reference< XMultiServiceFactory >& i_factory )
+    UnoControlRoadmapModel::UnoControlRoadmapModel( const Reference< XComponentContext >& i_factory )
         :UnoControlRoadmapModel_Base( i_factory )
         ,maContainerListeners( *this )
     {
@@ -358,8 +358,8 @@ static void lcl_throwIndexOutOfBoundsException( )
     // = UnoRoadmapControl
     // ===================================================================
     // -------------------------------------------------------------------
-    UnoRoadmapControl::UnoRoadmapControl( const Reference< XMultiServiceFactory >& i_factory )
-        :UnoControlRoadmap_Base( i_factory )
+    UnoRoadmapControl::UnoRoadmapControl()
+        :UnoControlRoadmap_Base()
         ,maItemListeners( *this )
     {
     }
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index 2c4513dd286b..ed5751357cd0 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -45,14 +45,14 @@ 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;
+    using ::com::sun::star::uno::XComponentContext;
     /** === end UNO using === **/
 
     //==================================================================================================================
     //= SpinningProgressControlModel
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    SpinningProgressControlModel::SpinningProgressControlModel( Reference< XMultiServiceFactory > const & i_factory )
+    SpinningProgressControlModel::SpinningProgressControlModel( Reference< XComponentContext > const & i_factory )
         :SpinningProgressControlModel_Base( i_factory )
     {
         // default image sets
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 073dc03bd61a..071685c32a47 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -46,7 +46,7 @@ using ::com::sun::star::awt::tab::XTabPageModel;
 //  ----------------------------------------------------
 //  class UnoControlTabPageContainerModel
 //  ----------------------------------------------------
-UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Reference< XMultiServiceFactory >& i_factory )
+UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Reference< XComponentContext >& i_factory )
     :UnoControlTabPageContainerModel_Base( i_factory )
     ,maContainerListeners( *this )
 {
@@ -97,7 +97,7 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlTabPageContaine
 
 namespace
 {
-    Reference< XTabPageModel > lcl_createTabPageModel( ::comphelper::ComponentContext const & i_context,
+    Reference< XTabPageModel > lcl_createTabPageModel( Reference<XComponentContext> const & i_context,
         Sequence< Any > const & i_initArguments, Reference< XPropertySet > const & i_parentModel )
     {
         try
@@ -108,9 +108,9 @@ namespace
 
             Reference< XInterface > xInstance;
             if ( isGeometryControlModel )
-                xInstance = *( new OGeometryControlModel< UnoControlTabPageModel >( i_context.getLegacyServiceFactory() ) );
+                xInstance = *( new OGeometryControlModel< UnoControlTabPageModel >( i_context ) );
             else
-                xInstance = *( new UnoControlTabPageModel( i_context.getLegacyServiceFactory() ) );
+                xInstance = *( new UnoControlTabPageModel( i_context ) );
 
             Reference< XTabPageModel > const xTabPageModel( xInstance, UNO_QUERY_THROW );
             Reference< XInitialization > const xInit( xTabPageModel, UNO_QUERY_THROW );
@@ -134,7 +134,7 @@ Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::createTabPa
 {
     Sequence< Any > aInitArgs(1);
     aInitArgs[0] <<= i_tabPageID;
-    return lcl_createTabPageModel( maContext, aInitArgs, this );
+    return lcl_createTabPageModel( m_xContext, aInitArgs, this );
 }
 
 Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage( ::sal_Int16 i_tabPageID, const ::rtl::OUString& i_resourceURL ) throw (RuntimeException)
@@ -142,7 +142,7 @@ Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage
     Sequence< Any > aInitArgs(2);
     aInitArgs[0] <<= i_tabPageID;
     aInitArgs[1] <<= i_resourceURL;
-    return lcl_createTabPageModel( maContext, aInitArgs, this );
+    return lcl_createTabPageModel( m_xContext, aInitArgs, this );
 }
 
 void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex, const com::sun::star::uno::Any& aElement) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException)
@@ -220,8 +220,8 @@ void UnoControlTabPageContainerModel::removeContainerListener( const Reference<
 //  ----------------------------------------------------
 //  class UnoControlTabPageContainer
 //  ----------------------------------------------------
-UnoControlTabPageContainer::UnoControlTabPageContainer( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlTabPageContainer_Base( i_factory )
+UnoControlTabPageContainer::UnoControlTabPageContainer( const uno::Reference< uno::XComponentContext >& rxContext )
+    :UnoControlTabPageContainer_Base(rxContext)
     ,m_aTabPageListeners( *this )
 {
 }
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index fd7703d08649..78e3a27f040d 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::util;
 //  ----------------------------------------------------
 //  class UnoControlTabPageModel
 //  ----------------------------------------------------
-UnoControlTabPageModel::UnoControlTabPageModel( Reference< XMultiServiceFactory > const & i_factory )
+UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > const & i_factory )
     :ControlModelContainerBase( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
@@ -131,7 +131,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( maContext.getUNOContext(),sURL);
+        Reference<container::XNameContainer > xDialogModel = awt::UnoControlDialogModelProvider::create( m_xContext, sURL );
         if ( xDialogModel.is() )
         {
             Sequence< ::rtl::OUString> aNames = xDialogModel->getElementNames();
@@ -183,8 +183,8 @@ Sequence<rtl::OUString> SAL_CALL UnoControlTabPageModel_getSupportedServiceNames
 // = class UnoControlTabPage
 // ============================================================================
 
-UnoControlTabPage::UnoControlTabPage( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlTabPage_Base( i_factory )
+UnoControlTabPage::UnoControlTabPage( const uno::Reference< uno::XComponentContext >& rxContext )
+    :UnoControlTabPage_Base(rxContext)
     ,m_bWindowListener(false)
 {
     maComponentInfos.nWidth = 280;
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index e71a74ebfa78..f2293bc6edec 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -36,7 +36,7 @@ namespace toolkit
     //= UnoControlScrollBarModel
     //====================================================================
     //--------------------------------------------------------------------
-    UnoControlScrollBarModel::UnoControlScrollBarModel( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+    UnoControlScrollBarModel::UnoControlScrollBarModel( const uno::Reference< uno::XComponentContext >& i_factory )
         :UnoControlModel( i_factory )
     {
         UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXScrollBar );
@@ -86,8 +86,8 @@ namespace toolkit
     //====================================================================
     //= UnoControlScrollBarModel
     //====================================================================
-    UnoScrollBarControl::UnoScrollBarControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
-        :UnoControlBase( i_factory )
+    UnoScrollBarControl::UnoScrollBarControl()
+        :UnoControlBase()
         ,maAdjustmentListeners( *this )
     {
     }
diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
index 09a7f4099186..1b893b19805b 100644
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ b/toolkit/source/controls/tksimpleanimation.cxx
@@ -33,7 +33,7 @@ namespace toolkit
     //= UnoSimpleAnimationControlModel
     //====================================================================
     //--------------------------------------------------------------------
-    UnoSimpleAnimationControlModel::UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+    UnoSimpleAnimationControlModel::UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory )
         :UnoControlModel( i_factory )
     {
         ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
@@ -111,8 +111,8 @@ namespace toolkit
     //= UnoSimpleAnimationControl
     //====================================================================
     //--------------------------------------------------------------------
-    UnoSimpleAnimationControl::UnoSimpleAnimationControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
-        :UnoSimpleAnimationControl_Base( i_factory )
+    UnoSimpleAnimationControl::UnoSimpleAnimationControl()
+        :UnoSimpleAnimationControl_Base()
     {
     }
 
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index b86ce17290ed..ef5a9665c993 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -39,7 +39,7 @@ namespace toolkit
     //= UnoSpinButtonModel
     //====================================================================
     //--------------------------------------------------------------------
-    UnoSpinButtonModel::UnoSpinButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+    UnoSpinButtonModel::UnoSpinButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory )
         :UnoControlModel( i_factory )
     {
         ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -127,8 +127,8 @@ namespace toolkit
     //= UnoSpinButtonControl
     //====================================================================
     //--------------------------------------------------------------------
-    UnoSpinButtonControl::UnoSpinButtonControl( const Reference< XMultiServiceFactory >& i_factory )
-        :UnoControlBase( i_factory )
+    UnoSpinButtonControl::UnoSpinButtonControl()
+        :UnoControlBase()
         ,maAdjustmentListeners( *this )
     {
     }
diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx
index 7de89801210b..7eff4193f3c9 100644
--- a/toolkit/source/controls/tkthrobber.cxx
+++ b/toolkit/source/controls/tkthrobber.cxx
@@ -33,7 +33,7 @@ namespace toolkit
     //= UnoThrobberControlModel
     //====================================================================
     //--------------------------------------------------------------------
-    UnoThrobberControlModel::UnoThrobberControlModel( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+    UnoThrobberControlModel::UnoThrobberControlModel( const uno::Reference< uno::XComponentContext >& i_factory )
         :UnoControlModel( i_factory )
     {
         ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -109,8 +109,8 @@ namespace toolkit
     //= UnoThrobberControl
     //====================================================================
     //--------------------------------------------------------------------
-    UnoThrobberControl::UnoThrobberControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
-        :UnoControlBase( i_factory )
+    UnoThrobberControl::UnoThrobberControl()
+        :UnoControlBase()
     {
     }
 
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index f16245a05be5..69e88eb9d522 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -43,7 +43,7 @@ namespace toolkit
 //  ----------------------------------------------------
 //  class UnoTreeModel
 //  ----------------------------------------------------
-UnoTreeModel::UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+UnoTreeModel::UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory )
     :UnoControlModel( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -129,8 +129,8 @@ Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo(  ) throw(Runtime
 //  ----------------------------------------------------
 //  class UnoTreeControl
 //  ----------------------------------------------------
-UnoTreeControl::UnoTreeControl( const Reference< XMultiServiceFactory >& i_factory )
-: UnoTreeControl_Base( i_factory )
+UnoTreeControl::UnoTreeControl()
+: UnoTreeControl_Base()
 , maSelectionListeners( *this )
 , maTreeExpansionListeners( *this )
 , maTreeEditListeners( *this )
@@ -442,14 +442,14 @@ void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk
 
 }
 
-Reference< XInterface > SAL_CALL TreeControl_CreateInstance( const Reference< XMultiServiceFactory >& i_factory )
+Reference< XInterface > SAL_CALL TreeControl_CreateInstance( const Reference< XMultiServiceFactory >& )
 {
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoTreeControl( i_factory ) );
+    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoTreeControl() );
 }
 
 Reference< XInterface > SAL_CALL TreeControlModel_CreateInstance( const Reference< XMultiServiceFactory >& i_factory )
 {
-    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoTreeModel( i_factory ) );
+    return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoTreeModel( comphelper::getComponentContext(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 0dd2f7eef35b..a36d242f637a 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.hxx
@@ -46,7 +46,7 @@ protected:
     ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
 
 public:
-    UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+    UnoTreeModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
     UnoTreeModel( const UnoTreeModel& rModel );
 
     UnoControlModel* Clone() const;
@@ -69,7 +69,7 @@ typedef ::cppu::ImplInheritanceHelper1< UnoControlBase, ::com::sun::star::awt::t
 class UnoTreeControl : public UnoTreeControl_Base
 {
 public:
-    UnoTreeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+    UnoTreeControl();
     ::rtl::OUString             GetComponentServiceName();
 
     // ::com::sun::star::lang::XComponent
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 6cefb82b6d85..01944885c150 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -21,7 +21,6 @@
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <toolkit/controls/unocontrol.hxx>
@@ -136,27 +135,8 @@ struct UnoControl_Data
 //  class UnoControl
 //  ----------------------------------------------------
 DBG_NAME( UnoControl )
-UnoControl::UnoControl()
-    :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 )
+UnoControl::UnoControl() :
+      maDisposeListeners( *this )
     , maWindowListeners( *this )
     , maFocusListeners( *this )
     , maKeyListeners( *this )
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index e525203c2bde..d228b2e7e050 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -395,15 +395,15 @@ void SAL_CALL DialogStepChangedListener::propertyChange( const  beans::PropertyC
 //  ----------------------------------------------------
 //  class UnoControlContainer
 //  ----------------------------------------------------
-UnoControlContainer::UnoControlContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
-    :UnoControlContainer_Base( i_factory )
+UnoControlContainer::UnoControlContainer()
+    :UnoControlContainer_Base()
     ,maCListeners( *this )
 {
     mpControls = new UnoControlHolderList;
 }
 
-UnoControlContainer::UnoControlContainer( const uno::Reference< lang::XMultiServiceFactory >& i_factory, const uno::Reference< awt::XWindowPeer >& xP )
-    :UnoControlContainer_Base( i_factory )
+UnoControlContainer::UnoControlContainer(const uno::Reference< awt::XWindowPeer >& xP )
+    :UnoControlContainer_Base()
     ,maCListeners( *this )
 {
     setPeer( xP );
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 912d748f3918..4af12d9c7226 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -26,7 +26,7 @@
 //  ----------------------------------------------------
 //  class UnoControlContainerModel
 //  ----------------------------------------------------
-UnoControlContainerModel::UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+UnoControlContainerModel::UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory )
     :UnoControlModel( i_factory )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 4bff90152583..6e35c664e465 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -112,12 +112,12 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId,
 //  ----------------------------------------------------
 //  class UnoControlModel
 //  ----------------------------------------------------
-UnoControlModel::UnoControlModel( const Reference< XMultiServiceFactory >& i_factory )
+UnoControlModel::UnoControlModel( const Reference< XComponentContext >& rxContext )
     :UnoControlModel_Base()
     ,MutexAndBroadcastHelper()
     ,OPropertySetHelper( BrdcstHelper )
     ,maDisposeListeners( *this )
-    ,maContext( i_factory )
+    ,m_xContext( rxContext )
 {
     // Insert properties from Model into table,
     // only existing properties are valid, even if they're VOID
@@ -129,7 +129,7 @@ UnoControlModel::UnoControlModel( const UnoControlModel& rModel )
     , OPropertySetHelper( BrdcstHelper )
     , maData( rModel.maData )
     , maDisposeListeners( *this )
-    , maContext( rModel.maContext )
+    , m_xContext( rModel.m_xContext )
 {
 }
 
@@ -330,7 +330,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
 
                 // the remaining is the locale
                 LanguageTag aLanguageTag( sDefaultCurrency);
-                LocaleDataWrapper aLocaleInfo( maContext.getUNOContext(), aLanguageTag );
+                LocaleDataWrapper aLocaleInfo( m_xContext, aLanguageTag );
                 if ( sBankSymbol.isEmpty() )
                     sBankSymbol = aLocaleInfo.getCurrBankSymbol();
 
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index ac54f2368154..aa48fba639bb 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -121,8 +121,8 @@ ImageHelper::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
 //  ----------------------------------------------------
 //  class UnoControlEditModel
 //  ----------------------------------------------------
-UnoControlEditModel::UnoControlEditModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlEditModel::UnoControlEditModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit );
 }
@@ -173,8 +173,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInf
 //  ----------------------------------------------------
 //  class UnoEditControl
 //  ----------------------------------------------------
-UnoEditControl::UnoEditControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlBase( i_factory )
+UnoEditControl::UnoEditControl()
+    :UnoControlBase()
     ,maTextListeners( *this )
     ,mnMaxTextLen( 0 )
     ,mbSetTextInPeer( sal_False )
@@ -491,8 +491,8 @@ uno::Sequence< ::rtl::OUString > UnoEditControl::getSupportedServiceNames() thro
 //  ----------------------------------------------------
 //  class UnoControlFileControlModel
 //  ----------------------------------------------------
-UnoControlFileControlModel::UnoControlFileControlModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlFileControlModel::UnoControlFileControlModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     ImplRegisterProperty( BASEPROPERTY_ALIGN );
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -551,8 +551,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropert
 //  ----------------------------------------------------
 //  class UnoFileControl
 //  ----------------------------------------------------
-UnoFileControl::UnoFileControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoEditControl( i_factory )
+UnoFileControl::UnoFileControl()
+    :UnoEditControl()
 {
 }
 
@@ -634,8 +634,8 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
 //  ----------------------------------------------------
 //  class UnoControlButtonModel
 //  ----------------------------------------------------
-UnoControlButtonModel::UnoControlButtonModel( const Reference< XMultiServiceFactory >& i_factory )
-    :GraphicControlModel( i_factory )
+UnoControlButtonModel::UnoControlButtonModel( const Reference< XComponentContext >& rxContext )
+    :GraphicControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXButton );
 
@@ -691,8 +691,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetI
 //  ----------------------------------------------------
 //  class UnoButtonControl
 //  ----------------------------------------------------
-UnoButtonControl::UnoButtonControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
-    :UnoButtonControl_Base( i_factory )
+UnoButtonControl::UnoButtonControl()
+    :UnoButtonControl_Base()
     ,maActionListeners( *this )
     ,maItemListeners( *this )
 {
@@ -831,8 +831,8 @@ awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(
 //  ----------------------------------------------------
 //  class UnoControlImageControlModel
 //  ----------------------------------------------------
-UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XMultiServiceFactory >& i_factory )
-    :GraphicControlModel( i_factory )
+UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XComponentContext >& rxContext )
+    :GraphicControlModel( rxContext )
     ,mbAdjustingImageScaleMode( false )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXImageControl );
@@ -913,8 +913,8 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal
 //  ----------------------------------------------------
 //  class UnoImageControlControl
 //  ----------------------------------------------------
-UnoImageControlControl::UnoImageControlControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoImageControlControl_Base( i_factory )
+UnoImageControlControl::UnoImageControlControl()
+    :UnoImageControlControl_Base()
     ,maActionListeners( *this )
 {
     // TODO: Where should I look for defaults?
@@ -958,8 +958,8 @@ awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize )
 //  ----------------------------------------------------
 //  class UnoControlRadioButtonModel
 //  ----------------------------------------------------
-UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XMultiServiceFactory >& i_factory )
-    :GraphicControlModel( i_factory )
+UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XComponentContext >& rxContext )
+    :GraphicControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton );
 }
@@ -1006,8 +1006,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropert
 //  ----------------------------------------------------
 //  class UnoRadioButtonControl
 //  ----------------------------------------------------
-UnoRadioButtonControl::UnoRadioButtonControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoRadioButtonControl_Base( i_factory )
+UnoRadioButtonControl::UnoRadioButtonControl()
+    :UnoRadioButtonControl_Base()
     ,maItemListeners( *this )
     ,maActionListeners( *this )
 {
@@ -1168,8 +1168,8 @@ awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) t
 //  ----------------------------------------------------
 //  class UnoControlCheckBoxModel
 //  ----------------------------------------------------
-UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XMultiServiceFactory >& i_factory )
-    :GraphicControlModel( i_factory )
+UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XComponentContext >& rxContext )
+    :GraphicControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox );
 }
@@ -1216,8 +1216,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySe
 //  ----------------------------------------------------
 //  class UnoCheckBoxControl
 //  ----------------------------------------------------
-UnoCheckBoxControl::UnoCheckBoxControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
-    :UnoCheckBoxControl_Base( i_factory )
+UnoCheckBoxControl::UnoCheckBoxControl()
+    :UnoCheckBoxControl_Base()
     ,maItemListeners( *this ), maActionListeners( *this )
 {
     maComponentInfos.nWidth = 100;
@@ -1353,8 +1353,8 @@ awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) thro
 //  ----------------------------------------------------
 //  class UnoControlFixedHyperlinkModel
 //  ----------------------------------------------------
-UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink );
 }
@@ -1409,8 +1409,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getProp
 //  ----------------------------------------------------
 //  class UnoFixedHyperlinkControl
 //  ----------------------------------------------------
-UnoFixedHyperlinkControl::UnoFixedHyperlinkControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlBase( i_factory )
+UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
+    :UnoControlBase()
     ,maActionListeners( *this )
 {
     maComponentInfos.nWidth = 100;
@@ -1540,8 +1540,8 @@ void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::X
 //  ----------------------------------------------------
 //  class UnoControlFixedTextModel
 //  ----------------------------------------------------
-UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedText );
 }
@@ -1591,8 +1591,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertyS
 //  ----------------------------------------------------
 //  class UnoFixedTextControl
 //  ----------------------------------------------------
-UnoFixedTextControl::UnoFixedTextControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlBase( i_factory )
+UnoFixedTextControl::UnoFixedTextControl()
+    :UnoControlBase()
 {
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 12;
@@ -1672,8 +1672,8 @@ awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) thr
 //  ----------------------------------------------------
 //  class UnoControlGroupBoxModel
 //  ----------------------------------------------------
-UnoControlGroupBoxModel::UnoControlGroupBoxModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlGroupBoxModel::UnoControlGroupBoxModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
     ImplRegisterProperty( BASEPROPERTY_ENABLED );
@@ -1724,8 +1724,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySe
 //  ----------------------------------------------------
 //  class UnoGroupBoxControl
 //  ----------------------------------------------------
-UnoGroupBoxControl::UnoGroupBoxControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlBase( i_factory )
+UnoGroupBoxControl::UnoGroupBoxControl()
+    :UnoControlBase()
 {
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 100;
@@ -1847,8 +1847,8 @@ private:
 // = UnoControlListBoxModel
 // =====================================================================================================================
 // ---------------------------------------------------------------------------------------------------------------------
-UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XMultiServiceFactory >& i_factory, ConstructorMode const i_mode )
-    :UnoControlListBoxModel_Base( i_factory )
+UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XComponentContext >& rxContext, ConstructorMode const i_mode )
+    :UnoControlListBoxModel_Base( rxContext )
     ,m_pData( new UnoControlListBoxModel_Data( *this ) )
     ,m_aItemListListeners( GetMutex() )
 {
@@ -2290,8 +2290,8 @@ void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_n
 //  ----------------------------------------------------
 //  class UnoListBoxControl
 //  ----------------------------------------------------
-UnoListBoxControl::UnoListBoxControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoListBoxControl_Base( i_factory )
+UnoListBoxControl::UnoListBoxControl()
+    :UnoListBoxControl_Base()
     ,maActionListeners( *this )
     ,maItemListeners( *this )
 {
@@ -2714,8 +2714,8 @@ void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEv
 //  ----------------------------------------------------
 //  class UnoControlComboBoxModel
 //  ----------------------------------------------------
-UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlListBoxModel( i_factory, ConstructWithoutProperties )
+UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlListBoxModel( rxContext, ConstructWithoutProperties )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXComboBox );
 }
@@ -2790,8 +2790,8 @@ uno::Any UnoControlComboBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
 //  ----------------------------------------------------
 //  class UnoComboBoxControl
 //  ----------------------------------------------------
-UnoComboBoxControl::UnoComboBoxControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoEditControl( i_factory )
+UnoComboBoxControl::UnoComboBoxControl()
+    :UnoEditControl()
     ,maActionListeners( *this )
     ,maItemListeners( *this )
 {
@@ -3104,8 +3104,8 @@ sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException
 //  ----------------------------------------------------
 //  UnoSpinFieldControl
 //  ----------------------------------------------------
-UnoSpinFieldControl::UnoSpinFieldControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoEditControl( i_factory )
+UnoSpinFieldControl::UnoSpinFieldControl()
+    :UnoEditControl()
     ,maSpinListeners( *this )
 {
     mbRepeat = sal_False;
@@ -3196,8 +3196,8 @@ void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::sta
 //  ----------------------------------------------------
 //  class UnoControlDateFieldModel
 //  ----------------------------------------------------
-UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField );
 }
@@ -3242,8 +3242,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertyS
 //  ----------------------------------------------------
 //  class UnoDateFieldControl
 //  ----------------------------------------------------
-UnoDateFieldControl::UnoDateFieldControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoSpinFieldControl( i_factory )
+UnoDateFieldControl::UnoDateFieldControl()
+    :UnoSpinFieldControl()
 {
     mnFirst = Date( 1, 1, 1900 ).GetDate();
     mnLast = Date( 31, 12, 2200 ).GetDate();
@@ -3438,8 +3438,8 @@ sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException)
 //  ----------------------------------------------------
 //  class UnoControlTimeFieldModel
 //  ----------------------------------------------------
-UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField );
 }
@@ -3484,8 +3484,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertyS
 //  ----------------------------------------------------
 //  class UnoTimeFieldControl
 //  ----------------------------------------------------
-UnoTimeFieldControl::UnoTimeFieldControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoSpinFieldControl( i_factory )
+UnoTimeFieldControl::UnoTimeFieldControl()
+    :UnoSpinFieldControl()
 {
     mnFirst = Time( 0, 0 ).GetTime();
     mnLast = Time( 23, 59, 59, 99 ).GetTime();
@@ -3639,8 +3639,8 @@ sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException)
 //  ----------------------------------------------------
 //  class UnoControlNumericFieldModel
 //  ----------------------------------------------------
-UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField );
 }
@@ -3685,8 +3685,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getProper
 //  ----------------------------------------------------
 //  class UnoNumericFieldControl
 //  ----------------------------------------------------
-UnoNumericFieldControl::UnoNumericFieldControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoSpinFieldControl( i_factory )
+UnoNumericFieldControl::UnoNumericFieldControl()
+    :UnoSpinFieldControl()
 {
     mnFirst = 0;
     mnLast = 0x7FFFFFFF;
@@ -3837,8 +3837,8 @@ sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException
 //  ----------------------------------------------------
 //  class UnoControlCurrencyFieldModel
 //  ----------------------------------------------------
-UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField );
 }
@@ -3887,8 +3887,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPrope
 //  ----------------------------------------------------
 //  class UnoCurrencyFieldControl
 //  ----------------------------------------------------
-UnoCurrencyFieldControl::UnoCurrencyFieldControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoSpinFieldControl( i_factory )
+UnoCurrencyFieldControl::UnoCurrencyFieldControl()
+    :UnoSpinFieldControl()
 {
     mnFirst = 0;
     mnLast = 0x7FFFFFFF;
@@ -4038,8 +4038,8 @@ sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeExceptio
 //  ----------------------------------------------------
 //  class UnoControlPatternFieldModel
 //  ----------------------------------------------------
-UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField );
 }
@@ -4082,8 +4082,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getProper
 //  ----------------------------------------------------
 //  class UnoPatternFieldControl
 //  ----------------------------------------------------
-UnoPatternFieldControl::UnoPatternFieldControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoSpinFieldControl( i_factory )
+UnoPatternFieldControl::UnoPatternFieldControl()
+    :UnoSpinFieldControl()
 {
 }
 
@@ -4172,8 +4172,8 @@ sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException)
 //  ----------------------------------------------------
 //  class UnoControlProgressBarModel
 //  ----------------------------------------------------
-UnoControlProgressBarModel::UnoControlProgressBarModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlProgressBarModel::UnoControlProgressBarModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -4229,8 +4229,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropert
 //  ----------------------------------------------------
 //  class UnoProgressBarControl
 //  ----------------------------------------------------
-UnoProgressBarControl::UnoProgressBarControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlBase( i_factory )
+UnoProgressBarControl::UnoProgressBarControl()
+    :UnoControlBase()
 {
 }
 
@@ -4306,8 +4306,8 @@ sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::Runtime
 //  ----------------------------------------------------
 //  class UnoControlFixedLineModel
 //  ----------------------------------------------------
-UnoControlFixedLineModel::UnoControlFixedLineModel( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlModel( i_factory )
+UnoControlFixedLineModel::UnoControlFixedLineModel( const Reference< XComponentContext >& rxContext )
+    :UnoControlModel( rxContext )
 {
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
@@ -4358,8 +4358,8 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertyS
 //  ----------------------------------------------------
 //  class UnoFixedLineControl
 //  ----------------------------------------------------
-UnoFixedLineControl::UnoFixedLineControl( const Reference< XMultiServiceFactory >& i_factory )
-    :UnoControlBase( i_factory )
+UnoFixedLineControl::UnoFixedLineControl()
+    :UnoControlBase()
 {
     maComponentInfos.nWidth = 100;      // ??
     maComponentInfos.nHeight = 100;     // ??
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index bbf7089e636e..ee1d76b93f2a 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <toolkit/controls/geometrycontrolmodel.hxx>
+#include <comphelper/processfactory.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
@@ -91,14 +92,14 @@ namespace toolkit
     ::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 >& ) \
     { return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ImplName ); }
 
-#define IMPL_CREATEINSTANCE2( ImplName ) \
+#define IMPL_CREATEINSTANCE_CTX( 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 >& i_factory ) \
-    { return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ImplName( i_factory ) ); }
+    { return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ImplName( comphelper::getComponentContext(i_factory) ) ); }
 
 #define IMPL_CREATE_INSTANCE_WITH_GEOMETRY( 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 >& i_factory ) \
 { \
-    return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new OGeometryControlModel< ImplName >( i_factory ) ); \
+    return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new OGeometryControlModel< ImplName >( comphelper::getComponentContext( i_factory ) ) ); \
 }
 
 #define GET_FACTORY_WITH_IMPL_PREFIX( ClassName, ImplNamePrefix, ServiceName1, ServiceName2 ) \
@@ -117,74 +118,74 @@ using namespace toolkit;
 IMPL_CREATEINSTANCE( VCLXToolkit )
 IMPL_CREATEINSTANCE( StdTabController )
 IMPL_CREATEINSTANCE( StdTabControllerModel )
-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( UnoMultiPageModel )
-IMPL_CREATEINSTANCE2( UnoPageModel )
-IMPL_CREATEINSTANCE2( UnoFrameModel )
-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_CREATEINSTANCE2( UnoMultiPageControl )
-IMPL_CREATEINSTANCE2( UnoPageControl )
-IMPL_CREATEINSTANCE2( UnoFrameControl )
+IMPL_CREATEINSTANCE( UnoButtonControl )
+IMPL_CREATEINSTANCE( UnoCheckBoxControl )
+IMPL_CREATEINSTANCE( UnoComboBoxControl )
+IMPL_CREATEINSTANCE_CTX( UnoControlButtonModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlCheckBoxModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlComboBoxModel )
+IMPL_CREATEINSTANCE( UnoControlContainer )
+IMPL_CREATEINSTANCE_CTX( UnoControlContainerModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlCurrencyFieldModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlDateFieldModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlEditModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlFileControlModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlFixedHyperlinkModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlFixedTextModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlFormattedFieldModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlGroupBoxModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlImageControlModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlListBoxModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlNumericFieldModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlPatternFieldModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlRadioButtonModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlTimeFieldModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlProgressBarModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlScrollBarModel )
+IMPL_CREATEINSTANCE_CTX( UnoSpinButtonModel )
+IMPL_CREATEINSTANCE_CTX( UnoMultiPageModel )
+IMPL_CREATEINSTANCE_CTX( UnoPageModel )
+IMPL_CREATEINSTANCE_CTX( UnoFrameModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlFixedLineModel )
+IMPL_CREATEINSTANCE( UnoCurrencyFieldControl )
+IMPL_CREATEINSTANCE( UnoDateFieldControl )
+IMPL_CREATEINSTANCE_CTX( 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_CREATEINSTANCE_CTX( UnoMultiPageControl )
+IMPL_CREATEINSTANCE_CTX( UnoPageControl )
+IMPL_CREATEINSTANCE_CTX( UnoFrameControl )
 IMPL_CREATEINSTANCE( VCLXMenuBar )
 IMPL_CREATEINSTANCE( VCLXPointer )
 IMPL_CREATEINSTANCE( VCLXPopupMenu )
 IMPL_CREATEINSTANCE( VCLXPrinterServer )
-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 )
+IMPL_CREATEINSTANCE( UnoRoadmapControl )
+IMPL_CREATEINSTANCE_CTX( UnoControlRoadmapModel )
+IMPL_CREATEINSTANCE( UnoSimpleAnimationControl )
+IMPL_CREATEINSTANCE_CTX( UnoSimpleAnimationControlModel )
+IMPL_CREATEINSTANCE( UnoThrobberControl )
+IMPL_CREATEINSTANCE_CTX( UnoThrobberControlModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlTabPage )
+IMPL_CREATEINSTANCE_CTX( UnoControlTabPageModel )
+IMPL_CREATEINSTANCE_CTX( UnoControlTabPageContainer )
+IMPL_CREATEINSTANCE_CTX( UnoControlTabPageContainerModel )
+IMPL_CREATEINSTANCE( AnimatedImagesControl )
+IMPL_CREATEINSTANCE_CTX( AnimatedImagesControlModel )
+IMPL_CREATEINSTANCE_CTX( SpinningProgressControlModel )
 
 IMPL_CREATE_INSTANCE_WITH_GEOMETRY( UnoControlDialogModel )
 
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 496839ad1723..3802d29ea212 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -192,11 +192,10 @@ Polygon VCLUnoHelper::CreatePolygon( const ::com::sun::star::uno::Sequence< sal_
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> VCLUnoHelper::CreateControlContainer( Window* pWindow )
 {
-    const uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-    UnoControlContainer* pContainer = new UnoControlContainer( xFactory, pWindow->GetComponentInterface( sal_True ) );
+    UnoControlContainer* pContainer = new UnoControlContainer( pWindow->GetComponentInterface( sal_True ) );
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > x = pContainer;
 
-    UnoControlModel* pContainerModel = new UnoControlContainerModel( xFactory );
+    UnoControlModel* pContainerModel = new UnoControlContainerModel( ::comphelper::getProcessComponentContext() );
     pContainer->setModel( (::com::sun::star::awt::XControlModel*)pContainerModel );
 
     return x;