#86528# some outlining

37 files changed, 759 insertions, 217 deletions

diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index bf5ef3d078b9..5b124e66c84e 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BDriver.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-27 10:08:07 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:13:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -254,5 +254,16 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const ::r
 {
     return getDataDefinitionByConnection(connect(url,info));
 }
+// -----------------------------------------------------------------------------
+void SAL_CALL ODriver::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    ODriver_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL ODriver::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    ODriver_BASE::release();
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index e57cafbb505e..928bebc74d28 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.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-15 08:46:40 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -589,6 +589,18 @@ void SAL_CALL OAdabasTable::alterColumnByIndex( sal_Int32 index, const Reference
 {
     return m_SchemaName + '.' + m_Name;
 }
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdabasTable::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OTable_TYPEDEF::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdabasTable::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OTable_TYPEDEF::release();
+}
+// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 100655ad4435..7ee2cdd83214 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ACallableStatement.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-12 12:31:30 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -254,5 +254,16 @@ Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex ) t
     return NULL;
 }
 // -------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OCallableStatement::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OPreparedStatement::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OCallableStatement::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OPreparedStatement::release();
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 7d75b4956a94..7777f9f86819 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AColumn.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-27 11:38:25 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -313,6 +313,17 @@ WpADOColumn OAdoColumn::getColumnImpl() const
     return m_aColumn;
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoColumn::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OColumn_ADO::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoColumn::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OColumn_ADO::release();
+}
+// -----------------------------------------------------------------------------
 
 
 
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index dd88b828c814..1d60b2933d0d 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ADatabaseMetaDataResultSet.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2001-04-19 14:59:28 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1340,4 +1340,20 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap()
     pMetaData->setTypeInfoMap();
     m_xMetaData = pMetaData;
 }
+// -----------------------------------------------------------------------------
+void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    ODatabaseMetaDataResultSet_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL ODatabaseMetaDataResultSet::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    ODatabaseMetaDataResultSet_BASE::release();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index 3274d79897b7..3a494bb0633c 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AGroup.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-03 14:09:51 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -324,5 +324,16 @@ RightsEnum OAdoGroup::Map2Right(sal_Int32 _eNum)
 
     return (RightsEnum)nRight;
 }
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoGroup::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OGroup_ADO::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoGroup::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OGroup_ADO::release();
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 9cdb61d8108f..c4eabc5ce8fc 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AIndex.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-12 12:31:30 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -233,6 +233,17 @@ void OAdoIndex::fillPropertyValues()
     }
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoIndex::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OIndex_ADO::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoIndex::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OIndex_ADO::release();
+}
+// -----------------------------------------------------------------------------
 
 
 
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index 59d15c79ed43..00135bc18927 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AKey.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-12 12:31:30 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -322,5 +322,16 @@ KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum) const
     return eNum;
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoKey::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OKey_ADO::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoKey::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OKey_ADO::release();
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 7a131f7a785f..c71315979f66 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: APreparedStatement.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-12 12:31:30 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -462,6 +462,17 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch(  ) throw(SQLExc
     return Sequence< sal_Int32 > ();
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OPreparedStatement::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_Base::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OPreparedStatement::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_Base::release();
+}
+// -----------------------------------------------------------------------------
 
 
 
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 1d41c9b764eb..e94b69877253 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AResultSet.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-12 12:31:30 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1330,5 +1330,21 @@ void OResultSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
             break;
     }
 }
+// -----------------------------------------------------------------------------
+void SAL_CALL OResultSet::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OResultSet_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OResultSet::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OResultSet_BASE::release();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 75a80213f21f..0a9a74dfaf7d 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AStatement.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-12 15:07:33 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -850,4 +850,25 @@ OStatement::~OStatement()
 {
 }
 IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.AStatement","com.sun.star.sdbc.Statement");
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement_Base::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_Base::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_Base::release();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index 51b88916b236..c1ef62742209 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ATable.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-12 12:31:30 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:13:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -395,4 +395,15 @@ void OAdoTable::fillPropertyValues()
     return aBSTR;
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoTable::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OTable_TYPEDEF::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoTable::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OTable_TYPEDEF::release();
+}
+// -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index 2f05ee5911a2..52d0cdc475bf 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AUser.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-03 14:09:51 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -242,6 +242,17 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper()
     return *OUserExtend_PROP::getArrayHelper();
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoUser::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OUser_TYPEDEF::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoUser::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OUser_TYPEDEF::release();
+}
+// -----------------------------------------------------------------------------
 
 
 
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index 709d501656e4..53739893103e 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AView.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-24 14:13:15 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -207,5 +207,16 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
     }
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoView::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OView_ADO::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OAdoView::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OView_ADO::release();
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index 7c913ce473e7..d19b4de1bfe7 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CResultSet.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: nn $ $Date: 2001-01-26 19:05:48 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -226,5 +226,21 @@ cppu::IPropertyArrayHelper* OCalcResultSet::createArrayHelper() const
     return new cppu::OPropertyArrayHelper(aProps);
 }
 // -------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OCalcResultSet::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OCalcResultSet_BASE2::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OCalcResultSet::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OCalcResultSet_BASE2::release();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 4cc6523672dd..c07a2d1e7c39 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DIndex.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-19 07:10:38 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -725,6 +725,17 @@ BOOL ODbaseIndex::CreateImpl()
     return sal_True;
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL ODbaseIndex::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    ODbaseIndex_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL ODbaseIndex::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    ODbaseIndex_BASE::release();
+}
+// -----------------------------------------------------------------------------
 
 
 
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index e5669df7d29f..83f73bec3f42 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DIndexIter.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:21 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -205,7 +205,7 @@ ULONG OIndexIterator::GetCompare(BOOL bFirst)
                 while ((pKey = GetNextKey()) && !m_pOperator->operate(pKey,m_pOperand));
                 break;
             case SQL_PRED_LESS:
