User: kz Date: 2008-05-05 15:50:10+0000 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.cxx
Log: INTEGRATION: CWS dba30b (1.40.4); FILE MERGED 2008/04/15 22:12:11 fs 1.40.4.2: RESYNC: (1.40-1.43); FILE MERGED 2008/03/17 09:14:08 fs 1.40.4.1: #152837# 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.43&r2=1.44 Delta lines: +8 -2 ------------------- --- databasedocument.cxx 2008-04-10 12:44:35+0000 1.43 +++ databasedocument.cxx 2008-05-05 15:50:07+0000 1.44 @@ -404,6 +404,12 @@ ::comphelper::NamedValueCollection aResource( _aArguments ); lcl_stripLoadArguments( aResource, 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->setImposedMacroExecMode( + aArgs.getOrDefault( "MacroExecutionMode", m_pImpl->getImposedMacroExecMode() ) ); + ::rtl::OUString sDocumentURL( aResource.getOrDefault( "SalvagedFile", _rURL ) ); if ( !sDocumentURL.getLength() ) // this indicates "the document is being recovered, but _rURL already is the real document URL, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
