7 files changed, 29 insertions, 43 deletions
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index ba95720b29cb..5b7b026f922c 100644
--- a/connectivity/source/drivers/adabas/BTable.cxx
+++ b/connectivity/source/drivers/adabas/BTable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BTable.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-30 07:55:15 $
+ *  last change: $Author: oj $ $Date: 2000-10-30 10:57:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -388,13 +388,7 @@ sal_Bool OAdabasTable::create() throw(SQLException, RuntimeException)
 void SAL_CALL OAdabasTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (
-#ifdef GCC
-        sdbcx::OTable_BASE::rBHelper.bDisposed
-#else
-        rBHelper.bDisposed
-#endif
-        )
+    if ( sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed)
                 throw DisposedException();
 
     if(!isNew())
@@ -423,13 +417,7 @@ void SAL_CALL OAdabasTable::rename( const ::rtl::OUString& newName ) throw(SQLEx
 void SAL_CALL OAdabasTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (
-#ifdef GCC
-        sdbcx::OTable_BASE::rBHelper.bDisposed
-#else
-        rBHelper.bDisposed
-#endif
-        )
+    if ( sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed)
                 throw DisposedException();
 
     if(!isNew())
@@ -493,13 +481,7 @@ void SAL_CALL OAdabasTable::alterColumnByName( const ::rtl::OUString& colName, c
 void SAL_CALL OAdabasTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (
-#ifdef GCC
-        sdbcx::OTable_BASE::rBHelper.bDisposed
-#else
-        rBHelper.bDisposed
-#endif
-        )
+    if ( sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed)
                 throw DisposedException();
 
         Reference< XPropertySet > xOld;
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 9f1ef61211ce..dafd4c509f18 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FResultSet.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-30 08:02:15 $
+ *  last change: $Author: oj $ $Date: 2000-10-30 10:59:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,8 @@
  *
  ************************************************************************/
 
+#include <limits>  // included here to prevent problems if compiling with C52
+
 #ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_
 #include "connectivity/sdbcx/VColumn.hxx"
 #endif
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 3e6e3615a7ae..60891e3b9dcf 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ETable.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-30 08:07:33 $
+ *  last change: $Author: oj $ $Date: 2000-10-30 11:00:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,8 @@
  *
  ************************************************************************/
 
+#include <ctype.h>
+
 #ifndef _CONNECTIVITY_FLAT_TABLE_HXX_
 #include "flat/ETable.hxx"
 #endif
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 78659bc704c5..7b788a017306 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VColumn.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-30 07:53:49 $
+ *  last change: $Author: oj $ $Date: 2000-10-30 10:56:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -132,7 +132,7 @@ Sequence< Type > SAL_CALL OColumn::getTypes(  ) throw(RuntimeException)
 Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (rBHelper.bDisposed)
+    if (OColumnDescriptor_BASE::rBHelper.bDisposed)
         throw DisposedException();
     return this;
 }
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index d6e906dfdd7d..9b263fa7ed74 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VIndex.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-30 07:53:49 $
+ *  last change: $Author: oj $ $Date: 2000-10-30 10:56:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,7 +124,7 @@ Sequence< Type > SAL_CALL OIndex::getTypes(  ) throw(RuntimeException)
 Reference< XPropertySet > SAL_CALL OIndex::createDataDescriptor(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (rBHelper.bDisposed)
+    if (ODescriptor_BASE::rBHelper.bDisposed)
         throw DisposedException();
 
     return this;
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 55f88f5995e5..26ef5a416976 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VKey.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-30 07:53:49 $
+ *  last change: $Author: oj $ $Date: 2000-10-30 10:56:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,7 +115,7 @@ Sequence< Type > SAL_CALL OKey::getTypes(  ) throw(RuntimeException)
 Reference< XPropertySet > SAL_CALL OKey::createDataDescriptor(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (rBHelper.bDisposed)
+    if (ODescriptor_BASE::rBHelper.bDisposed)
         throw DisposedException();
 
     return this;
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 630766e6f14d..bde044e11cb7 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VTable.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-30 07:53:49 $
+ *  last change: $Author: oj $ $Date: 2000-10-30 10:56:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -140,7 +140,7 @@ void SAL_CALL OTable::disposing(void)
 Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (rBHelper.bDisposed)
+    if (OTableDescriptor_BASE::rBHelper.bDisposed)
         throw DisposedException();
 
     return this;
@@ -150,7 +150,7 @@ Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor(  ) throw(Runtim
 Reference< XNameAccess > SAL_CALL OTable::getIndexes(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (rBHelper.bDisposed)
+    if (OTableDescriptor_BASE::rBHelper.bDisposed)
         throw DisposedException();
 
     if(!m_pIndexes)
@@ -163,7 +163,7 @@ Reference< XNameAccess > SAL_CALL OTable::getIndexes(  ) throw(RuntimeException)
 void SAL_CALL OTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (rBHelper.bDisposed)
+    if (OTableDescriptor_BASE::rBHelper.bDisposed)
         throw DisposedException();
 
 }
@@ -172,7 +172,7 @@ void SAL_CALL OTable::rename( const ::rtl::OUString& newName ) throw(SQLExceptio
 void SAL_CALL OTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (rBHelper.bDisposed)
+    if (OTableDescriptor_BASE::rBHelper.bDisposed)
         throw DisposedException();
 
 }
@@ -180,7 +180,7 @@ void SAL_CALL OTable::alterColumnByName( const ::rtl::OUString& colName, const R
 void SAL_CALL OTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
-    if (rBHelper.bDisposed)
+    if (OTableDescriptor_BASE::rBHelper.bDisposed)
         throw DisposedException();
 
 }