diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:49:32 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:49:32 +0000 |
| commit | 128ceb0de80b07708d8bb0deb849e383fc5fc9ae (patch) | |
| tree | e1b3172cd099e6ca32fe835234b382cabda4d501 /dbaccess/source | |
| parent | 42dbac91cb56fc826a880e7cd1d1b56060635fde (diff) | |
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#
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/core/dataaccess/ModelImpl.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 2cd4e14ecef4..7bd77a82ee0b 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ModelImpl.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.28 $ * * This file is part of OpenOffice.org. * @@ -321,6 +321,7 @@ ODatabaseModelImpl::ODatabaseModelImpl(const Reference< XMultiServiceFactory >& ,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 @@ ODatabaseModelImpl::ODatabaseModelImpl( ,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 @@ bool ODatabaseModelImpl::isDatabaseStorage( const Reference< XStorage >& _rxStor } // ----------------------------------------------------------------------------- -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 { |