Tag: mws_ooh680 User: obo Date: 2008-03-12 08:38:20+0000 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.cxx
Log: INTEGRATION: CWS dba241a (1.36.18.1.12); FILE MERGED 2008/03/11 12:03:00 fs 1.36.18.1.12.1: #b6673482# +ExternallyImposedMacroExecMode File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.36.18.1&r2=1.36.18.2 Delta lines: +6 -0 ------------------- --- databasedocument.cxx 2008-01-18 15:39:24+0000 1.36.18.1 +++ databasedocument.cxx 2008-03-12 08:38:18+0000 1.36.18.2 @@ -246,6 +246,12 @@ ::comphelper::MediaDescriptor aDescriptor( _aArguments ); lcl_stripLoadArguments( aDescriptor, m_pImpl->m_aArgs ); + // now that somebody (perhaps) told us an macro execution mode, remember it as + // ImposedMacroExecMode + ::comphelper::NamedValueCollection aArgs( m_pImpl->m_aArgs ); + m_pImpl->setExternallyImposedMacroExecMode( + aArgs.getOrDefault( "MacroExecutionMode", m_pImpl->getExternallyImposedMacroExecMode() ) ); + m_pImpl->m_sFileURL = _rURL; m_pImpl->m_sRealFileURL = aDescriptor.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SalvagedFile" ) ), _rURL ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
