Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:54:51 Modified: dba/dbaccess/source/ui/dlg/RelationDlg.cxx
Log: RESYNC: (1.20-1.21); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: RelationDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/RelationDlg.cxx?r1=1.20.4.3&r2=1.20.4.4 Delta lines: +12 -10 --------------------- --- RelationDlg.cxx 25 Apr 2006 13:02:51 -0000 1.20.4.3 +++ RelationDlg.cxx 4 Jul 2006 07:54:48 -0000 1.20.4.4 @@ -97,7 +97,9 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, ORelationTableConnectionData* pConnectionData, BOOL bAllowTableSelect ) - : ModalDialog( pParent, ModuleRes(DLG_REL_PROPERTIES) ) + :ModalDialog( pParent, ModuleRes(DLG_REL_PROPERTIES) ) + ,m_pTableMap(pParent->GetTabWinMap()) + ,aFL_CascUpd( this, ModuleRes(FL_CASC_UPD) ) ,aRB_NoCascUpd( this, ModuleRes(RB_NO_CASC_UPD) ) ,aRB_CascUpd( this, ModuleRes(RB_CASC_UPD) ) @@ -108,14 +110,14 @@ ,aRB_CascDel( this, ModuleRes(RB_CASC_DEL) ) ,aRB_CascDelNull( this, ModuleRes(RB_CASC_DEL_NULL) ) ,aRB_CascDelDefault( this, ModuleRes(RB_CASC_DEL_DEFAULT) ) - ,m_pOrigConnData( pConnectionData ) ,aPB_OK( this, ResId( PB_OK ) ) ,aPB_CANCEL( this, ResId( PB_CANCEL ) ) ,aPB_HELP( this, ResId( PB_HELP ) ) - ,m_bTriedOneUpdate(FALSE) - ,m_pTableMap(pParent->GetTabWinMap()) + ,m_pConnData(NULL) + ,m_pOrigConnData( pConnectionData ) + ,m_bTriedOneUpdate(FALSE) { DBG_CTOR(ORelationDialog,NULL); @@ -201,7 +203,7 @@ //------------------------------------------------------------------------ -IMPL_LINK( ORelationDialog, OKClickHdl, Button*, pButton ) +IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) { ////////////////////////////////////////////////////////////////////// // RadioButtons auslesen @@ -293,7 +295,7 @@ aPB_OK.Enable(_bValid); } // ----------------------------------------------------------------------------- -void ORelationDialog::notifyConnectionChange(OTableConnectionData* _pConnectionData) +void ORelationDialog::notifyConnectionChange() { Init(m_pConnData); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
