User: kz Date: 2008-05-05 15:49:49+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.hxx
Log: INTEGRATION: CWS dba30b (1.20.4); FILE MERGED 2008/04/15 22:12:05 fs 1.20.4.2: RESYNC: (1.20-1.21); FILE MERGED 2008/03/17 09:14:07 fs 1.20.4.1: #152837# File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.21&r2=1.22 Delta lines: +14 -2 -------------------- --- ModelImpl.hxx 2008-04-10 12:39:56+0000 1.21 +++ ModelImpl.hxx 2008-05-05 15:49:46+0000 1.22 @@ -159,6 +159,7 @@ ::std::vector< TContentPtr > m_aContainer; // one for each ObjectType TStorages m_aStorages; ::sfx2::DocumentMacroMode m_aMacroMode; + sal_Int16 m_nImposedMacroExecMode; ::com::sun::star::uno::Reference< ::com::sun::star::script::XStorageBasedLibraryContainer > m_xBasicLibraries; ::com::sun::star::uno::Reference< ::com::sun::star::script::XStorageBasedLibraryContainer > m_xDialogLibraries; @@ -446,10 +447,21 @@ const ::rtl::OUString& _rDocumentURL ); + /** returns the macro mode imposed by an external instance, by passing it to attachResource + */ + sal_Int16 getImposedMacroExecMode() const + { + return m_nImposedMacroExecMode; + } + void setImposedMacroExecMode( const sal_Int16 _nMacroMode ) + { + m_nImposedMacroExecMode = _nMacroMode; + } + public: // IMacroDocumentAccess overridables - virtual sal_Int16 getImposedMacroExecMode() const; - virtual sal_Bool setImposedMacroExecMode( sal_uInt16 ); + virtual sal_Int16 getCurrentMacroExecMode() const; + virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 ); virtual ::rtl::OUString getDocumentLocation() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getLastCommitDocumentStorage(); virtual sal_Bool documentStorageHasMacros() const; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
