[Libreoffice-commits] .: dbaccess/source

Joseph Powers jpowers at kemper.freedesktop.org
Thu May 26 22:05:07 PDT 2011


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

New commits:
commit 5d3edf5a0db2033b41ca8fe3703c302579e53066
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu May 26 20:16:11 2011 -0700

    Revert TreeList to vector<> conversion.
    
    This fixes a bug in Options->Path. I'll need to rework the conversion
    later.

diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 9f2d455..aa775a2 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3866,9 +3866,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 a561355..868a5f1 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) )
             {


More information about the Libreoffice-commits mailing list