Tag: cws_src680_dba22ui User: fs Date: 2006/10/11 12:51:15 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: #i10000# 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.34.12.2&r2=1.34.12.3 Delta lines: +4 -8 ------------------- --- AppController.cxx 11 Oct 2006 11:01:54 -0000 1.34.12.2 +++ AppController.cxx 11 Oct 2006 19:51:12 -0000 1.34.12.3 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.34.12.2 $ + * $Revision: 1.34.12.3 $ * - * last change: $Author: fs $ $Date: 2006/10/11 11:01:54 $ + * last change: $Author: fs $ $Date: 2006/10/11 19:51:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1679,15 +1679,11 @@ } else { -<<<<<<< AppController.cxx sal_Bool bQuerySQLMode = ( ( _nInstigatorCommand == SID_DB_APP_EDIT_SQL_VIEW ) && ( _eType == E_QUERY ) ); - pDispatcher.reset( new OQueryDesignAccess( getORB(), sal_False, bQuerySQLMode ) ); -======= - pDesigner.reset( new QueryDesigner( getORB(), this, sal_False, sal_False ) ); ->>>>>>> 1.35 + pDesigner.reset( new QueryDesigner( getORB(), this, sal_False, bQuerySQLMode ) ); } aDataSource <<= m_xDataSource; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
