Tag: cws_src680_mav17 User: mav Date: 05/03/02 09:53:24 Modified: /dba/dbaccess/source/core/dataaccess/ documentdefinition.cxx
Log: RESYNC: (1.19-1.20); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.19.28.3&r2=1.19.28.4 Delta lines: +24 -5 -------------------- --- documentdefinition.cxx 23 Feb 2005 08:39:46 -0000 1.19.28.3 +++ documentdefinition.cxx 2 Mar 2005 17:53:21 -0000 1.19.28.4 @@ -1132,7 +1132,26 @@ xCommon->reload(aArgs,aEmbeddedObjectDescriptor); m_xEmbeddedObject->changeState(EmbedStates::RUNNING); } + Reference<XModel> xModel(getComponent(),UNO_QUERY); + // set the OfficeDatabaseDocument instance as parent of the embedded document + // #i40358# / 2005-01-19 / [EMAIL PROTECTED] + Reference< XChild > xDepdendDocAsChild( xModel, UNO_QUERY ); + if ( xDepdendDocAsChild.is() ) + { + try + { + if ( !xDepdendDocAsChild->getParent().is() ) + { // first encounter + xDepdendDocAsChild->setParent( getDataSource( m_xParentContainer ) ); + } + } + catch( const Exception& ) + { + OSL_ENSURE( sal_False, "ODocumentDefinition::loadEmbeddedObject: caught an exception while setting the parent of the embedded object!" ); + } + } + if ( xModel.is() ) { Sequence<PropertyValue> aArgs = xModel->getArgs(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
