diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-01-29 14:18:19 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-01-29 14:18:19 +0000 |
commit | 16c4b72019294caddae6e4cbc8c03283f79b2da2 (patch) | |
tree | bdbfdf49a9befa462a05d935e4d17eb760f2462b /dbaccess/source/core/dataaccess/ModelImpl.hxx | |
parent | 88e53e905fb40afdb24284103e9b74a41e6a6d52 (diff) |
INTEGRATION: CWS fwk80_SRC680 (1.16.12); FILE MERGED
2008/01/24 07:52:13 pb 1.16.12.2: RESYNC: (1.16-1.16.18.2); FILE MERGED
2008/01/02 12:19:06 mav 1.16.12.1: #i84941# use the MediaDescriptor only to handle the macro execution
Diffstat (limited to 'dbaccess/source/core/dataaccess/ModelImpl.hxx')
-rw-r--r-- | dbaccess/source/core/dataaccess/ModelImpl.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index f7cee4e8cc2c..8f72870077ce 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: vg $ $Date: 2008-01-29 08:51:05 $ + * last change: $Author: rt $ $Date: 2008-01-29 15:18:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -388,9 +388,10 @@ public: public: // 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; |