Tag: cws_src680_dba201 User: fs Date: 05/07/11 01:46:26 Modified: /dba/dbaccess/source/core/dataaccess/ documentdefinition.cxx
Log: RESYNC: (1.26-1.27); 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.25.20.4&r2=1.25.20.5 Delta lines: +14 -16 --------------------- --- documentdefinition.cxx 20 May 2005 12:48:07 -0000 1.25.20.4 +++ documentdefinition.cxx 11 Jul 2005 08:46:23 -0000 1.25.20.5 @@ -824,7 +824,7 @@ Reference< XStorage> xStorage(aIni[0],UNO_QUERY); ::rtl::OUString sPersistentName; aIni[1] >>= sPersistentName; - loadEmbeddedObject(); + loadEmbeddedObject( Sequence< sal_Int8 >(), Reference< XConnection >(), sal_False ); Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); if ( xPersist.is() ) { @@ -1178,20 +1178,17 @@ { Sequence<PropertyValue> aArgs = xModel->getArgs(); ::comphelper::MediaDescriptor aHelper(aArgs); - static const ::rtl::OUString s_sReadOnly(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); - if ( ! aHelper.createItemIfMissing(s_sReadOnly,_bReadOnly) ) - aHelper[s_sReadOnly] <<= _bReadOnly; + aHelper.createItemIfMissing( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ) ), _bReadOnly ); if ( m_pImpl->m_aProps.aTitle.getLength() ) { - static const ::rtl::OUString s_sDocumentTitle(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle")); - if ( ! aHelper.createItemIfMissing(s_sDocumentTitle,m_pImpl->m_aProps.aTitle) ) - aHelper[s_sDocumentTitle] <<= m_pImpl->m_aProps.aTitle; + aHelper.createItemIfMissing( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentTitle" ) ), m_pImpl->m_aProps.aTitle ); } - static const ::rtl::OUString s_sMacroExecutionMode(RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")); - if ( ! aHelper.createItemIfMissing(s_sMacroExecutionMode,MacroExecMode::USE_CONFIG) ) - aHelper[s_sMacroExecutionMode] <<= MacroExecMode::USE_CONFIG; + aHelper.createItemIfMissing( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MacroExecutionMode" ) ), MacroExecMode::USE_CONFIG ); aHelper >> aArgs; @@ -1206,7 +1203,7 @@ // ----------------------------------------------------------------------------- void ODocumentDefinition::generateNewImage(Any& _rImage) { - loadEmbeddedObject(); + loadEmbeddedObject( Sequence< sal_Int8 >(), Reference< XConnection >(), sal_True ); if ( m_xEmbeddedObject.is() ) { try @@ -1235,7 +1232,7 @@ // ----------------------------------------------------------------------------- void ODocumentDefinition::fillDocumentInfo(Any& _rInfo) { - loadEmbeddedObject(); + loadEmbeddedObject( Sequence< sal_Int8 >(), Reference< XConnection >(), sal_True ); if ( m_xEmbeddedObject.is() ) { try @@ -1328,8 +1325,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<css::embed::XTransactionListener> xEvt(m_pImpl->m_pDataSource->m_xModel,UNO_QUERY); - return m_pImpl->m_pDataSource ? m_pImpl->m_pDataSource->getStorage(m_bForm ? s_sForms : s_sReports,xEvt) : Reference< XStorage>(); + return m_pImpl->m_pDataSource + ? m_pImpl->m_pDataSource->getStorage( m_bForm ? s_sForms : s_sReports ) + : Reference< XStorage>(); } // ----------------------------------------------------------------------------- sal_Bool ODocumentDefinition::isModified() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