-                while ((pKey = GetNextKey()) && !pKey->getValue().hasValue());
+                while ((pKey = GetNextKey()) && pKey->getValue().isNull());
                 break;
             case SQL_PRED_LESSOREQUAL:
                 while (pKey = GetNextKey());
@@ -281,7 +281,7 @@ ULONG OIndexIterator::GetNull(BOOL bFirst)
     }
 
     ONDXKey* pKey;
-    if (!(pKey = GetNextKey()) || pKey->getValue().hasValue())
+    if (!(pKey = GetNextKey()) || !pKey->getValue().isNull())
     {
         pKey = NULL;
         m_aCurLeaf = NULL;
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 676f2a113215..14a45466e2d4 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DResultSet.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-11 06:19:01 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -261,5 +261,21 @@ cppu::IPropertyArrayHelper* ODbaseResultSet::createArrayHelper() const
     return new cppu::OPropertyArrayHelper(aProps);
 }
 // -------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL ODbaseResultSet::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    ODbaseResultSet_BASE2::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL ODbaseResultSet::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    ODbaseResultSet_BASE2::release();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index e5e090719e7c..e8cba5ef345b 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DTable.cxx,v $
  *
- *  $Revision: 1.38 $
+ *  $Revision: 1.39 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-30 12:45:56 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2175,4 +2175,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable)
     }
 }
 // -----------------------------------------------------------------------------
-
+sal_Int32 ODbaseTable::getCurrentLastPos() const
+{
+    return m_aHeader.db_anz;
+}
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index b6bf532b717b..46426f6e7cf2 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dindexnode.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-30 13:57:18 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -808,17 +808,17 @@ void ONDXPage::PrintPage()
         if (!IsLeaf())
             rNode.GetChild(&rIndex, this);
 
-        if (!rKey.getValue().hasValue())
+        if (rKey.getValue().isNull())
         {
             DBG_TRACE2("SDB: [%d,NULL,%d]",rKey.GetRecord(), rNode.GetChild().GetPagePos());
         }
         else if (rIndex.getHeader().db_keytype)
         {
-            DBG_TRACE3("SDB: [%d,%f,%d]",rKey.GetRecord(), getDouble(rKey.getValue()),rNode.GetChild().GetPagePos());
+            DBG_TRACE3("SDB: [%d,%f,%d]",rKey.GetRecord(), rKey.getValue().getDouble(),rNode.GetChild().GetPagePos());
         }
         else
         {
-            DBG_TRACE3("SDB: [%d,%s,%d]",rKey.GetRecord(), (const char* )ByteString(getString(rKey.getValue()).getStr(), rIndex.m_pTable->getConnection()->getTextEncoding()).GetBuffer(),rNode.GetChild().GetPagePos());
+            DBG_TRACE3("SDB: [%d,%s,%d]",rKey.GetRecord(), (const char* )ByteString(rKey.getValue().getString().getStr(), rIndex.m_pTable->getConnection()->getTextEncoding()).GetBuffer(),rNode.GetChild().GetPagePos());
         }
     }
     DBG_TRACE("SDB: -----------------------------------------------\n");
