From 9a49980efa3522eb89f66eb185c98009236ffa89 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 3 Jun 2013 13:22:24 +0200
Subject: fdo#46808, Convert various comphelper::ComponentContext

..to regular XComponenContext

Change-Id: I08f9092ae818db5c1e37880625b83607c860680b
---
 toolkit/source/controls/grid/defaultgridcolumnmodel.cxx |  8 +++-----
 toolkit/source/controls/grid/defaultgridcolumnmodel.hxx |  4 +---
 toolkit/source/controls/grid/gridcontrol.cxx            | 10 +++++-----
 3 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 584f1b0ef4ee..26ef3b6940c6 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -56,9 +56,8 @@ namespace toolkit
     //= DefaultGridColumnModel
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    DefaultGridColumnModel::DefaultGridColumnModel( const Reference< XComponentContext >& i_context )
+    DefaultGridColumnModel::DefaultGridColumnModel()
         :DefaultGridColumnModel_Base( m_aMutex )
-        ,m_aContext( i_context )
         ,m_aContainerListeners( m_aMutex )
         ,m_aColumns()
     {
@@ -68,7 +67,6 @@ namespace toolkit
     DefaultGridColumnModel::DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource )
         :cppu::BaseMutex()
         ,DefaultGridColumnModel_Base( m_aMutex )
-        ,m_aContext( i_copySource.m_aContext )
         ,m_aContainerListeners( m_aMutex )
         ,m_aColumns()
     {
@@ -377,8 +375,8 @@ namespace toolkit
 //......................................................................................................................
 
 //----------------------------------------------------------------------------------------------------------------------
-::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)
+::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 >& )
 {
-    return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::DefaultGridColumnModel( comphelper::getComponentContext(_rFactory) ) );
+    return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::DefaultGridColumnModel );
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
index 859235e3f8d3..4423954f2d37 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
@@ -27,7 +27,6 @@
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase2.hxx>
-#include <comphelper/componentcontext.hxx>
 #include <vector>
 
 namespace toolkit
@@ -41,7 +40,7 @@ class DefaultGridColumnModel    :public ::cppu::BaseMutex
                                 ,public DefaultGridColumnModel_Base
 {
 public:
-    DefaultGridColumnModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
+    DefaultGridColumnModel();
     DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource );
     virtual ~DefaultGridColumnModel();
 
@@ -72,7 +71,6 @@ public:
 private:
     typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > >   Columns;
 
-    ::comphelper::ComponentContext      m_aContext;
     ::cppu::OInterfaceContainerHelper   m_aContainerListeners;
     Columns                             m_aColumns;
 };
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index e7de2d50facf..8b04f51f1dc3 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -52,16 +52,16 @@ namespace toolkit
 //======================================================================================================================
 namespace
 {
-    Reference< XGridDataModel > lcl_getDefaultDataModel_throw( ::comphelper::ComponentContext const & i_context )
+    Reference< XGridDataModel > lcl_getDefaultDataModel_throw( const Reference<XComponentContext> & 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 );
+        Reference< XMutableGridDataModel > const xDelegatorModel( DefaultGridDataModel::create( i_context ), UNO_QUERY_THROW );
+        Reference< XGridDataModel > const xDataModel( SortableGridDataModel::create( i_context, xDelegatorModel ), UNO_QUERY_THROW );
         return xDataModel;
     }
 
-    Reference< XGridColumnModel > lcl_getDefaultColumnModel_throw( ::comphelper::ComponentContext const & i_context )
+    Reference< XGridColumnModel > lcl_getDefaultColumnModel_throw( const Reference<XComponentContext> & i_context )
     {
-        Reference< XGridColumnModel > const xColumnModel( i_context.createComponent( "com.sun.star.awt.grid.DefaultGridColumnModel" ), UNO_QUERY_THROW );
+        Reference< XGridColumnModel > const xColumnModel( i_context->getServiceManager()->createInstanceWithContext( "com.sun.star.awt.grid.DefaultGridColumnModel", i_context ), UNO_QUERY_THROW );
         return xColumnModel;
     }
 }
-- 
cgit v1.2.3