Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:50:29 Modified: dba/dbaccess/source/ui/control/TableGrantCtrl.cxx
Log: RESYNC: (1.10-1.11); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: TableGrantCtrl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/TableGrantCtrl.cxx?r1=1.10.8.3&r2=1.10.8.4 Delta lines: +19 -17 --------------------- --- TableGrantCtrl.cxx 25 Apr 2006 12:51:37 -0000 1.10.8.3 +++ TableGrantCtrl.cxx 4 Jul 2006 07:50:26 -0000 1.10.8.4 @@ -77,7 +77,8 @@ const USHORT COL_REF = 7; const USHORT COL_DROP = 8; -DBG_NAME(OTableGrantControl); +DBG_NAME(OTableGrantControl) + //================================================================================ // OTableGrantControl //================================================================================ @@ -85,8 +86,9 @@ :EditBrowseBox( pParent,_RsId, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE ) ,m_pCheckCell( NULL ) ,m_pEdit( NULL ) - ,m_nDeActivateEvent(0) + ,m_nDataPos( 0 ) ,m_bEnable(TRUE) + ,m_nDeactivateEvent(0) { DBG_CTOR(OTableGrantControl,NULL); ////////////////////////////////////////////////////////////////////// @@ -110,10 +112,10 @@ OTableGrantControl::~OTableGrantControl() { DBG_DTOR(OTableGrantControl,NULL); - if (m_nDeActivateEvent) + if (m_nDeactivateEvent) { - Application::RemoveUserEvent(m_nDeActivateEvent); - m_nDeActivateEvent = 0; + Application::RemoveUserEvent(m_nDeactivateEvent); + m_nDeactivateEvent = 0; } delete m_pCheckCell; @@ -194,15 +196,15 @@ if (rNEvt.GetType() == EVENT_LOSEFOCUS) if (!HasChildPathFocus()) { - if (m_nDeActivateEvent) - Application::RemoveUserEvent(m_nDeActivateEvent); - m_nDeActivateEvent = Application::PostUserEvent(LINK(this, OTableGrantControl, AsynchDeactivate)); + if (m_nDeactivateEvent) + Application::RemoveUserEvent(m_nDeactivateEvent); + m_nDeactivateEvent = Application::PostUserEvent(LINK(this, OTableGrantControl, AsynchDeactivate)); } if (rNEvt.GetType() == EVENT_GETFOCUS) { - if (m_nDeActivateEvent) - Application::RemoveUserEvent(m_nDeActivateEvent); - m_nDeActivateEvent = Application::PostUserEvent(LINK(this, OTableGrantControl, AsynchActivate)); + if (m_nDeactivateEvent) + Application::RemoveUserEvent(m_nDeactivateEvent); + m_nDeactivateEvent = Application::PostUserEvent(LINK(this, OTableGrantControl, AsynchActivate)); } return EditBrowseBox::PreNotify(rNEvt); } @@ -210,7 +212,7 @@ //------------------------------------------------------------------------------ IMPL_LINK(OTableGrantControl, AsynchActivate, void*, EMPTYARG) { - m_nDeActivateEvent = 0; + m_nDeactivateEvent = 0; ActivateCell(); return 0L; } @@ -218,7 +220,7 @@ //------------------------------------------------------------------------------ IMPL_LINK(OTableGrantControl, AsynchDeactivate, void*, EMPTYARG) { - m_nDeActivateEvent = 0; + m_nDeactivateEvent = 0; DeactivateCell(); return 0L; } @@ -321,7 +323,7 @@ } //------------------------------------------------------------------------------ -void OTableGrantControl::InitController( CellControllerRef& rController, long nRow, USHORT nColumnId ) +void OTableGrantControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId ) { DBG_CHKTHIS(OTableGrantControl,NULL); String sTablename = m_aTableNames[nRow]; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