@@ -913,20 +913,21 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
 
     if (rIndex.getHeader().db_keytype) // double
     {
-        if (!aKey.getValue().hasValue())
+        if (aKey.getValue().isNull())
         {
             memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
             rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
         }
         else
-            rStream << (double) getDouble(aKey.getValue());
+            rStream << (double) aKey.getValue();
     }
     else
     {
         memset(aNodeData.aData,0x20,rIndex.getHeader().db_keylen);
-        if (aKey.getValue().hasValue())
+        if (!aKey.getValue().isNull())
         {
-            ByteString aText(getString(aKey.getValue()).getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
+            ::rtl::OUString sValue = aKey.getValue();
+            ByteString aText(sValue.getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
             strncpy(aNodeData.aData,aText.GetBuffer(),min(rIndex.getHeader().db_keylen, aText.Len()));
         }
         rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
@@ -960,31 +961,28 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
     //  DBG_ASSERT(is(), "Falscher Indexzugriff");
     StringCompare eResult;
 
-    if (!getValue().getValue() || !getValue().hasValue())
+    if (getValue().isNull())
     {
-        if (!rKey.getValue().getValue() || !rKey.getValue().hasValue() || (rKey.IsText(getDBType()) && !getString(rKey.getValue()).getLength()))
+        if (rKey.getValue().isNull() || (rKey.IsText(getDBType()) && !rKey.getValue().getString().getLength()))
             eResult = COMPARE_EQUAL;
         else
             eResult = COMPARE_LESS;
     }
-    else if (!rKey.getValue().getValue() || !rKey.getValue().hasValue())
+    else if (rKey.getValue().isNull())
     {
-        if (!getValue().getValue() || !getValue().hasValue() || (IsText(getDBType()) && !getString(getValue()).getLength()))
+        if (getValue().isNull() || (IsText(getDBType()) && !getValue().getString().getLength()))
             eResult = COMPARE_EQUAL;
         else
             eResult = COMPARE_GREATER;
     }
     else if (IsText(getDBType()))
     {
-        INT32 nRes = getString(getValue()).compareTo(getString(rKey.getValue()));
+        INT32 nRes = getValue().getString().compareTo(rKey.getValue());
         eResult = (nRes > 0) ? COMPARE_GREATER : (nRes == 0) ? COMPARE_EQUAL : COMPARE_LESS;
     }
     else
     {
-        double m,n;
-        getValue() >>= m;
-        rKey.getValue() >>= n;
-
+        double m = getValue(),n = rKey.getValue();
         eResult = (m > n) ? COMPARE_GREATER : (n == m) ? COMPARE_EQUAL : COMPARE_LESS;
     }
 
@@ -995,4 +993,16 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
 
     return eResult;
 }
+// -----------------------------------------------------------------------------
+void ONDXKey::setValue(const ORowSetValue& _rVal)
+{
+    xValue = _rVal;
+}
+// -----------------------------------------------------------------------------
+ORowSetValue ONDXKey::getValue() const
+{
+    return xValue;
+}
+// -----------------------------------------------------------------------------
+
 
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index c8e3ee7149ec..f75f462eeaad 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FCatalog.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-30 14:07:21 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,5 +154,7 @@ Sequence< Type > SAL_CALL OFileCatalog::getTypes(  ) throw(RuntimeException)
     return aRet;
 }
 // -----------------------------------------------------------------------------
-
+void OFileCatalog::refreshViews(){}
+void OFileCatalog::refreshGroups(){}
+void OFileCatalog::refreshUsers(){}
 
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index c57c7d7fcd7f..ff571c25565c 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FDriver.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-27 10:08:10 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -207,18 +207,12 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection
     return xTab;
 }
 
-//------------------------------------------------------------------
-Any SAL_CALL OFileDriver::queryInterface( const Type & rType ) throw(RuntimeException)
-{
-        Any aRet = ::cppu::queryInterface(rType, static_cast<XDataDefinitionSupplier*>(this));
-    if(aRet.hasValue())
-       return aRet;
-    return ODriver_BASE::queryInterface(rType);
-}
 // --------------------------------------------------------------------------------
 Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     return getDataDefinitionByConnection(connect(url,info));
 }
+// -----------------------------------------------------------------------------
+
 
 
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index d6557a2d55be..21986788cf51 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FPreparedStatement.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-06 14:03:08 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -602,4 +602,15 @@ Reference<XResultSet> OPreparedStatement::initResultSet()
     return xRs;
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OPreparedStatement::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_BASE2::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OPreparedStatement::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_BASE2::release();
+}
+// -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index e6f5f3ecf4d2..3292ea89cf61 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.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-19 07:07:28 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2831,6 +2831,37 @@ UINT32 OResultSet::AddParameter(OSQLParseNode * pParameter, const Reference<XPro
     m_xParamColumns->push_back(xParaColumn);
     return nParameter;
 }
+// -----------------------------------------------------------------------------
+void OResultSet::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable)
+{
+    Reference<XPropertySet> xProp;
+    if(SQL_ISRULE(_pNode,column_ref))
+    {
+        ::rtl::OUString sColumnName,sTableRange;
+        m_aSQLIterator.getColumnRange(_pNode,sColumnName,sTableRange);
+        if(sColumnName.getLength())
+        {
+            Reference<XNameAccess> xNameAccess = _xTable->getColumns();
+            if(xNameAccess->hasByName(sColumnName))
+                xNameAccess->getByName(sColumnName) >>= xProp;;
+            AddParameter(_pParameter,xProp);
+        }
+    }
+    else
+        AddParameter(_pParameter,xProp);
+//  else if(SQL_ISRULE(_pNode,num_value_exp))
+//  {
+//      describeColumn(*aIter,_pNode->getChild(),_xTable);
+//  }
+//  else if(SQL_ISRULE(_pNode,term))
+//  {
+//      describeColumn(*aIter,,_xTable);
+//  }
+//  else
+//  {
+//      describeColumn(*aIter,,_xTable);
+//  }
+}
 // -------------------------------------------------------------------------
 void OResultSet::describeParameter()
 {
@@ -2840,22 +2871,27 @@ void OResultSet::describeParameter()
     {
         m_xParamColumns = new OSQLColumns();
         const OSQLTables& xTabs = m_aSQLIterator.getTables();
-        OSQLTable xTable = xTabs.begin()->second;
-
-        ::rtl::OUString aTabName,aTmp,aColName,aParameterName;
-        ::std::vector< OSQLParseNode*>::iterator aIter = aParseNodes.begin();
-        for(;aIter != aParseNodes.end();++aIter)
+        if(xTabs.size())
         {
-            BOOL bNotFound(TRUE);
-            OSQLParseNode* pParseNode = *aIter;
-            pParseNode = pParseNode->getParent();
-            pParseNode = pParseNode->getChild(0);
-
-            m_aSQLIterator.getColumnRange(pParseNode,aColName,aTabName);
-            Reference<XPropertySet> xCol;
-            ::cppu::extractInterface(xCol,xTable->getColumns()->getByName(aColName));
-            m_xParamColumns->push_back(xCol);
+            OSQLTable xTable = xTabs.begin()->second;
+            ::std::vector< OSQLParseNode*>::const_iterator aIter = aParseNodes.begin();
+            for (;aIter != aParseNodes.end();++aIter )
+            {
+                describeColumn(*aIter,(*aIter)->getParent()->getChild(0),xTable);
+            }
         }
+
+//      ::vos::ORef<OSQLColumns> xColumns = m_aSQLIterator.getParameters();
+//      if(xColumns.isValid())
+//      {
+//          OSL_ENSURE(aParseNodes.size() == xColumns->size(),"Not all parameters found!");
+//          ::rtl::OUString aTabName,aColName,aParameterName;
+//          OSQLColumns::iterator aIter = xColumns->begin();
+//          for(;aIter != xColumns->end();++aIter)
+//          {
+//              m_xParamColumns->push_back(*aIter);
+//          }
+//      }
     }
 }
 //------------------------------------------------------------------
