User: hr Date: 06/06/19 20:00:13 Modified: /dba/dbaccess/source/ui/control/ dbtreelistbox.cxx
Log: INTEGRATION: CWS warnings01 (1.9.74); FILE MERGED 2006/03/24 15:36:06 fs 1.9.74.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: dbtreelistbox.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/dbtreelistbox.cxx?r1=1.9&r2=1.10 Delta lines: +13 -11 --------------------- --- dbtreelistbox.cxx 23 Sep 2005 12:23:53 -0000 1.9 +++ dbtreelistbox.cxx 20 Jun 2006 03:00:10 -0000 1.10 @@ -92,12 +92,12 @@ DBTreeListBox::DBTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nWinStyle ,sal_Bool _bHandleEnterKey) :SvTreeListBox(pParent,nWinStyle) ,m_pSelectedEntry(NULL) - ,m_xORB(_rxORB) - ,m_nSelectLock(0) ,m_pDragedEntry(NULL) ,m_pActionListener(NULL) ,m_pContextMenuActionListener(NULL) + ,m_nSelectLock(0) ,m_bHandleEnterKey(_bHandleEnterKey) + ,m_xORB(_rxORB) { DBG_CTOR(DBTreeListBox,NULL); init(); @@ -107,11 +107,11 @@ :SvTreeListBox(pParent,rResId) ,m_pSelectedEntry(NULL) ,m_pDragedEntry(NULL) - ,m_xORB(_rxORB) - ,m_nSelectLock(0) ,m_pActionListener(NULL) ,m_pContextMenuActionListener(NULL) + ,m_nSelectLock(0) ,m_bHandleEnterKey(_bHandleEnterKey) + ,m_xORB(_rxORB) { DBG_CTOR(DBTreeListBox,NULL); init(); @@ -142,8 +142,8 @@ //------------------------------------------------------------------------ SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* pStart, const IEntryFilter* _pFilter ) const { - SvLBoxTreeList* pModel = GetModel(); - SvTreeEntryList* pChilds = pModel->GetChildList(pStart); + SvLBoxTreeList* myModel = GetModel(); + SvTreeEntryList* pChilds = myModel->GetChildList(pStart); SvLBoxEntry* pEntry = NULL; if ( pChilds ) { @@ -381,7 +381,7 @@ if ( m_pActionListener->requestQuickHelp( pEntry, sQuickHelpText ) ) { Size aSize( GetOutputSizePixel().Width(), GetEntryHeight() ); - Rectangle aScreenRect( OutputToScreenPixel( GetEntryPos( pEntry ) ), aSize ); + Rectangle aScreenRect( OutputToScreenPixel( GetEntryPosition( pEntry ) ), aSize ); Help::ShowQuickHelp( this, aScreenRect, sQuickHelpText, QUICKHELP_LEFT | QUICKHELP_VCENTER ); @@ -438,6 +438,8 @@ if ( bHandled = (m_aDeleteHandler.IsSet() && m_pSelectedEntry) ) m_aDeleteHandler.Call(m_pSelectedEntry); break; + default: + break; } } @@ -471,7 +473,7 @@ SvTreeListBox::KeyInput(rKEvt); } // ----------------------------------------------------------------------------- -BOOL DBTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& _aSelection) +BOOL DBTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& /*_aSelection*/) { return m_aEditingHandler.Call(pEntry) != 0; } @@ -501,14 +503,14 @@ } } // ----------------------------------------------------------------------------- -IMPL_LINK( DBTreeListBox, ScrollUpHdl, SvTreeListBox*, pBox ) +IMPL_LINK( DBTreeListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ ) { scrollWindow(this,m_aMousePos,sal_True); return 0; } //------------------------------------------------------------------------------ -IMPL_LINK( DBTreeListBox, ScrollDownHdl, SvTreeListBox*, pBox ) +IMPL_LINK( DBTreeListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ ) { scrollWindow(this,m_aMousePos,sal_False); return 0; @@ -564,7 +566,7 @@ m_pContextMenuActionListener->executeChecked(_nSelectedPopupEntry,Sequence<PropertyValue>()); } // ----------------------------------------------------------------------------- -IMPL_LINK(DBTreeListBox, OnTimeOut, void*, EMPTY_ARG) +IMPL_LINK(DBTreeListBox, OnTimeOut, void*, /*EMPTY_ARG*/) { if(m_aTimer.IsActive()) m_aTimer.Stop(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
