Tag: cws_src680_fwk80 User: mav Date: 2008-01-02 12:19:08+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx dba/dbaccess/source/core/dataaccess/ModelImpl.hxx
Log: #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.21&r2=1.21.12.1 Delta lines: +22 -4 -------------------- --- ModelImpl.cxx 2007-11-27 12:08:49+0000 1.21 +++ ModelImpl.cxx 2008-01-02 12:19:06+0000 1.21.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.21.12.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/27 12:08:49 $ + * last change: $Author: mav $ $Date: 2008/01/02 12:19:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1074,6 +1074,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 @@ -1091,7 +1109,7 @@ } // ----------------------------------------------------------------------------- -bool ODatabaseModelImpl::documentStorageHasMacros() const +sal_Bool ODatabaseModelImpl::documentStorageHasMacros() const { // does our root storage contain macros? if ( ::sfx2::DocumentMacroMode::storageHasMacros( m_xStorage ) ) File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.16&r2=1.16.12.1 Delta lines: +5 -4 ------------------- --- ModelImpl.hxx 2007-11-21 15:36:22+0000 1.16 +++ ModelImpl.hxx 2008-01-02 12:19:06+0000 1.16.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.16.12.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 15:36:22 $ + * last change: $Author: mav $ $Date: 2008/01/02 12:19:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -377,9 +377,10 @@ private: // IMacroDocumentAccess overridables virtual sal_Int16 getImposedMacroExecMode() const; + virtual sal_Bool setImposedMacroExecMode( sal_uInt16 ); virtual ::rtl::OUString getDocumentLocation() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getLastCommitDocumentStorage(); - virtual bool documentStorageHasMacros() const; + virtual sal_Bool documentStorageHasMacros() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const; virtual sal_Int16 getScriptingSignatureState() const; virtual void showBrokenSignatureWarning( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction ) const; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