@@ -2952,4 +2988,20 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
     }
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OResultSet::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OResultSet_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OResultSet::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OResultSet_BASE::release();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index ba58aec6d262..aea96f370917 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FStatement.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: oj $ $Date: 2001-02-23 10:51:03 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -181,6 +181,11 @@ void OStatement_BASE2::disposing()
     dispose_ChildImpl();
     OStatement_Base::disposing();
 }
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement_Base::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_BASE::acquire();
+}
 //-----------------------------------------------------------------------------
 void SAL_CALL OStatement_BASE2::release() throw(RuntimeException)
 {
@@ -404,6 +409,34 @@ OResultSet* OStatement::createResultSet()
 }
 // -------------------------------------------------------------------------
 IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbc.driver.file.Statement","com.sun.star.sdbc.Statement");
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_BASE2::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_BASE2::release();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement_Base::disposing(void)
+{
+    OStatement_BASE::disposing();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Any SAL_CALL OStatement::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return OStatement_BASE2::queryInterface( rType);
+}
+// -----------------------------------------------------------------------------
+
 
     }
-}
\ No newline at end of file
+}
+// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 89e0a96870cf..e9e03bb38463 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FTable.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2000-12-06 15:48:47 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,6 +83,7 @@
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #endif
 
+using namespace connectivity;
 using namespace connectivity::file;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -218,5 +219,35 @@ void OFileTable::FileClose()
     }
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OFileTable::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OTable_TYPEDEF::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OFileTable::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OTable_TYPEDEF::release();
+}
+// -----------------------------------------------------------------------------
+BOOL OFileTable::InsertRow(OValueVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols)
+{
+    return sal_False;
+}
+// -----------------------------------------------------------------------------
+BOOL OFileTable::DeleteRow(const OSQLColumns& _rCols)
+{
+    return sal_False;
+}
+// -----------------------------------------------------------------------------
+BOOL OFileTable::UpdateRow(OValueVector& rRow, OValueRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols)
+{
+    return sal_False;
+}
+// -----------------------------------------------------------------------------
+void OFileTable::addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor)
+{
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index bd0370d9b5b7..84bf194e1eea 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fanalyzer.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-20 16:49:26 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -274,7 +274,7 @@ void OSQLAnalyzer::describeParam(::vos::ORef<OSQLColumns> rParameterColumns)
                     if (pLeft)
                     {
                         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xCol;
-                        ::cppu::extractInterface(xCol,Reference< XIndexAccess>(m_aCompiler.getOrigColumns(),UNO_QUERY)->getByIndex(pLeft->getRowPos()));
+                        Reference< XIndexAccess>(m_aCompiler.getOrigColumns(),UNO_QUERY)->getByIndex(pLeft->getRowPos()) >>= xCol;
                         OSL_ENSURE(xCol.is(), "Ung�ltige Struktur");
                         pParam->describe(xCol, aNewParamColumns);
                     }
@@ -300,5 +300,17 @@ void OSQLAnalyzer::clean()
 {
     m_aCompiler.Clean();
 }
+// -----------------------------------------------------------------------------
+OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol)
+{
+    return new OOperandAttr(_nPos,_xCol);
+}
+// -----------------------------------------------------------------------------
+OOperandAttr* OFILEAnalyzer::createOperandAttr(sal_Int32 _nPos,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol)
+{
+    return new OFILEOperandAttr(_nPos,_xCol);
+}
+// -----------------------------------------------------------------------------
+
 
 
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index cd2804bc147a..9b2abbd73b4c 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fcode.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-10 08:51:14 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -148,16 +148,21 @@ void OOperandRow::bindValue(OValueRow _pRow)
     (*m_pRow)[m_nRowPos].setBound(sal_True);
 }
 // -----------------------------------------------------------------------------
