Tag: cws_src680_oj14 User: oj Date: 2007-06-05 13:12:48+0000 Log: correct merge problems
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.22.4.17&r2=1.22.4.18 Delta lines: +5 -5 ------------------- --- AppController.cxx 2007-06-04 18:00:21+0000 1.22.4.17 +++ AppController.cxx 2007-06-05 13:12:45+0000 1.22.4.18 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.22.4.17 $ + * $Revision: 1.22.4.18 $ * - * last change: $Author: oj $ $Date: 2007/06/04 18:00:21 $ + * last change: $Author: oj $ $Date: 2007/06/05 13:12:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1742,7 +1742,7 @@ } else if ( _eType == E_REPORT ) { - pDesigner.reset(new OReportDesigner(getORB(),this)); + pDesigner.reset(new OReportDesigner(getORB(),this, m_xCurrentFrame )); } aDataSource <<= m_xDataSource; } @@ -1874,7 +1874,7 @@ pDesigner.reset( new QueryDesigner( getORB(), this, m_xCurrentFrame, sal_False, _bSQLView ) ); } else - pDesigner.reset(new OReportDesigner(getORB(),this)); + pDesigner.reset(new OReportDesigner(getORB(),this, m_xCurrentFrame )); Reference< XDataSource > xDataSource( m_xDataSource, UNO_QUERY ); Reference< XComponent > xComponent( pDesigner->createNew( xDataSource ), UNO_QUERY ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
