User: kz Date: 2008-05-05 15:49:35+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx
Log: INTEGRATION: CWS dba30b (1.25.4); FILE MERGED 2008/04/15 22:12:02 fs 1.25.4.2: RESYNC: (1.25-1.26); FILE MERGED 2008/03/17 09:14:07 fs 1.25.4.1: #152837# 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.27&r2=1.28 Delta lines: +8 -6 ------------------- --- ModelImpl.cxx 2008-04-15 10:22:34+0000 1.27 +++ ModelImpl.cxx 2008-05-05 15:49:32+0000 1.28 @@ -321,6 +321,7 @@ ,m_aContainer(4) ,m_aStorages() ,m_aMacroMode( *this ) + ,m_nImposedMacroExecMode( MacroExecMode::NEVER_EXECUTE ) ,m_bHasAnyObjectWithMacros( false ) ,m_bModificationLock( false ) ,m_aContext( _rxFactory ) @@ -357,6 +358,7 @@ ,m_aContainer(4) ,m_aStorages() ,m_aMacroMode( *this ) + ,m_nImposedMacroExecMode( MacroExecMode::NEVER_EXECUTE ) ,m_bHasAnyObjectWithMacros( false ) ,m_bModificationLock( false ) ,m_aContext( _rxFactory ) @@ -1244,23 +1246,23 @@ } // ----------------------------------------------------------------------------- -sal_Int16 ODatabaseModelImpl::getImposedMacroExecMode() const +sal_Int16 ODatabaseModelImpl::getCurrentMacroExecMode() const { - sal_Int16 nMacroExecMode( MacroExecMode::USE_CONFIG ); + sal_Int16 nCurrentMode = MacroExecMode::NEVER_EXECUTE; try { ::comphelper::NamedValueCollection aArgs( m_aArgs ); - nMacroExecMode = aArgs.getOrDefault( "MacroExecutionMode", nMacroExecMode ); + nCurrentMode = aArgs.getOrDefault( "MacroExecutionMode", nCurrentMode ); } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } - return nMacroExecMode; + return nCurrentMode; } // ----------------------------------------------------------------------------- -sal_Bool ODatabaseModelImpl::setImposedMacroExecMode( sal_uInt16 nMacroMode ) +sal_Bool ODatabaseModelImpl::setCurrentMacroExecMode( sal_uInt16 nMacroMode ) { try { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