-void OOperandRow::setValue(const ::com::sun::star::uno::Any& _rVal)
+void OOperandRow::setValue(const ORowSetValue& _rVal)
 {
     OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->size(),"Invalid RowPos is >= vector.size()");
     (*m_pRow)[m_nRowPos] = _rVal;
 }
 //------------------------------------------------------------------
-Any OOperandRow::getValue() const
+ORowSetValue OOperandRow::getValue() const
 {
     OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->size(),"Invalid RowPos is >= vector.size()");
-    return (*m_pRow)[m_nRowPos].makeAny();
+    return (*m_pRow)[m_nRowPos];
+}
+// -----------------------------------------------------------------------------
+void OOperandValue::setValue(const ORowSetValue& _rVal)
+{
+    m_aValue = _rVal;
 }
 //------------------------------------------------------------------
 OOperandAttr::OOperandAttr(sal_uInt16 _nPos,const Reference< XPropertySet>& _xColumn)
@@ -238,19 +243,25 @@ void OOperandParam::describe(const Reference< XPropertySet>& rColumn, ::vos::ORe
 
     Reference< XPropertySet> xColumn = (*rParameterColumns)[getRowPos()];
 
-    xColumn->setPropertyValue(PROPERTY_TYPENAME,rColumn->getPropertyValue(PROPERTY_TYPENAME));
-    xColumn->setPropertyValue(PROPERTY_DEFAULTVALUE,rColumn->getPropertyValue(PROPERTY_DEFAULTVALUE));
-    xColumn->setPropertyValue(PROPERTY_PRECISION,rColumn->getPropertyValue(PROPERTY_PRECISION));
-    xColumn->setPropertyValue(PROPERTY_TYPE,rColumn->getPropertyValue(PROPERTY_TYPE));
-    xColumn->setPropertyValue(PROPERTY_SCALE,rColumn->getPropertyValue(PROPERTY_SCALE));
-    xColumn->setPropertyValue(PROPERTY_ISNULLABLE,rColumn->getPropertyValue(PROPERTY_ISNULLABLE));
-    xColumn->setPropertyValue(PROPERTY_ISAUTOINCREMENT,rColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT));
+    try
+    {
+        xColumn->setPropertyValue(PROPERTY_TYPENAME,rColumn->getPropertyValue(PROPERTY_TYPENAME));
+        xColumn->setPropertyValue(PROPERTY_DEFAULTVALUE,rColumn->getPropertyValue(PROPERTY_DEFAULTVALUE));
+        xColumn->setPropertyValue(PROPERTY_PRECISION,rColumn->getPropertyValue(PROPERTY_PRECISION));
+        xColumn->setPropertyValue(PROPERTY_TYPE,rColumn->getPropertyValue(PROPERTY_TYPE));
+        xColumn->setPropertyValue(PROPERTY_SCALE,rColumn->getPropertyValue(PROPERTY_SCALE));
+        xColumn->setPropertyValue(PROPERTY_ISNULLABLE,rColumn->getPropertyValue(PROPERTY_ISNULLABLE));
+        xColumn->setPropertyValue(PROPERTY_ISAUTOINCREMENT,rColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT));
+    }
+    catch(const Exception&)
+    {
+    }
 
     m_eDBType = getINT32(rColumn->getPropertyValue(PROPERTY_TYPE));
 }
 
 //------------------------------------------------------------------
-Any OOperandValue::getValue() const
+ORowSetValue OOperandValue::getValue() const
 {
     return m_aValue;
 }
