Tag: cws_ooh680_dba241d User: fs Date: 2008-05-05 13:08:57+0000 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: #i87741# when loading a form, allow user interaction for the macro execution mode adjustment - just in case the form is not loaded after the database document had been plugged into a frame (which is where the user interaction would normally happen) 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.4.10.1&r2=1.50.18.4.10.2 Delta lines: +13 -5 -------------------- --- documentdefinition.cxx 2008-05-05 10:18:17+0000 1.50.18.4.10.1 +++ documentdefinition.cxx 2008-05-05 13:08:53+0000 1.50.18.4.10.2 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.50.18.4.10.1 $ + * $Revision: 1.50.18.4.10.2 $ * - * last change: $Author: fs $ $Date: 2008/05/05 10:18:17 $ + * last change: $Author: fs $ $Date: 2008/05/05 13:08:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -902,9 +902,17 @@ } // our database document's macro execution mode - // Note that we don't pass an interaction handler here. If the user has not been asked/notified - // by now (i.e. during loading the whole DB document), then this won't happen anymore. - bool bExecuteDBDocMacros = m_pImpl->m_pDataSource->adjustMacroMode_AutoReject(); + bool bExecuteDBDocMacros = m_pImpl->m_pDataSource->checkMacrosOnLoading(); + // Note that this call implies the user might be asked for the macro execution mode. + // Normally, this would happen when the database document is loaded, and subsequent calls + // will simply use the user's decision from this point in time. + // However, it is possible to programmatically load forms/reports, without actually + // loading the database document into a frame. In this case, the user will be asked + // here and now. + // Note also that this call here might imply false alarm: If the form does not contain macros, + // but, another one does, then the user will still be bothered with a query whether or + // not to use macros. However, this is negligible + // #i87741# / 2008-05-05 / [EMAIL PROTECTED] // allow the command arguments to downgrade the macro execution mode, but not to upgrade // it --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
