User: kz Date: 2008-03-06 18:00:45+0000 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.hxx
Log: INTEGRATION: CWS odbmacros2 (1.24.2); FILE MERGED 2008/03/04 12:00:32 fs 1.24.2.3: RESYNC: (1.26-1.27); FILE MERGED 2008/02/27 14:38:06 fs 1.24.2.2.2.1: when copying a document, load it with disabled macros, to prevent the macro security message 2008/02/04 13:07:27 fs 1.24.2.2: RESYNC: (1.24-1.26); FILE MERGED 2007/12/12 09:54:56 fs 1.24.2.1: #i49133# when loading an embedded object, prohibit it to have embedded scripts/macros (unless it already has some) File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentdefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.hxx?r1=1.27&r2=1.28 Delta lines: +11 -3 -------------------- --- documentdefinition.hxx 2008-02-26 14:38:02+0000 1.27 +++ documentdefinition.hxx 2008-03-06 18:00:42+0000 1.28 @@ -82,7 +82,7 @@ //= document //========================================================================== - typedef ::cppu::ImplHelper1< ::com::sun::star::embed::XComponentSupplier +typedef ::cppu::ImplHelper1 < ::com::sun::star::embed::XComponentSupplier > ODocumentDefinition_Base; class ODocumentDefinition @@ -140,7 +140,11 @@ // XRename virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> getStorage() const; + /** returns the forms/reports container storage, depending on m_bForm. Our own storage + inside this container storage is the one with the name as indicated by m_pImpl->m_aProps.sPersistentName. + */ + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + getContainerStorage() const; sal_Bool save(sal_Bool _bApprove); sal_Bool saveAs(); @@ -256,6 +260,10 @@ void registerProperties(); + /** determines whether the document we represent supports embedded scripts and macros + */ + sal_Bool objectSupportsEmbeddedScripts() const; + //------------------------------------------------------------------------- //- commands //------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