@@ -261,13 +272,13 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const rtl::OUStrin
     switch (rColumnRef.getNodeType())
     {
         case SQL_NODE_STRING:
-            m_aValue <<= aStrValue;
+            m_aValue = aStrValue;
             m_eDBType = DataType::VARCHAR;
             return;
         case SQL_NODE_INTNUM:
         case SQL_NODE_APPROXNUM:
         {
-            m_aValue <<= aStrValue.toDouble();
+            m_aValue = aStrValue.toDouble();
 
             m_eDBType = DataType::DOUBLE;
             return;
@@ -276,12 +287,12 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const rtl::OUStrin
 
     if (SQL_ISTOKEN(&rColumnRef,TRUE))
     {
-        m_aValue <<= 1.0;
+        m_aValue = 1.0;
         m_eDBType = DataType::BIT;
     }
     else if (SQL_ISTOKEN(&rColumnRef,FALSE))
     {
-        m_aValue <<= 0.0;
+        m_aValue = 0.0;
         m_eDBType = DataType::BIT;
     }
     else
@@ -344,8 +355,8 @@ void OOp_ISNULL::Exec(OCodeStack& rCodeStack)
 //------------------------------------------------------------------
 sal_Bool OOp_ISNULL::operate(const OOperand* pOperand, const OOperand*) const
 {
-    Any aRet(pOperand->getValue());
-    return !aRet.hasValue();
+    ORowSetValue aRet(pOperand->getValue());
+    return aRet.isNull();
 }
 
 //------------------------------------------------------------------
@@ -358,14 +369,14 @@ sal_Bool OOp_ISNOTNULL::operate(const OOperand* pOperand, const OOperand*) const
 sal_Bool OOp_LIKE::operate(const OOperand* pLeft, const OOperand* pRight) const
 {
     sal_Bool bMatch;
-    Any aLH(pLeft->getValue());
-    Any aRH(pRight->getValue());
+    ORowSetValue aLH(pLeft->getValue());
+    ORowSetValue aRH(pRight->getValue());
 
-    if (!aLH.hasValue() || !aRH.hasValue())
+    if (aLH.isNull() || aRH.isNull())
         bMatch = sal_False;
     else
     {
-        bMatch = match(getString(aRH), getString(aLH), cEscape);
+        bMatch = match(aRH.getString(), aLH.getString(), cEscape);
     }
     return bMatch;
 }
@@ -379,13 +390,10 @@ sal_Bool OOp_NOTLIKE::operate(const OOperand* pLeft, const OOperand* pRight) con
 //------------------------------------------------------------------
 sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) const
 {
-    Any aLH(pLeft->getValue());
-    Any aRH(pRight->getValue());
+    ORowSetValue aLH(pLeft->getValue());
+    ORowSetValue aRH(pRight->getValue());
 
-//  if (!aLH.hasValue() || !aRH.hasValue())
-//      return TRUE;
-
-    if (!aLH.hasValue() || !aRH.hasValue()) // if (!aLH.getValue() || !aRH.getValue())
+    if (aLH.isNull() || aRH.isNull()) // if (!aLH.getValue() || !aRH.getValue())
         return sal_False;
 
     sal_Bool bResult = sal_False;
@@ -404,7 +412,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
 
             static rtl::OLocale aLocale = rtl::OLocale::registerLocale(sLanguage, sCountry);
 
-            INT32 nRes = compareIgnoreCase(getString(aLH), getString(aRH), aLocale);
+            INT32 nRes = compareIgnoreCase(aLH, aRH, aLocale);
             switch(aPredicateType)
             {
                 case SQL_PRED_EQUAL:            bResult = (nRes == 0); break;
@@ -428,9 +436,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
         case DataType::DATE:
         case DataType::TIME:
         {
-            double n,m;
-            aLH >>= n;
-            aRH >>= m;
+            double n = aLH ,m = aRH;
 
             switch (aPredicateType)
             {
@@ -446,8 +452,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
             }
         } break;
         default:
-            DBG_ERROR("OFILECursor::ExecuteRow: Vergleich mit diesem Datentyp nicht implementiert");
-            bResult = sal_False;
+            bResult = aLH == aRH;
     }
     return bResult;
 }
@@ -461,21 +466,47 @@ void ONumOperator::Exec(OCodeStack& rCodeStack)
     OOperand  *pLeft    = rCodeStack.top();
     rCodeStack.pop();
 
-    rCodeStack.push(new OOperandResultNUM(operate(getDouble(pLeft->getValue()), getDouble(pRight->getValue()))));
-    if (IS_TYPE(OOperandResult,pLeft)) delete pLeft;
-    if (IS_TYPE(OOperandResult,pRight)) delete pRight;
+    rCodeStack.push(new OOperandResultNUM(operate(pLeft->getValue(), pRight->getValue())));
+    if (IS_TYPE(OOperandResult,pLeft))
+        delete pLeft;
+    if (IS_TYPE(OOperandResult,pRight))
+        delete pRight;
 }
 //------------------------------------------------------------------
-double OOp_ADD::operate(double fLeft, double fRight) const {return fLeft + fRight;};
+double OOp_ADD::operate(const double& fLeft,const double& fRight) const
+{
+    return fLeft + fRight;
+}
 
 //------------------------------------------------------------------
-double OOp_SUB::operate(double fLeft, double fRight) const {return fLeft - fRight;};
+double OOp_SUB::operate(const double& fLeft,const double& fRight) const
+{
+    return fLeft - fRight;
+}
 
 //------------------------------------------------------------------
-double OOp_MUL::operate(double fLeft, double fRight) const {return fLeft * fRight;};
+double OOp_MUL::operate(const double& fLeft,const double& fRight) const
+{
+    return fLeft * fRight;
+}
 
 //------------------------------------------------------------------
-double OOp_DIV::operate(double fLeft, double fRight) const {return fLeft / fRight;};
+double OOp_DIV::operate(const double& fLeft,const double& fRight) const
+{
+    return fLeft / fRight;
+}
+// -----------------------------------------------------------------------------
+sal_Bool OOperandAttr::isIndexed() const
+{
+    return sal_False;
+}
+// -----------------------------------------------------------------------------
+OEvaluateSet* OOperandAttr::preProcess(OBoolOperator* pOp, OOperand* pRight)
+{
+    return NULL;
+}
+// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 1058b1ca3bf6..26e3253afbea 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fcomp.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-10 08:51:14 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -188,7 +188,7 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode)
     {
         // Die Where Clause ist meistens optional, d. h. es koennte sich auch
         // um "optional_where_clause" handeln.
-        DBG_ASSERT(SQL_ISRULE(pWhereClause,opt_where_clause),"OFILECursor: Fehler im Parse Tree");
+        DBG_ASSERT(SQL_ISRULE(pWhereClause,opt_where_clause),"OPredicateCompiler: Fehler im Parse Tree");
     }
 }
 
