diff options
| author | Noel Grandin <noel@peralex.com> | 2013-03-19 13:08:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-03-20 07:32:53 +0200 |
| commit | a066525b42a1ab8dc60e10a5d62819c259904f32 (patch) | |
| tree | 0c21130ff82a482ab80de0fcc3c73be0125d06f5 /toolkit | |
| parent | 6999a50efaaf802ccd4c7eb7957af17cc32602be (diff) | |
fdo#46808, Convert a bunch of comphelper::ComponentContext stuff
.. to Reference<XComponentContext>
mostly in the dbaccess module, but it also affected some other
modules.
Change-Id: I09b3f6fe7a9b33498b11d98b5521b5aeeb8882be
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 8 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/defaultgridcolumnmodel.hxx | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index d80453a26422..5b15bb7fe92c 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -25,6 +25,7 @@ #include <comphelper/sequence.hxx> #include <comphelper/componentguard.hxx> +#include <comphelper/processfactory.hxx> #include <toolkit/helper/servicenames.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> @@ -35,6 +36,7 @@ namespace toolkit { /** === begin UNO using === **/ using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Sequence; @@ -56,9 +58,9 @@ namespace toolkit //= DefaultGridColumnModel //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ - DefaultGridColumnModel::DefaultGridColumnModel( const Reference< XMultiServiceFactory >& i_factory ) + DefaultGridColumnModel::DefaultGridColumnModel( const Reference< XComponentContext >& i_context ) :DefaultGridColumnModel_Base( m_aMutex ) - ,m_aContext( i_factory ) + ,m_aContext( i_context ) ,m_aContainerListeners( m_aMutex ) ,m_aColumns() { @@ -380,6 +382,6 @@ 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) { - return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::DefaultGridColumnModel( _rFactory ) ); + return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::DefaultGridColumnModel( comphelper::getComponentContext(_rFactory) ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx index 6977296d5b2c..83b4f1ed75e8 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx @@ -41,7 +41,7 @@ class DefaultGridColumnModel :public ::cppu::BaseMutex ,public DefaultGridColumnModel_Base { public: - DefaultGridColumnModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); + DefaultGridColumnModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource ); virtual ~DefaultGridColumnModel(); |