User: obo Date: 05/07/08 03:37:08 Modified: /dba/dbaccess/source/core/dataaccess/ documentcontainer.cxx
Log: INTEGRATION: CWS dba20blocker (1.12.58); FILE MERGED 2005/06/23 13:56:42 fs 1.12.58.2: copying fix for #i50905# into this CWS 2005/06/23 13:31:40 fs 1.12.58.1: copying fix for #i47311# into this CWS File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.cxx?r1=1.12&r2=1.13 Delta lines: +7 -3 ------------------- --- documentcontainer.cxx 23 Mar 2005 09:47:06 -0000 1.12 +++ documentcontainer.cxx 8 Jul 2005 10:37:06 -0000 1.13 @@ -249,6 +249,9 @@ aCommand.Argument <<= aIni; xCopyFrom->execute(aCommand,-1,Reference< XCommandEnvironment >()); + Reference<XPropertySet> xProp(xCopyFrom,UNO_QUERY); + if ( xProp.is() && xProp->getPropertySetInfo().is() && xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_AS_TEMPLATE) ) + xProp->getPropertyValue(PROPERTY_AS_TEMPLATE) >>= bAsTemplate; } } @@ -663,8 +666,9 @@ { static const ::rtl::OUString s_sForms = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("forms")); static const ::rtl::OUString s_sReports = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reports")); - Reference<XTransactionListener> xEvt(m_pImpl->m_pDataSource->m_xModel,UNO_QUERY); - return m_pImpl->m_pDataSource ? m_pImpl->m_pDataSource->getStorage(m_bFormsContainer ? s_sForms : s_sReports,xEvt) : Reference< XStorage>(); + return m_pImpl->m_pDataSource + ? m_pImpl->m_pDataSource->getStorage( m_bFormsContainer ? s_sForms : s_sReports ) + : Reference< XStorage>(); } // ----------------------------------------------------------------------------- sal_Bool ODocumentContainer::approveNewObject(const ::rtl::OUString& _sName,const Reference< XContent >& _rxObject) const --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