@@ -218,7 +218,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
             m_aCodeList.push_back(new OOp_AND());
         else
         {
-            DBG_ERROR("OFILECursor: Fehler im Parse Tree");
+            DBG_ERROR("OPredicateCompiler: Fehler im Parse Tree");
         }
     }
     else if (SQL_ISRULE(pPredicateNode,comparison_predicate))
@@ -233,6 +233,36 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
     {
         execute_ISNULL(pPredicateNode);
     }
+    else if(SQL_ISRULE(pPredicateNode,num_value_exp))
+    {
+        execute(pPredicateNode->getChild(0));                           // Bearbeiten des linken Zweigs
+        execute(pPredicateNode->getChild(2));                           // Bearbeiten des rechten Zweigs
+        if (SQL_ISPUNCTUATION(pPredicateNode->getChild(1),"+"))
+        {
+            m_aCodeList.push_back(new OOp_ADD());
+        }
+        else if (SQL_ISPUNCTUATION(pPredicateNode->getChild(1),"-"))
+            m_aCodeList.push_back(new OOp_SUB());
+        else
+        {
+            DBG_ERROR("OPredicateCompiler: Fehler im Parse Tree num_value_exp");
+        }
+    }
+    else if(SQL_ISRULE(pPredicateNode,term))
+    {
+        execute(pPredicateNode->getChild(0));                           // Bearbeiten des linken Zweigs
+        execute(pPredicateNode->getChild(2));                           // Bearbeiten des rechten Zweigs
+        if (SQL_ISPUNCTUATION(pPredicateNode->getChild(1),"*"))
+        {
+            m_aCodeList.push_back(new OOp_MUL());
+        }
+        else if (SQL_ISPUNCTUATION(pPredicateNode->getChild(1),"/"))
+            m_aCodeList.push_back(new OOp_DIV());
+        else
+        {
+            DBG_ERROR("OPredicateCompiler: Fehler im Parse Tree num_value_exp");
+        }
+    }
     else
         pOperand = execute_Operand(pPredicateNode);                     // jetzt werden nur einfache Operanden verarbeitet
 
@@ -284,44 +314,42 @@ OOperand* OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)  th
 
     // wenn es sich um eine Vergleichsoperation auf datum/Zeit handelt, dann
     // erfolgt jetzt bereits eine Umwandlung fuer die Konstante
-    if (pOb)
-    {
-        switch (pPredicateNode->getChild(2)->getNodeType())
-        {
-            case SQL_NODE_STRING:
-            {
-                OOperandConst* pConst = PTR_CAST(OOperandConst,m_aCodeList[m_aCodeList.size() - 2]);
-                switch (pOb->getDBType())
-                {
-                    case DataType::DECIMAL:
-                    case DataType::NUMERIC:
-                    case DataType::REAL:
-                    case DataType::DOUBLE:
-                    case DataType::TIMESTAMP:
-                    case DataType::DATE:
-                    case DataType::TIME:
-                    {
-                        try
-                        {
-                            ::rtl::OUString aVal;
-                            pConst->getValue() >>= aVal;
-                            pConst->setValue(makeAny(aVal.toDouble()));
-                        }
-                        catch( Exception&)
-                        {
-                            ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Datatype mismatch"),NULL);
-                        }
-                    }   break;
-                    case DataType::TINYINT:
-                    case DataType::SMALLINT:
-                    case DataType::INTEGER:
-                    case DataType::BIT:
-                        ;
-                        ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Datatype mismatch"),NULL);
-                }
-            }
-        }
-    }
+//  if (pOb)
+//  {
+//      switch (pPredicateNode->getChild(2)->getNodeType())
+//      {
+//          case SQL_NODE_STRING:
+//          {
+//              OOperandConst* pConst = PTR_CAST(OOperandConst,m_aCodeList[m_aCodeList.size() - 2]);
+//              switch (pOb->getDBType())
+//              {
+//                  case DataType::DECIMAL:
+//                  case DataType::NUMERIC:
+//                  case DataType::REAL:
+//                  case DataType::DOUBLE:
+//                  case DataType::TIMESTAMP:
+//                  case DataType::DATE:
+//                  case DataType::TIME:
+//                  {
+//                      try
+//                      {
+//                          pConst->setValue(makeAny(pConst->getValue().getDouble()));
+//                      }
+//                      catch( Exception&)
+//                      {
+//                          ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Datatype mismatch"),NULL);
+//                      }
+//                  }   break;
+//                  case DataType::TINYINT:
+//                  case DataType::SMALLINT:
+//                  case DataType::INTEGER:
+//                  case DataType::BIT:
+//                      ;
+//                      ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Datatype mismatch"),NULL);
+//              }
+//          }
+//      }
+//  }
     return NULL;
 }
 
