User: kz Date: 2008-06-25 12:30:53+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.hxx
Log: INTEGRATION: CWS dba30d (1.22.10); FILE MERGED 2008/06/16 04:54:57 fs 1.22.10.3: +m_bHasMacroStorages / hasMacroStorages() 2008/06/10 06:40:27 fs 1.22.10.2: RESYNC: (1.22-1.23); FILE MERGED 2008/05/22 11:27:16 fs 1.22.10.1: slight refactoring during #i88576# 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.23&r2=1.24 Delta lines: +17 -7 -------------------- --- ModelImpl.hxx 2008-06-06 14:01:21+0000 1.23 +++ ModelImpl.hxx 2008-06-25 12:30:50+0000 1.24 @@ -65,6 +65,7 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/XRefreshable.hpp> +#include <com/sun/star/sdb/XDocumentDataSource.hpp> /** === end UNO includes === **/ #include <comphelper/broadcasthelper.hxx> @@ -166,12 +167,15 @@ SharedStorage m_xDocumentStorage; ::rtl::Reference< ::sfx2::DocumentStorageModifyListener > m_pStorageModifyListener; + ODatabaseContext* m_pDBContext; /// the URL the document was loaded from ::rtl::OUString m_sDocFileLocation; /// do we have any object (forms/reports) which contains macros? bool m_bHasAnyObjectWithMacros; + /// does our root storage have macro/script sub storages? + bool m_bHasMacroStorages; /// true if setting the Modified flag of the document is currently locked bool m_bModificationLock; @@ -216,7 +220,6 @@ ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aArgs; - ODatabaseContext* m_pDBContext; OSharedConnectionManager* m_pSharedConnectionManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xSharedConnectionManager; @@ -246,15 +249,15 @@ SAL_THROW(( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException )); ODatabaseModelImpl( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory - , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>() + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory, + ODatabaseContext& _pDBContext ); virtual ~ODatabaseModelImpl(); ODatabaseModelImpl( - const ::rtl::OUString& _rRegistrationName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory - ,ODatabaseContext* _pDBContext = NULL + const ::rtl::OUString& _rRegistrationName, + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory, + ODatabaseContext& _rDBContext ); // XEventListener @@ -383,6 +386,13 @@ */ bool hasAnyObjectWithMacros() const { return m_bHasAnyObjectWithMacros; } + /** determines whether the document storage has sub storages used to store macros/scripts + + Though the current version does not allow creating such documents, later versions will, so + we need to be prepared when we encounter them. + */ + bool hasMacroStorages() const { return m_bHasMacroStorages; } + /** checks our document's macro execution mode, using the interaction handler as supplied with our load arguments */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
