Tag: odbmacros_2_5 User: fs Date: 2008-02-14 12:18:10+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx dba/dbaccess/source/core/dataaccess/databasedocument.cxx dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: #i49133# re-enable the macros in DBDocs, which had been temporarily disable to finalize CWS odbmacros2 File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.21.2.11&r2=1.21.2.11.2.1 Delta lines: +2 -16 -------------------- --- ModelImpl.cxx 2008-02-06 08:31:59+0000 1.21.2.11 +++ ModelImpl.cxx 2008-02-14 12:18:07+0000 1.21.2.11.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: ModelImpl.cxx,v $ * - * $Revision: 1.21.2.11 $ + * $Revision: 1.21.2.11.2.1 $ * - * last change: $Author: fs $ $Date: 2008/02/06 08:31:59 $ + * last change: $Author: fs $ $Date: 2008/02/14 12:18:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,22 +49,9 @@ /** === begin UNO includes === **/ #include <com/sun/star/document/MacroExecMode.hpp> -#include <com/sun/star/document/XExporter.hpp> -#include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/XTransactionBroadcaster.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/reflection/XProxyFactory.hpp> #include <com/sun/star/sdb/BooleanComparisonMode.hpp> -#include <com/sun/star/sdbc/XDriverAccess.hpp> -#include <com/sun/star/sdbc/XDriverManager.hpp> -#include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/ucb/XInteractionSupplyAuthentication.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp> #include <com/sun/star/script/DocumentDialogLibraryContainer.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> @@ -105,7 +92,6 @@ using namespace ::com::sun::star::view; using namespace ::com::sun::star::task; using namespace ::com::sun::star::reflection; -using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::script; using namespace ::cppu; using namespace ::osl; File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.36.2.15&r2=1.36.2.15.2.1 Delta lines: +4 -7 ------------------- --- databasedocument.cxx 2008-02-14 08:36:45+0000 1.36.2.15 +++ databasedocument.cxx 2008-02-14 12:18:07+0000 1.36.2.15.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.36.2.15 $ + * $Revision: 1.36.2.15.2.1 $ * - * last change: $Author: fs $ $Date: 2008/02/14 08:36:45 $ + * last change: $Author: fs $ $Date: 2008/02/14 12:18:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -196,12 +196,9 @@ bool ODatabaseDocument::impl_shouldDisallowScripting_nolck_nothrow() const { ::osl::MutexGuard aGuard( getMutex() ); - // TODO: revert to the disabled code. The current version is just to be able - // to integrate an intermediate version of the CWS, which should behave as - // if no macros in DB docs are allowed -// if ( m_pImpl.is() && m_pImpl->hasAnyObjectWithMacros() ) + if ( m_pImpl.is() && m_pImpl->hasAnyObjectWithMacros() ) return true; -// return false; + return false; } // ----------------------------------------------------------------------------- File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.50.2.5&r2=1.50.2.5.2.1 Delta lines: +3 -7 ------------------- --- documentdefinition.cxx 2008-02-14 08:22:19+0000 1.50.2.5 +++ documentdefinition.cxx 2008-02-14 12:18:07+0000 1.50.2.5.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.50.2.5 $ + * $Revision: 1.50.2.5.2.1 $ * - * last change: $Author: fs $ $Date: 2008/02/14 08:22:19 $ + * last change: $Author: fs $ $Date: 2008/02/14 12:18:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1475,11 +1475,7 @@ // ----------------------------------------------------------------------------- sal_Bool ODocumentDefinition::objectSupportsEmbeddedScripts() const { -// bool bAllowDocumentMacros = !m_pImpl->m_pDataSource || m_pImpl->m_pDataSource->hasAnyObjectWithMacros(); - // TODO: revert to the disabled code. The current version is just to be able - // to integrate an intermediate version of the CWS, which should behave as - // if no macros in DB docs are allowed - bool bAllowDocumentMacros = true; + bool bAllowDocumentMacros = !m_pImpl->m_pDataSource || m_pImpl->m_pDataSource->hasAnyObjectWithMacros(); // if *any* of the objects of the database document already has macros, we continue to allow it // to have them, until the user did a migration. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
