[Libreoffice-commits] .: dbaccess/source

[Joseph Powers]

 dbaccess/source/ui/browser/unodatbr.cxx      |    7 +++----
 dbaccess/source/ui/control/dbtreelistbox.cxx |    6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 3152eef8941e03eb9b25b4ad58241edc66f589df
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sun May 22 20:26:49 2011 -0700

    class SvTreeEntryList is no longer dependant on class List

diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 4b7e249..9f2d455 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -525,7 +525,7 @@ void SbaTableQueryBrowser::impl_sanitizeRowSetClauses_nothrow()
         // as column name, "NOT_EQUAL" as operator, and "!= <value>" as value, effectively duplicating the
         // information about the operator, and beding all clients to manually remove the "!=" from the value
         // string.
-        // So, what really would be handy, is some 
+        // So, what really would be handy, is some
         //   XNormalizedFilter getNormalizedFilter();
         // with
         //   interface XDisjunctiveFilterExpression
@@ -3866,13 +3866,12 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSour
     SvTreeEntryList* pList = m_pTreeModel->GetChildList( pDataSourceEntry );
     if ( pList )
     {
-        SvLBoxEntry* pEntryLoop = static_cast<SvLBoxEntry*>( pList->First() );
-        while ( pEntryLoop )
+        for ( size_t i = 0, n = pList->size(); i < n; ++i )
         {
+            SvLBoxEntry* pEntryLoop = static_cast<SvLBoxEntry*>((*pList)[ i ]);
             DBTreeListUserData* pData = static_cast< DBTreeListUserData* >( pEntryLoop->GetUserData() );
             pEntryLoop->SetUserData( NULL );
             delete pData;
-            pEntryLoop = static_cast< SvLBoxEntry* >( pList->Next() );
         }
     }
 
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 4c3b6b5..a561355 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 )
     {
-        sal_uLong nCount = pChilds->Count();
-        for (sal_uLong i=0; i < nCount; ++i)
+        size_t nCount = pChilds->size();
+        for (size_t i = 0; i < nCount; ++i)
         {
-            pEntry = static_cast<SvLBoxEntry*>(pChilds->GetObject(i));
+            pEntry = static_cast<SvLBoxEntry*>((*pChilds)[ i ]);
             SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
             if ( pItem->GetText().Equals(aName) )
             {