User: rt Date: 2008-01-29 15:18:22+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.hxx
Log: 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 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.17&r2=1.18 Delta lines: +2 -1 ------------------- --- ModelImpl.hxx 2008-01-29 08:51:05+0000 1.17 +++ ModelImpl.hxx 2008-01-29 15:18:19+0000 1.18 @@ -388,9 +388,10 @@ 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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
