Tag: mws_ooh680 User: obo Date: 2008-03-12 08:38:35+0000 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: INTEGRATION: CWS dba241a (1.50.18.3.12); FILE MERGED 2008/03/11 11:59:33 fs 1.50.18.3.12.1: #b6673482# when calculating the macro execution mode for the to-be-opened document, then use getExternallyImposedMacroExecMode, not getImposedMacroExecMode - the latter is already 'corrupted' by m_aMacroMode, which uses it to actually store its current mode 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.50.18.3&r2=1.50.18.4 Delta lines: +3 -3 ------------------- --- documentdefinition.cxx 2008-01-18 15:40:33+0000 1.50.18.3 +++ documentdefinition.cxx 2008-03-12 08:38:33+0000 1.50.18.4 @@ -904,11 +904,11 @@ // allow the command arguments to downgrade the macro execution mode, but not to upgrade // it - if ( ( m_pImpl->m_pDataSource->getImposedMacroExecMode() == MacroExecMode::USE_CONFIG ) + if ( ( m_pImpl->m_pDataSource->getExternallyImposedMacroExecMode() == MacroExecMode::USE_CONFIG ) && bExecuteDBDocMacros ) { - // while loading the whole database document, USE_CONFIG, or *no* macro exec mode was passed. + // while loading the whole database document, USE_CONFIG, was passed. // Additionally, *by now* executing macros from the DB doc is allowed (this is what bExecuteDBDocMacros // indicates). This means either one of: // 1. The DB doc or one of the sub docs contained macros and @@ -920,7 +920,7 @@ // // The problem with this: If the to-be-opened sub document has macros embedded in // the content.xml (which is valid ODF, but normally not produced by OOo itself), - // then this has not been detecte while loading the database document - it would + // then this has not been detected while loading the database document - it would // be too expensive, as it effectively would require loading all forms/reports. // // So, in such a case, and with 2. above, we would silently execute those macros, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
