Tag: cws_src680_hsqlcsv User: fs Date: 2008-01-17 02:24:14+0000 Modified: dba/dbaccess/source/ui/control/dbtreelistbox.cxx
Log: RESYNC: (1.15-1.18); FILE MERGED 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.11.36.3&r2=1.11.36.4 Delta lines: +9 -7 ------------------- --- dbtreelistbox.cxx 2006-12-18 07:53:18+0000 1.11.36.3 +++ dbtreelistbox.cxx 2008-01-17 02:24:12+0000 1.11.36.4 @@ -204,9 +204,9 @@ } // ------------------------------------------------------------------------- -void DBTreeListBox::InitEntry( SvLBoxEntry* _pEntry, const XubString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp) +void DBTreeListBox::InitEntry( SvLBoxEntry* _pEntry, const XubString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind) { - SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp); + SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp, eButtonKind); SvLBoxItem* pTextItem(_pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); SvLBoxString* pString = new OBoldListboxString( _pEntry, 0, aStr ); _pEntry->ReplaceItem( pString,_pEntry->GetPos(pTextItem)); @@ -548,11 +548,7 @@ _pPopup->EnableItem(nId,pSubPopUp->HasValidEntries()); } else - { - ::com::sun::star::util::URL aCommand; - aCommand.Complete = _pPopup->GetItemCommand(nId); - _pPopup->EnableItem(nId,_pController->isCommandEnabled(aCommand)); - } + _pPopup->EnableItem( nId, _pController->isCommandEnabled( _pPopup->GetItemCommand( nId ) ) ); } } @@ -586,6 +582,12 @@ aSelectHdl.Call( m_pSelectedEntry ); return 0L; } +// ----------------------------------------------------------------------------- +void DBTreeListBox::StateChanged( StateChangedType nStateChange ) +{ + if ( nStateChange == STATE_CHANGE_VISIBLE && m_aTimer.IsActive() ) + m_aTimer.Stop(); +} // ......................................................................... } // namespace dbaui // ......................................................................... --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
