Tag: cws_src680_asyncdialogs2 User: pb Date: 2007-05-08 12:10:54+0000 Log: RESYNC: (1.39-1.40); FILE MERGED
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.37.34.3&r2=1.37.34.4 Delta lines: +7 -7 ------------------- --- AppController.cxx 2007-03-08 14:33:20+0000 1.37.34.3 +++ AppController.cxx 2007-05-08 12:10:51+0000 1.37.34.4 @@ -1161,7 +1161,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 ); @@ -1210,7 +1210,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 ); @@ -1702,7 +1702,7 @@ { if ( _eType == E_TABLE ) { - pDesigner.reset( new TableDesigner( getORB(), this ) ); + pDesigner.reset( new TableDesigner( getORB(), this, m_xCurrentFrame ) ); } else { @@ -1710,13 +1710,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; @@ -1830,11 +1830,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]
