Tag: cws_src680_oj14 User: oj Date: 2007-06-04 18:00:24+0000 Log: RESYNC: (1.39-1.41); 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.22.4.16&r2=1.22.4.17 Delta lines: +14 -17 --------------------- --- AppController.cxx 2007-05-29 05:16:32+0000 1.22.4.16 +++ AppController.cxx 2007-06-04 18:00:21+0000 1.22.4.17 @@ -1196,7 +1196,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 ); @@ -1245,7 +1245,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 ); @@ -1730,7 +1730,7 @@ { if ( _eType == E_TABLE ) { - pDesigner.reset( new TableDesigner( getORB(), this ) ); + pDesigner.reset( new TableDesigner( getORB(), this, m_xCurrentFrame ) ); } else if ( _eType == E_QUERY ) { @@ -1738,7 +1738,7 @@ ( ( _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 ) ); } else if ( _eType == E_REPORT ) { @@ -1748,7 +1748,7 @@ } 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; @@ -1867,11 +1867,11 @@ { if ( _eType == E_TABLE ) { - pDesigner.reset( new TableDesigner( getORB(), this ) ); + pDesigner.reset( new TableDesigner( getORB(), this, m_xCurrentFrame ) ); } else if ( _eType == E_QUERY ) { - pDesigner.reset( new QueryDesigner( getORB(), this, sal_False, _bSQLView ) ); + pDesigner.reset( new QueryDesigner( getORB(), this, m_xCurrentFrame, sal_False, _bSQLView ) ); } else pDesigner.reset(new OReportDesigner(getORB(),this)); @@ -2023,15 +2023,12 @@ xRename->rename(sNewName); - if ( !Reference< XNameAccess >( xRename, UNO_QUERY ).is() ) - { if ( eType == E_TABLE ) { Reference<XPropertySet> xProp(xRename,UNO_QUERY); sNewName = ::dbaui::composeTableName( m_xMetaData, xProp, ::dbtools::eInDataManipulation, false, false, false ); } getContainer()->elementReplaced( eType , sOldName, sNewName ); - } bTryAgain = sal_False; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
