Tag: mws_ooh680 User: ihi Date: 2008-05-20 18:22:51+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx
Log: INTEGRATION: CWS dba241d (1.21.18.4.10); FILE MERGED 2008/05/05 13:06:58 fs 1.21.18.4.10.1: #i87741# adjustMacroMode_AutoReject not needed anymore / checkMacrosOnLoading returning the boolean flag for the current execution mode File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.21.18.4&r2=1.21.18.5 Delta lines: +2 -8 ------------------- --- ModelImpl.cxx 2008-03-12 08:37:48+0000 1.21.18.4 +++ ModelImpl.cxx 2008-05-20 18:22:49+0000 1.21.18.5 @@ -1047,18 +1047,12 @@ } // ----------------------------------------------------------------------------- -bool ODatabaseModelImpl::adjustMacroMode_AutoReject() -{ - return m_aMacroMode.adjustMacroMode( NULL ); -} - -// ----------------------------------------------------------------------------- -void ODatabaseModelImpl::checkMacrosOnLoading() +bool ODatabaseModelImpl::checkMacrosOnLoading() { ::comphelper::NamedValueCollection aArgs( m_aArgs ); Reference< XInteractionHandler > xInteraction; xInteraction = aArgs.getOrDefault( "InteractionHandler", xInteraction ); - m_aMacroMode.checkMacrosOnLoading( xInteraction ); + return m_aMacroMode.checkMacrosOnLoading( xInteraction ); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
