diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:49:14 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:49:14 +0200 |
| commit | 1b9d68febdb9b19e3255aa88b0b52bb3b5682669 (patch) | |
| tree | 42b2100dc4f294913cd0de0abd8d65af8ecf5ad5 | |
| parent | 7c6061d701fb4c64ab998223fd4328435c23d994 (diff) | |
| parent | 5d3edf5a0db2033b41ca8fe3703c302579e53066 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/base
| -rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index e8d78b42a..d28ba33bb 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -3872,9 +3872,9 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSour SvTreeEntryList* pList = m_pTreeModel->GetChildList( pDataSourceEntry ); if ( pList ) { - for ( size_t i = 0, n = pList->size(); i < n; ++i ) + for ( size_t i = 0, n = pList->Count(); i < n; ++i ) { - SvLBoxEntry* pEntryLoop = static_cast<SvLBoxEntry*>((*pList)[ i ]); + SvLBoxEntry* pEntryLoop = static_cast<SvLBoxEntry*>(pList->GetObject( i )); DBTreeListUserData* pData = static_cast< DBTreeListUserData* >( pEntryLoop->GetUserData() ); pEntryLoop->SetUserData( NULL ); delete pData; diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index a5613550c..868a5f175 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -126,10 +126,10 @@ SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* SvLBoxEntry* pEntry = NULL; if ( pChilds ) { - size_t nCount = pChilds->size(); + size_t nCount = pChilds->Count(); for (size_t i = 0; i < nCount; ++i) { - pEntry = static_cast<SvLBoxEntry*>((*pChilds)[ i ]); + pEntry = static_cast<SvLBoxEntry*>(pChilds->GetObject( i )); SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); if ( pItem->GetText().Equals(aName) ) { |