Tag: odbmacros_2_5 User: fs Date: 2008-02-27 14:38:09+0000 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx dba/dbaccess/source/core/dataaccess/documentdefinition.hxx
Log: when copying a document, load it with disabled macros, to prevent the macro security message File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.50.2.5.2.3&r2=1.50.2.5.2.4 Delta lines: +3 -3 ------------------- --- documentdefinition.cxx 2008-02-26 14:13:46+0000 1.50.2.5.2.3 +++ documentdefinition.cxx 2008-02-27 14:38:06+0000 1.50.2.5.2.4 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.50.2.5.2.3 $ + * $Revision: 1.50.2.5.2.4 $ * - * last change: $Author: fs $ $Date: 2008/02/26 14:13:46 $ + * last change: $Author: fs $ $Date: 2008/02/27 14:38:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1060,7 +1060,7 @@ Reference< XStorage> xStorage(aIni[0],UNO_QUERY); ::rtl::OUString sPersistentName; aIni[1] >>= sPersistentName; - loadEmbeddedObject(); + loadEmbeddedObject( true ); Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); if ( xPersist.is() ) { File [changed]: documentdefinition.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.hxx?r1=1.24.2.2&r2=1.24.2.2.2.1 Delta lines: +5 -5 ------------------- --- documentdefinition.hxx 2008-02-04 13:07:27+0000 1.24.2.2 +++ documentdefinition.hxx 2008-02-27 14:38:06+0000 1.24.2.2.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.hxx,v $ * - * $Revision: 1.24.2.2 $ + * $Revision: 1.24.2.2.2.1 $ * - * last change: $Author: fs $ $Date: 2008/02/04 13:07:27 $ + * last change: $Author: fs $ $Date: 2008/02/27 14:38:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -226,13 +226,13 @@ /** loads the embedded object, if not already loaded. No new object can be created with this method. */ - void loadEmbeddedObject() + void loadEmbeddedObject( bool _bSuppressMacros = false ) { loadEmbeddedObject( NULL, ::com::sun::star::uno::Sequence< sal_Int8 >(), ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >(), - false, + _bSuppressMacros, false ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
