INTEGRATION: CWS evo2fixes (1.3.74); FILE MERGED

2006/02/15 12:15:37 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.

1 files changed, 15 insertions, 8 deletions

diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 400fdb147571..bb7bd782221a 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: NTables.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 05:53:50 $
+ *  last change: $Author: kz $ $Date: 2006-02-28 10:35:12 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -78,7 +78,9 @@
 #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
 #include "NDebug.hxx"
 #endif
-
+#ifndef _CONNECTIVITY_EVOAB_TABLE_HXX_
+#include "NTable.hxx"
+#endif
 using namespace ::comphelper;
 
 using namespace ::cppu;
@@ -98,7 +100,7 @@ ObjectType OEvoabTables::createObject(const ::rtl::OUString& aName)
     ::rtl::OUString aSchema = ::rtl::OUString::createFromAscii("%");
 
     Sequence< ::rtl::OUString > aTypes(1);
-    aTypes[0] = ::rtl::OUString::createFromAscii("%");
+    aTypes[0] = ::rtl::OUString::createFromAscii("TABLE");
     ::rtl::OUString sEmpty;
 
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
@@ -109,12 +111,17 @@ ObjectType OEvoabTables::createObject(const ::rtl::OUString& aName)
         Reference< XRow > xRow(xResult,UNO_QUERY);
         if(xResult->next()) // there can be only one table with this name
         {
-            OTable* pRet = new OTable( this, sal_True,
-                                       aName, xRow->getString( 4 ),
-                                       xRow->getString( 5 ), sEmpty );
-            xRet = pRet;
+            OEvoabTable* pRet = new OEvoabTable(
+                    this,
+                    (OEvoabConnection *)static_cast<OEvoabCatalog&>(m_rParent).getConnection(),
+                    aName,
+                    xRow->getString(4),
+                    xRow->getString(5),
+                    sEmpty);
+                    xRet = pRet;
         }
     }
+
     ::comphelper::disposeComponent(xResult);
 
     return xRet;