User: ihi Date: 2007/04/16 09:26:40 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: INTEGRATION: CWS fwkdbdesign01 (1.39.34); FILE MERGED 2007/02/26 11:42:53 as 1.39.34.1: #i74541# create designer as sub frames of db-model-frame 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.39&r2=1.40 Delta lines: +7 -7 ------------------- --- AppController.cxx 13 Dec 2006 16:46:18 -0000 1.39 +++ AppController.cxx 16 Apr 2007 16:26:37 -0000 1.40 @@ -1173,7 +1173,7 @@ SharedConnection xConnection( ensureConnection() ); if ( xConnection.is() ) { - QueryDesigner aDesigner( getORB(), this, sal_True, SID_DB_NEW_VIEW_SQL == _nId ); + QueryDesigner aDesigner( getORB(), this, m_xCurrentFrame, sal_True, SID_DB_NEW_VIEW_SQL == _nId ); Reference< XDataSource > xDataSource( m_xDataSource, UNO_QUERY ); Reference< XComponent > xComponent( aDesigner.createNew( xDataSource ), UNO_QUERY ); @@ -1222,7 +1222,7 @@ SharedConnection xConnection( ensureConnection() ); if ( xConnection.is() ) { - RelationDesigner aDesigner( getORB(), this ); + RelationDesigner aDesigner( getORB(), this, m_xCurrentFrame ); Reference< XDataSource > xDataSource( m_xDataSource, UNO_QUERY ); Reference< XComponent > xComponent( aDesigner.createNew( xDataSource ), UNO_QUERY ); addDocumentListener( xComponent, NULL ); @@ -1678,7 +1678,7 @@ { if ( _eType == E_TABLE ) { - pDesigner.reset( new TableDesigner( getORB(), this ) ); + pDesigner.reset( new TableDesigner( getORB(), this, m_xCurrentFrame ) ); } else { @@ -1686,13 +1686,13 @@ ( ( _nInstigatorCommand == SID_DB_APP_EDIT_SQL_VIEW ) && ( _eType == E_QUERY ) ); - pDesigner.reset( new QueryDesigner( getORB(), this, sal_False, bQuerySQLMode ) ); + pDesigner.reset( new QueryDesigner( getORB(), this, m_xCurrentFrame, sal_False, bQuerySQLMode ) ); } aDataSource <<= m_xDataSource; } else { - pDesigner.reset( new ResultSetBrowser( getORB(), this, _eType == E_TABLE ) ); + pDesigner.reset( new ResultSetBrowser( getORB(), this, m_xCurrentFrame, _eType == E_TABLE ) ); aArgs.realloc(1); aArgs[0].Name = PROPERTY_SHOWMENU; @@ -1806,11 +1806,11 @@ { if ( _eType == E_TABLE ) { - pDesigner.reset( new TableDesigner( getORB(), this ) ); + pDesigner.reset( new TableDesigner( getORB(), this, m_xCurrentFrame ) ); } else { - pDesigner.reset( new QueryDesigner( getORB(), this, sal_False, _bSQLView ) ); + pDesigner.reset( new QueryDesigner( getORB(), this, m_xCurrentFrame, sal_False, _bSQLView ) ); } 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]
