Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:21:20 Modified: dba/dbaccess/source/ui/querydesign/querydlg.cxx
Log: RESYNC: (1.11-1.12); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: querydlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querydlg.cxx?r1=1.11.8.3&r2=1.11.8.4 Delta lines: +24 -22 --------------------- --- querydlg.cxx 25 Apr 2006 12:49:36 -0000 1.11.8.3 +++ querydlg.cxx 4 Jul 2006 08:21:18 -0000 1.11.8.4 @@ -70,26 +70,26 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; -DBG_NAME(DlgQryJoin); +DBG_NAME(DlgQryJoin) DlgQryJoin::DlgQryJoin( Window * pParent, OQueryTableConnectionData* _pData, OJoinTableView::OTableWindowMap* _pTableMap, const Reference< XConnection >& _xConnection, BOOL _bAllowTableSelect) - : ModalDialog( pParent, ModuleRes(DLG_QRY_JOIN) ), - aFL_Join( this, ResId( FL_JOIN ) ), - aML_HelpText( this, ResId(ML_HELPTEXT) ), - aFT_Title( this, ResId(FT_LISTBOXTITLE) ), - aLB_JoinType( this, ResId(LB_JOINTYPE) ), - aPB_OK( this, ResId( PB_OK ) ), - aPB_CANCEL( this, ResId( PB_CANCEL ) ), - aPB_HELP( this, ResId( PB_HELP ) ), - eJoinType(_pData->GetJoinType()), - m_pConnData(NULL), - m_xConnection(_xConnection), - m_pTableMap(_pTableMap), - m_pOrigConnData(_pData) - + :ModalDialog( pParent, ModuleRes(DLG_QRY_JOIN) ) + ,aFL_Join( this, ResId( FL_JOIN ) ) + ,aFT_Title( this, ResId(FT_LISTBOXTITLE) ) + ,aLB_JoinType( this, ResId(LB_JOINTYPE) ) + ,aML_HelpText( this, ResId(ML_HELPTEXT) ) + ,aPB_OK( this, ResId( PB_OK ) ) + ,aPB_CANCEL( this, ResId( PB_CANCEL ) ) + ,aPB_HELP( this, ResId( PB_HELP ) ) + ,m_pTableControl( NULL ) + ,m_pTableMap(_pTableMap) + ,eJoinType(_pData->GetJoinType()) + ,m_pConnData(NULL) + ,m_pOrigConnData(_pData) + ,m_xConnection(_xConnection) { DBG_CTOR(DlgQryJoin,NULL); @@ -174,7 +174,7 @@ delete m_pConnData; } // ----------------------------------------------------------------------------- -IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, pListBox ) +IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) { DBG_CHKTHIS(DlgQryJoin,NULL); aML_HelpText.SetText(String()); @@ -221,7 +221,7 @@ } // ----------------------------------------------------------------------------- -IMPL_LINK( DlgQryJoin, OKClickHdl, Button*, pButton ) +IMPL_LINK( DlgQryJoin, OKClickHdl, Button*, /*pButton*/ ) { DBG_CHKTHIS(DlgQryJoin,NULL); USHORT nPos = aLB_JoinType.GetSelectEntryPos(); @@ -260,9 +260,9 @@ aPB_OK.Enable(_bValid); } // ----------------------------------------------------------------------------- -void DlgQryJoin::notifyConnectionChange(OTableConnectionData* _pConnectionData) +void DlgQryJoin::notifyConnectionChange( ) { - setJoinType(m_pConnData->GetJoinType()); + setJoinType( m_pConnData->GetJoinType() ); } // ----------------------------------------------------------------------------- void DlgQryJoin::setJoinType(EJoinType _eNewJoinType) @@ -282,6 +282,8 @@ case FULL_JOIN: nPos = 3; break; + default: + break; } aLB_JoinType.SelectEntryPos(nPos); LBChangeHdl(&aLB_JoinType); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
