User: kz      
Date: 06/02/28 02:32:31

Modified:
 /dba/connectivity/source/drivers/evoab2/
  NCatalog.cxx

Log:
 INTEGRATION: CWS evo2fixes (1.3.74); FILE MERGED
 2006/02/15 12:15:26 mmeeks 1.3.74.1: Issue numbers: i#50913#, i#62042#, 
i#55893#, i#62043#
 Submitted by: misc, Tor, Jayant, me
 Reviewed by:   mmeeks
 
 Fix a number of bugs, make it work with evo 2.4 & 2.6.

File Changes:

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

File [changed]: NCatalog.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab2/NCatalog.cxx?r1=1.3&r2=1.4
Delta lines:  +25 -1
--------------------
--- NCatalog.cxx        8 Sep 2005 05:49:21 -0000       1.3
+++ NCatalog.cxx        28 Feb 2006 10:32:28 -0000      1.4
@@ -72,7 +72,7 @@
 {
        TStringVector aVector;
        Sequence< ::rtl::OUString > aTypes(1);
-       aTypes[0] = ::rtl::OUString::createFromAscii("%");
+       aTypes[0] = ::rtl::OUString::createFromAscii("TABLE");
        Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
                
::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
 
@@ -92,3 +92,27 @@
        else
                m_pTables = new 
OEvoabTables(m_xMetaData,*this,m_aMutex,aVector);
 }
+// XTablesSupplier
+Reference< XNameAccess > SAL_CALL  OEvoabCatalog::getTables(  ) 
throw(RuntimeException)
+{
+        ::osl::MutexGuard aGuard(m_aMutex);
+
+        try
+        {
+                if (!m_pTables) {
+                        refreshTables();
+                        }
+        }
+        catch( const RuntimeException& )
+        {
+                // allowed to leave this method
+                throw;
+        }
+        catch( const Exception& )
+        {
+                // allowed
+        }
+
+        return m_pTables;
+}
+




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

Reply via email to