Tag: cws_src680_odbmacros2 User: fs Date: 2008-02-14 08:38:03+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: temporarily disable scripting support for database documents, so we have an intermediate version of the CWS which we can integrate File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.50.2.7&r2=1.50.2.8 Delta lines: +12 -3 -------------------- --- AppController.cxx 2008-02-06 21:45:57+0000 1.50.2.7 +++ AppController.cxx 2008-02-14 08:38:01+0000 1.50.2.8 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.50.2.7 $ + * $Revision: 1.50.2.8 $ * - * last change: $Author: fs $ $Date: 2008/02/06 21:45:57 $ + * last change: $Author: fs $ $Date: 2008/02/14 08:38:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -706,7 +706,11 @@ // Our document supports embedding scripts into it, if and only if there are no // forms/reports with macros/scripts into them. So, we need to enable migration // if and only if the database document does *not* support embedding scripts. - bool bAvailable = !Reference< XEmbeddedScripts >( m_xModel, UNO_QUERY ).is(); +// bool bAvailable = !Reference< XEmbeddedScripts >( m_xModel, UNO_QUERY ).is(); + // 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 bAvailable = false; aReturn.bEnabled = bAvailable; if ( !bAvailable ) aReturn.bInvisible = true; @@ -2450,6 +2454,11 @@ // if we have forms or reports which contain macros/scripts, then show a warning // which suggests the user to migrate them to the database document + // TODO: remove the following line. 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 + return 0L; + Reference< XEmbeddedScripts > xDocumentScripts( m_xModel, UNO_QUERY ); if ( xDocumentScripts.is() ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
