Tag: cws_src680_qiq User: fs Date: 2006/06/27 04:59:52 Modified: dba/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
Log: RESYNC: (1.5-1.6); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ComponentDefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ComponentDefinition.cxx?r1=1.5.118.3&r2=1.5.118.4 Delta lines: +8 -8 ------------------- --- ComponentDefinition.cxx 16 Jun 2006 13:19:31 -0000 1.5.118.3 +++ ComponentDefinition.cxx 27 Jun 2006 11:59:49 -0000 1.5.118.4 @@ -91,7 +91,7 @@ void OComponentDefinition::registerProperties() { OComponentDefinition_Impl& rDefinition( getDefinition() ); - ODataSettings::registerProperties( &rDefinition ); + ODataSettings::registerPropertiesFor( &rDefinition ); registerProperty(PROPERTY_NAME, PROPERTY_ID_NAME, PropertyAttribute::BOUND | PropertyAttribute::READONLY|PropertyAttribute::CONSTRAINED, &rDefinition.m_aProps.aTitle, ::getCppuType(&rDefinition.m_aProps.aTitle)); @@ -111,8 +111,8 @@ ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTable) - :ODataSettings(m_aBHelper,!_bTable) - ,OContentHelper(_xORB,_xParentContainer,_pImpl) + :OContentHelper(_xORB,_xParentContainer,_pImpl) + ,ODataSettings(m_aBHelper,!_bTable) ,m_bTable(_bTable) { DBG_CTOR(OComponentDefinition, NULL); @@ -130,8 +130,8 @@ ,const Reference< XMultiServiceFactory >& _xORB ,const TContentPtr& _pImpl ,sal_Bool _bTable) - :ODataSettings(m_aBHelper) - ,OContentHelper(_xORB,_rxContainer,_pImpl) + :OContentHelper(_xORB,_rxContainer,_pImpl) + ,ODataSettings(m_aBHelper) ,m_bTable(_bTable) { DBG_CTOR(OComponentDefinition, NULL); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
