Tag: cws_src680_hsqlcsv User: fs Date: 2008-01-17 02:25:04+0000 Modified: dba/dbaccess/source/ui/control/tabletree.cxx
Log: RESYNC: (1.33-1.35); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: tabletree.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/tabletree.cxx?r1=1.29.18.6&r2=1.29.18.7 Delta lines: +6 -6 ------------------- --- tabletree.cxx 2006-12-18 07:53:42+0000 1.29.18.6 +++ tabletree.cxx 2008-01-17 02:25:01+0000 1.29.18.7 @@ -181,8 +181,7 @@ else { String sCompleteName( getQualifiedTableName( pEntryLoop ) ); - aImage = m_pImageProvider->getImage( sCompleteName, DatabaseObject::TABLE, false ); - aImageHC = m_pImageProvider->getImage( sCompleteName, DatabaseObject::TABLE, true ); + m_pImageProvider->getImages( sCompleteName, DatabaseObject::TABLE, aImage, aImageHC ); } pContextBitmapItem->SetBitmap1( aImage, BMP_COLOR_NORMAL ); @@ -427,9 +426,9 @@ } //------------------------------------------------------------------------ -void OTableTreeListBox::InitEntry(SvLBoxEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap) +void OTableTreeListBox::InitEntry(SvLBoxEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) { - OMarkableTreeListBox::InitEntry(_pEntry, _rString, _rCollapsedBitmap, _rExpandedBitmap); + OMarkableTreeListBox::InitEntry(_pEntry, _rString, _rCollapsedBitmap, _rExpandedBitmap, _eButtonKind); // replace the text item with our own one SvLBoxItem* pTextItem = _pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING); @@ -480,8 +479,9 @@ { pRet = InsertEntry( sName, pParentEntry, FALSE, LIST_APPEND ); - Image aImage( m_pImageProvider->getImage( _rTableName, DatabaseObject::TABLE, false ) ); - Image aImageHC( m_pImageProvider->getImage( _rTableName, DatabaseObject::TABLE, true ) ); + Image aImage, aImageHC; + m_pImageProvider->getImages( _rTableName, DatabaseObject::TABLE, aImage, aImageHC ); + SetExpandedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL ); SetCollapsedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL ); SetExpandedEntryBmp( pRet, aImageHC, BMP_COLOR_HIGHCONTRAST ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
