diff options
| author | Noel Grandin <noel@peralex.com> | 2013-06-03 08:34:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-06-03 10:00:03 +0200 |
| commit | d209e133191853f12557d879d1dcda7a0309dac6 (patch) | |
| tree | f49624949123d6ae5486b817daafaf7fb7778a4b /forms/source/component/Grid.cxx | |
| parent | fdo#46808, Convert ComponentContext in connectivity,extension.. (diff) | |
| download | core-d209e133191853f12557d879d1dcda7a0309dac6.tar.gz core-d209e133191853f12557d879d1dcda7a0309dac6.zip | |
fdo#46808, Convert comphelper::ComponentContext in forms module
Change-Id: I8a9913d964633381f00c0a4885cc655805fa1974
Diffstat (limited to 'forms/source/component/Grid.cxx')
| -rw-r--r-- | forms/source/component/Grid.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 29f3b5849339..e1c8549642cb 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -33,6 +33,7 @@ #include <comphelper/basicio.hxx> #include <comphelper/container.hxx> #include <comphelper/extract.hxx> +#include <comphelper/processfactory.hxx> #include <cppuhelper/queryinterface.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> @@ -72,12 +73,12 @@ const sal_uInt16 BACKGROUNDCOLOR = 0x0100; //------------------------------------------------------------------ InterfaceRef SAL_CALL OGridControlModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) { - return *(new OGridControlModel(_rxFactory)); + return *(new OGridControlModel( comphelper::getComponentContext(_rxFactory) )); } DBG_NAME(OGridControlModel); //------------------------------------------------------------------ -OGridControlModel::OGridControlModel(const Reference<XMultiServiceFactory>& _rxFactory) +OGridControlModel::OGridControlModel(const Reference<XComponentContext>& _rxFactory) :OControlModel(_rxFactory, OUString()) ,OInterfaceContainer(_rxFactory, m_aMutex, ::getCppuType(static_cast<Reference<XPropertySet>*>(NULL))) ,OErrorBroadcaster( OComponentHelper::rBHelper ) @@ -103,7 +104,7 @@ OGridControlModel::OGridControlModel(const Reference<XMultiServiceFactory>& _rxF } //------------------------------------------------------------------ -OGridControlModel::OGridControlModel( const OGridControlModel* _pOriginal, const Reference< XMultiServiceFactory >& _rxFactory ) +OGridControlModel::OGridControlModel( const OGridControlModel* _pOriginal, const Reference< XComponentContext >& _rxFactory ) :OControlModel( _pOriginal, _rxFactory ) ,OInterfaceContainer( _rxFactory, m_aMutex, ::getCppuType( static_cast<Reference<XPropertySet>*>( NULL ) ) ) ,OErrorBroadcaster( OComponentHelper::rBHelper ) @@ -148,7 +149,7 @@ OGridControlModel::~OGridControlModel() //------------------------------------------------------------------------------ Reference< XCloneable > SAL_CALL OGridControlModel::createClone( ) throw (RuntimeException) { - OGridControlModel* pClone = new OGridControlModel( this, getContext().getLegacyServiceFactory() ); + OGridControlModel* pClone = new OGridControlModel( this, getContext() ); osl_atomic_increment( &pClone->m_refCount ); pClone->OControlModel::clonedFrom( this ); // do not call OInterfaceContainer::clonedFrom, it would clone the elements aka columns, which is |