@@ -485,18 +513,16 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
         {
             pOperand = new OOperandConst(*pODBCNode->getChild(1), pODBCNode->getChild(1)->getTokenValue());
 
-            // setting the Date
-            try
-            {
-                ::rtl::OUString aVal;
-                pOperand->getValue() >>= aVal;
-                pOperand->setValue(makeAny(aVal.toDouble()));
-            }
-            catch( Exception & )
-            {
-                OSL_ENSURE(0,"OPredicateCompiler::execute_Operand Exception");
-                ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Datatype mismatch"),NULL);
-            }
+//          // setting the Date
+//          try
+//          {
+//              pOperand->setValue(makeAny(pOperand->getValue().getDouble()));
+//          }
+//          catch( Exception & )
+//          {
+//              OSL_ENSURE(0,"OPredicateCompiler::execute_Operand Exception");
+//              ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Datatype mismatch"),NULL);
+//          }
         }
         else
             ;
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 904ef2c5f82d..b1ff0a3b5f2a 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EResultSet.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-03 14:16:38 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:11:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -232,5 +232,19 @@ IPropertyArrayHelper & OFlatResultSet::getInfoHelper()
 {
     return *OFlatResultSet_BASE3::getArrayHelper();
 }
-
+// -----------------------------------------------------------------------------
+void SAL_CALL OFlatResultSet::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OFlatResultSet_BASE2::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OFlatResultSet::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OFlatResultSet_BASE2::release();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
 
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index ba825db05844..9bdc68a4d177 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CallableStatement.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-20 17:03:16 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:13:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -586,5 +586,16 @@ Reference< starsdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int
     // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
     return out==0 ? 0 : new java_sql_Ref( t.pEnv, out );
 }
+// -----------------------------------------------------------------------------
+void SAL_CALL java_sql_CallableStatement::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    java_sql_PreparedStatement::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL java_sql_CallableStatement::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    java_sql_PreparedStatement::release();
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 11cf49376b54..5c4f760fcec6 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PreparedStatement.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-20 17:03:17 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:13:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -862,6 +862,17 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd
     return out==0 ? 0 : new java_sql_ResultSetMetaData( t.pEnv, out );
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL java_sql_PreparedStatement::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_BASE2::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL java_sql_PreparedStatement::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_BASE2::release();
+}
+// -----------------------------------------------------------------------------
 
 
 
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 9879ae3422eb..07186dc840cf 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ResultSet.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-20 17:03:17 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:13:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1850,6 +1850,22 @@ void java_sql_ResultSet::getFastPropertyValue(
             break;
     }
 }
+// -----------------------------------------------------------------------------
+void SAL_CALL java_sql_ResultSet::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    java_sql_ResultSet_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL java_sql_ResultSet::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    java_sql_ResultSet_BASE::release();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------
 
 
 
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index 749f8f111dd7..9b622e51162a 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ODatabaseMetaDataResultSet.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-06 14:06:42 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:13:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,12 +161,27 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th
         aRet = ODatabaseMetaDataResultSet_BASE::queryInterface(rType);
     return aRet;
 }
+// -----------------------------------------------------------------------------
+Reference< XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  ) throw(RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw(RuntimeException)
+{
+    ODatabaseMetaDataResultSet_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL ODatabaseMetaDataResultSet::release() throw(RuntimeException)
+{
+    ODatabaseMetaDataResultSet_BASE::release();
+}
 // -------------------------------------------------------------------------
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
+Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(RuntimeException)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
+                                    ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
+                                    ::getCppuType( (const Reference< XPropertySet > *)0 ));
 
     return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 10af041e396a..feac5dff3cdd 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: OPreparedStatement.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-20 16:54:34 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:13:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,8 +118,17 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const ::std::v
     ,m_sSqlStatement(sql)
 {
 }
-// -------------------------------------------------------------------------
-
+// -----------------------------------------------------------------------------
+void SAL_CALL OPreparedStatement::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_BASE2::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OPreparedStatement::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OStatement_BASE2::release();
+}
+// -----------------------------------------------------------------------------
 Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OStatement_BASE2::queryInterface(rType);
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 41da45a12785..4b799a57e65a 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: OResultSet.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-30 14:07:22 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:13:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1658,5 +1658,22 @@ void OResultSet::fillRow(sal_Int32 _nToColumn)
     m_nLastColumnPos = _nToColumn;
     m_bFetchData = sal_True;
 }
+// -----------------------------------------------------------------------------
+void SAL_CALL OResultSet::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OResultSet_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OResultSet::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OResultSet_BASE::release();
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------
+
 
 
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 769ee4ee1294..e56ead97c9bd 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: OStatement.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-20 16:54:34 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:13:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1098,4 +1098,30 @@ void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 }
 // -------------------------------------------------------------------------
 IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.OStatement","com.sun.star.sdbc.Statement");
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement_Base::acquire() throw(RuntimeException)
+{
+    OStatement_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement_Base::release() throw(RuntimeException)
+{
+    OStatement_BASE::release();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement::acquire() throw(RuntimeException)
+{
+    OStatement_BASE2::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OStatement::release() throw(RuntimeException)
+{
+    OStatement_BASE2::release();
+}
+// -----------------------------------------------------------------------------
+Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(RuntimeException)
+{
+    return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
+}
+// -----------------------------------------------------------------------------