User: hr      
Date: 2006/08/15 03:27:53

Modified:
   dba/connectivity/source/drivers/ado/ACatalog.cxx

Log:
 INTEGRATION: CWS dba30 (1.10.14); FILE MERGED
 2006/05/22 11:23:22 fs 1.10.14.3: #i42048# now proper fix, as advised by OJ
 2006/05/11 12:48:59 fs 1.10.14.2: backing out the fix for #i42048#, it does 
not work and causes a regression (see the issue description)
 2005/12/29 12:30:41 oj 1.10.14.1: #i42048# hide system tables

File Changes:

Directory: /dba/connectivity/source/drivers/ado/
================================================

File [changed]: ACatalog.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ACatalog.cxx?r1=1.10&r2=1.11
Delta lines:  +16 -1
--------------------
--- ACatalog.cxx        8 Sep 2005 05:26:06 -0000       1.10
+++ ACatalog.cxx        15 Aug 2006 10:27:50 -0000      1.11
@@ -81,7 +81,22 @@
        TStringVector aVector;
        
        WpADOTables aTables(m_aCatalog.get_Tables());
-       aTables.fillElementNames(aVector);
+  if ( aTables.IsValid() )
+  {
+    aTables.Refresh();
+    sal_Int32 nCount = aTables.GetItemCount();
+    aVector.reserve(nCount);
+    for(sal_Int32 i=0;i< nCount;++i)
+    {
+        WpADOTable aElement = aTables.GetItem(i);
+         if ( aElement.IsValid() )
+          {
+              ::rtl::OUString sTypeName = aElement.get_Type();
+                     if ( !sTypeName.equalsIgnoreAsciiCaseAscii("SYSTEM 
TABLE") && !sTypeName.equalsIgnoreAsciiCaseAscii("ACCESS TABLE") )
+                    aVector.push_back(aElement.get_Name());
+                  }
+        }
+       }
 
        if(m_pTables)
                m_pTables->reFill(aVector);




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to