diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 13:55:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 13:55:00 +0000 |
| commit | 0709dfc2f9556b5f09fa535ecfede8cb79f14b9e (patch) | |
| tree | 3bc7a0da94c69bb7e18fe9dc31542c0f706d2f43 /forms | |
| parent | fd3de2f48d551c9b0617896a967a91aabb06f6c8 (diff) | |
INTEGRATION: CWS dba24b (1.57.34); FILE MERGED
2007/09/03 09:20:34 fs 1.57.34.1: during #i76024#: introduced ComponentContext member (more future-proof)
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/FormComponent.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 23df432243a3..eeb3d1c5fcaf 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: FormComponent.cxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * - * last change: $Author: kz $ $Date: 2007-05-10 09:53:23 $ + * last change: $Author: hr $ $Date: 2007-11-01 14:55:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -154,6 +154,7 @@ DBG_NAME(frm_OControl) //------------------------------------------------------------------------------ OControl::OControl( const Reference< XMultiServiceFactory>& _rxFactory, const rtl::OUString& _rAggregateService, const sal_Bool _bSetDelegator ) :OComponentHelper(m_aMutex) + ,m_aContext( _rxFactory ) ,m_xServiceFactory(_rxFactory) { DBG_CTOR(frm_OControl, NULL); @@ -598,6 +599,7 @@ OControlModel::OControlModel( const ::rtl::OUString& rDefault, const sal_Bool _bSetDelegator) :OComponentHelper(m_aMutex) ,OPropertySetAggregationHelper(OComponentHelper::rBHelper) + ,m_aContext( _rxFactory ) ,m_xServiceFactory(_rxFactory) ,m_aPropertyBagHelper( *this ) ,m_nTabIndex(FRM_DEFAULT_TABINDEX) @@ -642,6 +644,7 @@ OControlModel::OControlModel( OControlModel::OControlModel( const OControlModel* _pOriginal, const Reference< XMultiServiceFactory>& _rxFactory, const sal_Bool _bCloneAggregate, const sal_Bool _bSetDelegator ) :OComponentHelper( m_aMutex ) ,OPropertySetAggregationHelper( OComponentHelper::rBHelper ) + ,m_aContext( _rxFactory ) ,m_xServiceFactory( _rxFactory ) ,m_aPropertyBagHelper( *this ) ,m_nTabIndex( FRM_DEFAULT_TABINDEX ) |