User: rt Date: 2008-01-29 15:18:02+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx
Log: INTEGRATION: CWS fwk80_SRC680 (1.21.12); FILE MERGED 2008/01/24 07:52:10 pb 1.21.12.2: RESYNC: (1.21-1.21.18.2); FILE MERGED 2008/01/02 12:19:06 mav 1.21.12.1: #i84941# use the MediaDescriptor only to handle the macro execution 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.22&r2=1.23 Delta lines: +19 -1 -------------------- --- ModelImpl.cxx 2008-01-29 08:50:51+0000 1.22 +++ ModelImpl.cxx 2008-01-29 15:17:59+0000 1.23 @@ -1099,6 +1099,24 @@ } // ----------------------------------------------------------------------------- +sal_Bool ODatabaseModelImpl::setImposedMacroExecMode( sal_uInt16 nMacroMode ) +{ + try + { + ::comphelper::NamedValueCollection aArgs( m_aArgs ); + aArgs.put( "MacroExecutionMode", nMacroMode ); + aArgs >>= m_aArgs; + return sal_True; + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + + return sal_False; +} + +// ----------------------------------------------------------------------------- ::rtl::OUString ODatabaseModelImpl::getDocumentLocation() const { // don't return getURL() (or m_sRealFileURL, which is the same). In case we were recovered @@ -1116,7 +1134,7 @@ } // ----------------------------------------------------------------------------- -bool ODatabaseModelImpl::documentStorageHasMacros() const +sal_Bool ODatabaseModelImpl::documentStorageHasMacros() const { // does our root storage contain macros? if ( ::sfx2::DocumentMacroMode::storageHasMacros( m_xStorage ) ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
