diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:49:46 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:49:46 +0000 |
| commit | 6f323609cfb5f36148e58b53ed217dd9ab1a7419 (patch) | |
| tree | a2914911a1ae620271da0c54cbf0012314495ffa /dbaccess | |
| parent | 128ceb0de80b07708d8bb0deb849e383fc5fc9ae (diff) | |
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#
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/dataaccess/ModelImpl.hxx | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 7a1ad96d9df6..7f16cbf506d0 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ModelImpl.hxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.22 $ * * This file is part of OpenOffice.org. * @@ -159,6 +159,7 @@ private: ::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 @@ public: 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; |