User: kz Date: 05/11/03 04:35:45 Modified: /dba/dbaccess/source/core/dataaccess/ documentdefinition.cxx
Log: INTEGRATION: CWS fwk23 (1.27.8); FILE MERGED 2005/10/18 04:32:43 abi 1.27.8.2: RESYNC: (1.27-1.29); FILE MERGED 2005/10/12 05:53:59 as 1.27.8.1: #124984# dont remove frame from the global desktop tree 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.31&r2=1.32 Delta lines: +4 -4 ------------------- --- documentdefinition.cxx 24 Oct 2005 09:03:01 -0000 1.31 +++ documentdefinition.cxx 3 Nov 2005 12:35:42 -0000 1.32 @@ -661,12 +661,12 @@ // if ( !m_xFrameLoader.is() ) m_xFrameLoader.set( m_xORB->createInstance( SERVICE_FRAME_DESKTOP ), UNO_QUERY_THROW ); - +/* // remove the frame from the desktop's frame collection because we need full control of it. Reference< XFramesSupplier > xSup( m_xFrameLoader, UNO_QUERY_THROW ); Reference< XFrames > xFrames( xSup->getFrames(), UNO_QUERY_THROW ); xFrames->remove( xFrame ); - +*/ // create an OEmbedObjectHolder m_xListener = new OEmbedObjectHolder(m_xEmbeddedObject,this); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
