Tag: odbmacros_2_5 User: fs Date: 2008-02-14 12:35:46+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: #i49133# re-enable the macros in DBDocs, which had been temporarily disable to finalize CWS odbmacros2 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.8&r2=1.50.2.8.2.1 Delta lines: +3 -12 -------------------- --- AppController.cxx 2008-02-14 08:38:01+0000 1.50.2.8 +++ AppController.cxx 2008-02-14 12:35:42+0000 1.50.2.8.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.50.2.8 $ + * $Revision: 1.50.2.8.2.1 $ * - * last change: $Author: fs $ $Date: 2008/02/14 08:38:01 $ + * last change: $Author: fs $ $Date: 2008/02/14 12:35:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -706,11 +706,7 @@ // 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(); - // 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; + bool bAvailable = !Reference< XEmbeddedScripts >( m_xModel, UNO_QUERY ).is(); aReturn.bEnabled = bAvailable; if ( !bAvailable ) aReturn.bInvisible = true; @@ -2454,11 +2450,6 @@ // 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]
